Update e2e tests for tfhe-rs and tfhe-rs-bool

google · Mar 12, 2024 · 13d4552 · 13d4552
1 parent 4af73b2
commit 13d4552
Show file tree

Hide file tree

Showing 53 changed files with 1,032 additions and 2,098 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/include/Dialect/BGV/IR/BGVAttributes.h b/include/Dialect/BGV/IR/BGVAttributes.h
diff --git a/include/Dialect/BGV/IR/BGVAttributes.td b/include/Dialect/BGV/IR/BGVAttributes.td
diff --git a/include/Dialect/BGV/IR/BGVTraits.h b/include/Dialect/BGV/IR/BGVTraits.h
diff --git a/include/Dialect/BGV/IR/BGVTypes.h b/include/Dialect/BGV/IR/BGVTypes.h
diff --git a/include/Dialect/BGV/IR/BGVTypes.td b/include/Dialect/BGV/IR/BGVTypes.td
diff --git a/include/Dialect/CGGI/Transforms/Passes.td b/include/Dialect/CGGI/Transforms/Passes.td
@@ -19,16 +19,4 @@ def SetDefaultParameters : Pass<"cggi-set-default-parameters"> {
   let dependentDialects = ["mlir::heir::cggi::CGGIDialect"];
 }
 
-<<<<<<< HEAD
-def StraightLineVectorizer : Pass<"cggi-straight-line-vectorizer"> {
-  let summary = "A straight-line vectorizer for CGGI bootstrapping ops.";
-  let description = [{
-  This pass vectorizes CGGI ops. It ignores control flow and only vectorizes
-  straight-line programs within a given region.
-  }];
-  let dependentDialects = ["mlir::heir::cggi::CGGIDialect"];
-}
-
-=======
->>>>>>> main
 #endif  // INCLUDE_DIALECT_CGGI_TRANSFORMS_PASSES_TD_
diff --git a/include/Dialect/CGGI/Transforms/StraightLineVectorizer.h b/include/Dialect/CGGI/Transforms/StraightLineVectorizer.h
diff --git a/include/Dialect/LWE/IR/LWEAttributes.h b/include/Dialect/LWE/IR/LWEAttributes.h
@@ -4,12 +4,9 @@
 #include "include/Dialect/LWE/IR/LWEDialect.h"
 #include "mlir/include/mlir/IR/TensorEncoding.h"  // from @llvm-project
 
-<<<<<<< HEAD
-=======
 // Required to pull in poly's Ring_Attr
 #include "include/Dialect/Polynomial/IR/PolynomialAttributes.h"
 
->>>>>>> main
 #define GET_ATTRDEF_CLASSES
 #include "include/Dialect/LWE/IR/LWEAttributes.h.inc"
 

diff --git a/include/Dialect/LWE/IR/LWEAttributes.td b/include/Dialect/LWE/IR/LWEAttributes.td
@@ -309,24 +309,16 @@ def LWE_RLWEParams : AttrDef<LWE_Dialect, "RLWEParams"> {
   let description = [{
     An attribute describing classical RLWE parameters:
 
-<<<<<<< HEAD
-    - `cmod`: the coefficient modulus for the polynomials.
-=======
->>>>>>> main
     - `dimension`: the number of polynomials used in an RLWE sample, analogous
       to LWEParams.dimension.
     - `polyDegree`: the degree $N$ of the negacyclic polynomial modulus
       $x^N + 1$.
   }];
 
-<<<<<<< HEAD
-  let parameters = (ins "IntegerAttr": $cmod, "unsigned":$dimension, "unsigned": $polyDegree);
-=======
   let parameters = (ins
     DefaultValuedParameter<"unsigned", "2">:$dimension,
     "::mlir::heir::polynomial::RingAttr":$ring
   );
->>>>>>> main
 
   let assemblyFormat = "`<` struct(params) `>`";
 }

diff --git a/include/Dialect/Openfhe/IR/OpenfheOps.td b/include/Dialect/Openfhe/IR/OpenfheOps.td
@@ -30,8 +30,6 @@ class Openfhe_UnaryOp<string mnemonic, list<Trait> traits = []>
   let results = (outs RLWECiphertext:$output);
 }
 
-<<<<<<< HEAD
-=======
 class Openfhe_UnaryTypeSwitchOp<string mnemonic, list<Trait> traits = []>
   :  Openfhe_Op<mnemonic, traits # [
     Pure,
@@ -43,7 +41,6 @@ class Openfhe_UnaryTypeSwitchOp<string mnemonic, list<Trait> traits = []>
   let results = (outs RLWECiphertext:$output);
 }
 
->>>>>>> main
 class Openfhe_BinaryOp<string mnemonic, list<Trait> traits = []>
   :  Openfhe_Op<mnemonic, traits # [
     Pure,
@@ -103,13 +100,8 @@ def NegateOp : Openfhe_UnaryOp<"negate"> { let summary = "OpenFHE negate operati
 def SquareOp : Openfhe_UnaryOp<"square"> { let summary = "OpenFHE square operation of a ciphertext."; }
 def RelinOp : Openfhe_UnaryOp<"relin"> { let summary = "OpenFHE relinearize operation of a ciphertext."; }
 
-<<<<<<< HEAD
-def ModReduceOp : Openfhe_UnaryOp<"mod_reduce"> { let summary = "OpenFHE mod_reduce operation of a ciphertext. (used only for BGV/CKKS)"; }
-def LevelReduceOp : Openfhe_UnaryOp<"level_reduce"> { let summary = "OpenFHE level_reduce operation of a ciphertext."; }
-=======
 def ModReduceOp : Openfhe_UnaryTypeSwitchOp<"mod_reduce"> { let summary = "OpenFHE mod_reduce operation of a ciphertext. (used only for BGV/CKKS)"; }
 def LevelReduceOp : Openfhe_UnaryTypeSwitchOp<"level_reduce"> { let summary = "OpenFHE level_reduce operation of a ciphertext."; }
->>>>>>> main
 
 def RotOp : Openfhe_Op<"rot",[
   Pure,

diff --git a/include/Dialect/Polynomial/IR/PolynomialTypes.td b/include/Dialect/Polynomial/IR/PolynomialTypes.td
@@ -4,18 +4,6 @@
 include "include/Dialect/Polynomial/IR/PolynomialDialect.td"
 include "include/Dialect/Polynomial/IR/PolynomialAttributes.td"
 
-<<<<<<< HEAD
-include "mlir/IR/DialectBase.td"
-include "mlir/IR/AttrTypeBase.td"
-
-// A base class for all types in this dialect
-class Polynomial_Type<string name, string typeMnemonic>
-    : TypeDef<Polynomial_Dialect, name> {
-  let mnemonic = typeMnemonic;
-}
-
-def Polynomial : Polynomial_Type<"Polynomial", "polynomial"> {
-=======
 include "mlir/IR/AttrTypeBase.td"
 include "mlir/IR/BuiltinTypes.td"
 include "mlir/IR/DialectBase.td"
@@ -27,7 +15,6 @@ class Polynomial_Type<string name, string typeMnemonic, list<Trait> traits = []>
 }
 
 def Polynomial : Polynomial_Type<"Polynomial", "polynomial", [MemRefElementTypeInterface]> {
->>>>>>> main
   let summary = "An element of a polynomial quotient ring";
 
   let description = [{

diff --git a/include/Dialect/TfheRustBool/IR/TfheRustBoolOps.td b/include/Dialect/TfheRustBool/IR/TfheRustBoolOps.td
@@ -68,7 +68,6 @@ def XorPackedOp : TfheRustBool_Op<"xor_packed", [
   let results = (outs TensorOf<[TfheRustBool_Encrypted]>:$output);
 }
 
-
 def NotOp : TfheRustBool_Op<"not", [
     Pure,
     AllTypesMatch<["input", "output"]>