Fix merge.

valida-xyz · Jan 25, 2024 · 34cf243 · 34cf243
1 parent 77a6573
commit 34cf243
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/alu_u32/src/com/mod.rs b/alu_u32/src/com/mod.rs
@@ -7,7 +7,7 @@ use core::iter;
 use core::mem::transmute;
 use valida_bus::MachineWithGeneralBus;
 use valida_cpu::MachineWithCpuChip;
-use valida_machine::config::StarkConfig;
+use valida_machine::StarkConfig;
 use valida_machine::{
     instructions, Chip, Instruction, Interaction, Operands, Word, MEMORY_CELL_BYTES,
 };
@@ -16,7 +16,8 @@ use valida_opcodes::{EQ32, NE32};
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use p3_maybe_rayon::*;
+// use p3_maybe_rayon::*;
+use p3_maybe_rayon::prelude::IntoParallelRefIterator;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/basic/src/lib.rs b/basic/src/lib.rs
@@ -18,7 +18,7 @@ use valida_alu_u32::{
         And32Instruction, Bitwise32Chip, MachineWithBitwise32Chip, Or32Instruction,
         Xor32Instruction,
     },
-    com::{Com32Chip, MachineWithCom32Chip, Ne32Instruction},
+    com::{Com32Chip, Eq32Instruction, MachineWithCom32Chip, Ne32Instruction},
     div::{Div32Chip, Div32Instruction, MachineWithDiv32Chip, SDiv32Instruction},
     lt::{Lt32Chip, Lt32Instruction, MachineWithLt32Chip},
     mul::{
@@ -121,6 +121,12 @@ pub struct BasicMachine<F: PrimeField32 + TwoAdicField> {
     #[instruction(bitwise_u32)]
     xor32: Xor32Instruction,
 
+    #[instruction(com_u32)]
+    ne32: Ne32Instruction,
+
+    #[instruction(com_u32)]
+    eq32: Eq32Instruction,
+
     // Input/output instructions
     #[instruction]
     read: ReadAdviceInstruction,
@@ -155,6 +161,9 @@ pub struct BasicMachine<F: PrimeField32 + TwoAdicField> {
     #[chip]
     lt_u32: Lt32Chip,
 
+    #[chip]
+    com_u32: Com32Chip,
+
     #[chip]
     bitwise_u32: Bitwise32Chip,