fix(compiler): use exact passes on check tests to avoid reordering wh…

…en new passes are introduced
zama-ai · May 3, 2024 · 5fb5a18 · 5fb5a18
1 parent a74ec9f
commit 5fb5a18
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 176 deletions.
diff --git a/compilers/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/add_eint.mlir b/compilers/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/add_eint.mlir
@@ -1,4 +1,4 @@
-// RUN: concretecompiler --optimize-tfhe=false --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
+// RUN: concretecompiler --optimize-tfhe=false --passes fhe-to-tfhe-crt --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
 
 //CHECK:  func.func @add_eint(%[[Varg0:.*]]: tensor<5x!TFHE.glwe<sk?>>, %[[Varg1:.*]]: tensor<5x!TFHE.glwe<sk?>>) -> tensor<5x!TFHE.glwe<sk?>> {
 //CHECK-NEXT:    %[[V0:.*]] = bufferization.alloc_tensor() : tensor<5x!TFHE.glwe<sk?>>

diff --git a/...rs/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/add_eint_int.mlir b/...rs/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/add_eint_int.mlir
@@ -1,4 +1,4 @@
-// RUN: concretecompiler --optimize-tfhe=false --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
+// RUN: concretecompiler --optimize-tfhe=false --passes fhe-to-tfhe-crt --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
 
 // CHECK: func.func @add_eint_int(%[[Varg0:.*]]: tensor<5x!TFHE.glwe<sk?>>) -> tensor<5x!TFHE.glwe<sk?>> {
 // CHECK-NEXT:   %[[Vc1_i8:.*]] = arith.constant 1 : i8

diff --git a/compilers/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/conv2d.mlir b/compilers/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/conv2d.mlir
diff --git a/...rs/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/mul_eint_int.mlir b/...rs/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/mul_eint_int.mlir
@@ -1,4 +1,4 @@
-// RUN: concretecompiler --optimize-tfhe=false --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
+// RUN: concretecompiler --optimize-tfhe=false --passes fhe-to-tfhe-crt --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
 
 // CHECK:  func.func @mul_eint_int(%[[Varg0:.*]]: tensor<5x!TFHE.glwe<sk?>>) -> tensor<5x!TFHE.glwe<sk?>> {
 // CHECK-NEXT:    %[[Vc2_i8:.*]] = arith.constant 2 : i8

diff --git a/compilers/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/neg_eint.mlir b/compilers/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/neg_eint.mlir
@@ -1,4 +1,4 @@
-// RUN: concretecompiler --optimize-tfhe=false --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
+// RUN: concretecompiler --optimize-tfhe=false --passes fhe-to-tfhe-crt --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
 
 // CHECK:  func.func @neg_eint(%[[Varg0:.*]]: tensor<5x!TFHE.glwe<sk?>>) -> tensor<5x!TFHE.glwe<sk?>> {
 // CHECK-NEXT:    %[[V0:.*]] = bufferization.alloc_tensor() : tensor<5x!TFHE.glwe<sk?>>

diff --git a/...rs/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/sub_int_eint.mlir b/...rs/concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHECrt/sub_int_eint.mlir
@@ -1,4 +1,4 @@
-// RUN: concretecompiler --optimize-tfhe=false --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
+// RUN: concretecompiler --optimize-tfhe=false --passes fhe-to-tfhe-crt --action=dump-tfhe %s --large-integer-crt-decomposition=2,3,5,7,11 --large-integer-circuit-bootstrap=2,9 --large-integer-packing-keyswitch=694,1024,4,9 --v0-parameter=2,10,693,4,9,7,2 2>&1| FileCheck %s
 
 // CHECK:  func.func @sub_int_eint(%[[Varg0:.*]]: tensor<5x!TFHE.glwe<sk?>>) -> tensor<5x!TFHE.glwe<sk?>> {
 // CHECK-NEXT:    %[[Vc1_i8:.*]] = arith.constant 1 : i8

diff --git a/...concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHEScalar/add_eint_int.mlir b/...concrete-compiler/compiler/tests/check_tests/Conversion/FHEToTFHEScalar/add_eint_int.mlir
@@ -1,4 +1,4 @@
-// RUN: concretecompiler %s --optimize-tfhe=false --optimizer-strategy=dag-mono --action=dump-tfhe 2>&1| FileCheck %s
+// RUN: concretecompiler %s --passes=fhe-to-tfhe-scalar --v0-parameter=2,10,693,4,9,7,2 --action=dump-tfhe 2>&1| FileCheck %s
 
 // CHECK-LABEL: func.func @add_eint_int(%arg0: !TFHE.glwe<sk?>) -> !TFHE.glwe<sk?>
 func.func @add_eint_int(%arg0: !FHE.eint<7>) -> !FHE.eint<7> {