Revert "[VAN-1371] create multiple versions of functions as needed fo…

…r unrolling" This reverts commit 82962a2.
Veridise · Jun 28, 2024 · 0fa3afb · 0fa3afb
1 parent ea6c280
commit 0fa3afb
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 539 deletions.
diff --git a/circom/tests/arrays/array8.circom b/circom/tests/arrays/array8.circom
@@ -30,7 +30,7 @@ component main = ArrayReturnTemplate(4);
 
 //CHECK-LABEL: define{{.*}} i256* @return_array_B_{{[0-9]+}}
 //CHECK-SAME: (i256* %[[ARENA:[0-9a-zA-Z_.]+]]){{.*}} {
-//CHECK:        %[[SRC_PTR:[0-9a-zA-Z_.]+]] = call i256* @return_array_A_{{[0-9\.]+}}(i256* %{{.*}})
+//CHECK:        %[[SRC_PTR:[0-9a-zA-Z_.]+]] = call i256* @return_array_A_{{[0-9]+}}(i256* %{{.*}})
 //CHECK-NEXT:   %[[DST_PTR:[0-9a-zA-Z_.]+]] = getelementptr i256, i256* %[[ARENA]], i32 2
 //CHECK-NEXT:   %[[COPY_SRC_0:[0-9a-zA-Z_.]+]] = getelementptr i256, i256* %[[SRC_PTR]], i32 0
 //CHECK-NEXT:   %[[COPY_DST_0:[0-9a-zA-Z_.]+]] = getelementptr i256, i256* %[[DST_PTR]], i32 0
@@ -59,7 +59,7 @@ component main = ArrayReturnTemplate(4);
 //CHECK-NEXT:   ret i256* %[[T10]]
 //CHECK-NEXT: }
 
-//CHECK-LABEL: define{{.*}} i256* @return_array_A_{{[0-9\.]+}}
+//CHECK-LABEL: define{{.*}} i256* @return_array_A_{{[0-9]+}}
 //CHECK-SAME: (i256* %[[ARENA:[0-9a-zA-Z_.]+]]){{.*}} {
 //CHECK:       return{{[0-9]+}}:
 //CHECK-NEXT:    %[[T0:[0-9a-zA-Z_.]+]] = getelementptr i256, i256* %[[ARENA]], i32 3

diff --git a/circom/tests/calls/call_arg_arraymulti.circom b/circom/tests/calls/call_arg_arraymulti.circom
@@ -49,9 +49,9 @@ component main = CallArgTest();
 //CHECK-NEXT:   ret void
 //CHECK-NEXT: }
 
-//CHECK-LABEL: define{{.*}} i256 @sum_{{[0-9\.]+}}
+//CHECK-LABEL: define{{.*}} i256 @sum_{{[0-9]+}}
 //CHECK-SAME: (i256* %[[T00:[0-9a-zA-Z_.]+]]){{.*}} {
-//CHECK-NEXT: [[$FUN_NAME:sum_[0-9\.]+]]:
+//CHECK-NEXT: [[$FUN_NAME:sum_[0-9]+]]:
 //CHECK-NEXT:   br label %store1
 //CHECK-EMPTY:
 //CHECK-NEXT: store1:

diff --git a/circom/tests/calls/call_arg_arraymulti_arraymulti.circom b/circom/tests/calls/call_arg_arraymulti_arraymulti.circom
@@ -53,9 +53,9 @@ component main = CallArgTest();
 //CHECK-NEXT:   ret void
 //CHECK-NEXT: }
 //
-//CHECK-LABEL: define{{.*}} i256 @sum_{{[0-9\.]+}}
+//CHECK-LABEL: define{{.*}} i256 @sum_{{[0-9]+}}
 //CHECK-SAME: (i256* %[[T00:[0-9a-zA-Z_.]+]]){{.*}} {
-//CHECK-NEXT: [[$FUN_NAME:sum_[0-9\.]+]]:
+//CHECK-NEXT: [[$FUN_NAME:sum_[0-9]+]]:
 //CHECK-NEXT:   br label %store1
 //CHECK-EMPTY:
 //CHECK-NEXT: store1:

diff --git a/circom/tests/controlflow/early_return_loop_1.circom b/circom/tests/controlflow/early_return_loop_1.circom
@@ -33,8 +33,8 @@ template EarlyReturn() {
 
 component main = EarlyReturn();
 
-//CHECK-LABEL: define{{.*}} i256 @noEarlyReturnFn_{{[0-9\.]+}}(i256* %0){{.*}} {
-//CHECK-NEXT: noEarlyReturnFn_[[$F_ID_2:[0-9\.]+]]:
+//CHECK-LABEL: define{{.*}} i256 @noEarlyReturnFn_{{[0-9]+}}(i256* %0){{.*}} {
+//CHECK-NEXT: noEarlyReturnFn_[[$F_ID_2:[0-9]+]]:
 //CHECK-NEXT:   br label %store1
 //CHECK-EMPTY: 
 //CHECK-NEXT: store1:

diff --git a/circom/tests/controlflow/multiuse_func_with_loop.circom b/circom/tests/controlflow/multiuse_func_with_loop.circom
diff --git a/circom/tests/type_conversions/bool_4.circom b/circom/tests/type_conversions/bool_4.circom
@@ -27,7 +27,7 @@ component main = A();
 //CHECK: store i256 %[[VAL]], i256* %{{[0-9]+}}
 
 //CHECK-LABEL: define{{.*}} i256* @binop_bool_array_
-//CHECK-SAME: [[$F_ID_2:[0-9\.]+]](i256* %0){{.*}} {
+//CHECK-SAME: [[$F_ID_2:[0-9]+]](i256* %0){{.*}} {
 //CHECK-COUNT-10: call void @..generated..loop.body.[[$F_ID_1]]([0 x i256]* %{{[0-9]+}}, [0 x i256]* null, i256* %{{[0-9]+}}, i256* %{{[0-9]+}}, i256* %{{[0-9]+}})
 
 //CHECK-LABEL: define{{.*}} void @A_{{[0-9]+}}_run([0 x i256]* %0){{.*}} {

diff --git a/circuit_passes/src/bucket_interpreter/env/unrolled_block_env.rs b/circuit_passes/src/bucket_interpreter/env/unrolled_block_env.rs
@@ -59,7 +59,7 @@ impl<'a> UnrolledBlockEnvData<'a> {
     }
 
     pub fn function_caller(&self) -> Option<&BucketId> {
-        self.base.function_caller()
+        None
     }
 
     pub fn get_context_kind(&self) -> EnvContextKind {

diff --git a/circuit_passes/src/passes/loop_unroll/mod.rs b/circuit_passes/src/passes/loop_unroll/mod.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ impl<'a> UnrolledBlockEnvData<'a> { @@
         }
         pub fn function_caller(&self) -> Option<&BucketId> {
-            self.base.function_caller()
+            None
         }
         pub fn get_context_kind(&self) -> EnvContextKind {
@@ Expand Down @@