Fix the build and tests (due to rebasing)

Veridise · Oct 18, 2023 · 6371cda · 6371cda
1 parent 8565c57
commit 6371cda
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/circom/tests/loops/inner_conditional_11.circom b/circom/tests/loops/inner_conditional_11.circom
@@ -1,6 +1,7 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
+// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template Sigma() {
     signal input inp;

diff --git a/circom/tests/subcmps/mapped.circom b/circom/tests/subcmps/mapped.circom
@@ -2,8 +2,6 @@ pragma circom 2.0.0;
 
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*
-// TODO: I think it has problems related to both https://veridise.atlassian.net/browse/VAN-582 and https://veridise.atlassian.net/browse/VAN-670
 
 template A(n) {
 	signal input a[n];

diff --git a/circom/tests/subcmps/mapped2.circom b/circom/tests/subcmps/mapped2.circom
@@ -2,7 +2,6 @@ pragma circom 2.0.0;
 
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*		// pending https://veridise.atlassian.net/browse/VAN-670
 
 template A(n) {
 	signal input a[n];

diff --git a/circom/tests/subcmps/subcmps2.circom b/circom/tests/subcmps/subcmps2.circom
@@ -1,6 +1,7 @@
 pragma circom 2.0.6;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
+// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template Sum(n) {
     signal input inp[n];

diff --git a/circom/tests/subcmps/subcmps3.circom b/circom/tests/subcmps/subcmps3.circom
@@ -1,6 +1,7 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
+// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template Sum(n) {
     signal input inp[n];

diff --git a/circuit_passes/src/passes/loop_unroll/body_extractor.rs b/circuit_passes/src/passes/loop_unroll/body_extractor.rs
@@ -356,13 +356,13 @@ impl LoopBodyExtractor {
                 println!("bucket {} refs by iteration: {:?}", id, column);
             }
             // ASSERT: same AddressType kind for this bucket in every (available) iteration
-            assert!(Self::all_same(Self::filter_map(column, |(x, _)| std::mem::discriminant(x))));
+            assert!(checks::all_same(Self::filter_map(column, |(x, _)| std::mem::discriminant(x))));
 
             // If the computed index value for this bucket is NOT the same across all available
             //  iterations (i.e. where it is not None, see earlier comment) or if the AddressType
             //  is SubcmpSignal, then an extra function argument is needed for it.
             if Self::filter_map_any(column, |(x, _)| matches!(x, AddressType::SubcmpSignal { .. }))
-                || !Self::all_same(Self::filter_map(column, |(_, y)| *y))
+                || !checks::all_same(Self::filter_map(column, |(_, y)| *y))
             {
                 bucket_to_args.insert(*id, ArgIndex::Signal(next_idx));
                 next_idx += 1;

diff --git a/circuit_passes/src/passes/loop_unroll/extracted_location_updater.rs b/circuit_passes/src/passes/loop_unroll/extracted_location_updater.rs
@@ -59,7 +59,7 @@ impl ExtractedFunctionLocationUpdater {
         // NOTE: This must happen before the modification step so it can use existing values from the bucket.
         if let ArgIndex::SubCmp { counter, arena, .. } = ai {
             let counter_address = AddressType::SubcmpSignal {
-                cmp_address: new_u32_value(bucket_meta, *counter),
+                cmp_address: build_u32_value(bucket_meta, *counter),
                 uniform_parallel_value: None,
                 counter_override: true,
                 is_output: false,
@@ -77,7 +77,7 @@ impl ExtractedFunctionLocationUpdater {
                     dest_is_output: false,
                     dest_address_type: counter_address.clone(),
                     dest: LocationRule::Indexed {
-                        location: new_u32_value(bucket_meta, 0),
+                        location: build_u32_value(bucket_meta, 0),
                         template_header: None,
                     },
                     bounded_fn: None,
@@ -96,7 +96,7 @@ impl ExtractedFunctionLocationUpdater {
                                 message_id: bucket_meta.get_message_id(),
                                 address_type: counter_address.clone(),
                                 src: LocationRule::Indexed {
-                                    location: new_u32_value(bucket_meta, 0),
+                                    location: build_u32_value(bucket_meta, 0),
                                     template_header: None,
                                 },
                                 bounded_fn: None,
@@ -141,7 +141,7 @@ impl ExtractedFunctionLocationUpdater {
                                 message_id: bucket_meta.get_message_id(),
                                 address_type: counter_address,
                                 src: LocationRule::Indexed {
-                                    location: new_u32_value(bucket_meta, 0),
+                                    location: build_u32_value(bucket_meta, 0),
                                     template_header: None,
                                 },
                                 bounded_fn: None,
@@ -204,7 +204,7 @@ impl ExtractedFunctionLocationUpdater {
                 input_information: InputInformation::NoInput,
             },
             LocationRule::Indexed {
-                location: new_u32_value(bucket_meta, 0), //use index 0 to ref the entire storage array
+                location: build_u32_value(bucket_meta, 0), //use index 0 to ref the entire storage array
                 template_header: None,
             },
         )

diff --git a/code_producers/src/llvm_elements/functions.rs b/code_producers/src/llvm_elements/functions.rs
@@ -205,7 +205,7 @@ impl<'a> TemplateCtx<'a> for ExtractedFunctionCtx<'a> {
 
     fn load_subcmp_counter(
         &self,
-        producer: &dyn LLVMIRProducer<'a>,
+        _producer: &dyn LLVMIRProducer<'a>,
         id: AnyValueEnum<'a>,
         implicit: bool,
     ) -> Option<PointerValue<'a>> {