added some fixes

NethermindEth · Sep 26, 2024 · 2b5a41b · 2b5a41b
1 parent 6497ed3
commit 2b5a41b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pkg/vm/builtins/layouts.go b/pkg/vm/builtins/layouts.go
@@ -121,8 +121,8 @@ func getAllCairoLayout() Layout {
 		{Runner: &Keccak{ratio: 2048, cache: make(map[uint64]fp.Element)}, Builtin: KeccakType},
 		{Runner: &Poseidon{ratio: 256, cache: make(map[uint64]fp.Element)}, Builtin: PoseidonType},
 		{Runner: &RangeCheck{ratio: 8, RangeCheckNParts: 6}, Builtin: RangeCheck96Type},
-		{Runner: &ModBuiltin{ratio: 128, wordBitLen: 1, batchSize: 96, modBuiltinType: Add}, Builtin: AddModeType},
-		{Runner: &ModBuiltin{ratio: 256, wordBitLen: 1, batchSize: 96, modBuiltinType: Mul}, Builtin: MulModType},
+		{Runner: &ModBuiltin{ratio: 128, wordBitLen: 96, batchSize: 1, modBuiltinType: Add}, Builtin: AddModeType},
+		{Runner: &ModBuiltin{ratio: 256, wordBitLen: 96, batchSize: 1, modBuiltinType: Mul}, Builtin: MulModType},
 	}}
 }
 

diff --git a/pkg/vm/builtins/modulo_test.go b/pkg/vm/builtins/modulo_test.go
@@ -60,7 +60,7 @@ The case c=x1, a=x2, b=None is currently completely symmetric in fill_value so i
 func checkResult(runner ModBuiltin, inverse bool, p, x1, x2 big.Int) (*big.Int, error) {
 	mem := memory.Memory{}
 
-	mem.AllocateEmptySegment()
+	mem.AllocateBuiltinSegment(&runner)
 
 	offsetsPtr := memory.MemoryAddress{SegmentIndex: 0, Offset: 0}
 
@@ -81,7 +81,9 @@ func checkResult(runner ModBuiltin, inverse bool, p, x1, x2 big.Int) (*big.Int,
 		return nil, err
 	}
 
+	runner.writeNWordsValue(&mem, x1Addr, x1)
 	runner.writeNWordsValue(&mem, x2Addr, x2)
+
 	resAddr, err := x1Addr.AddOffset(int16(2 * N_WORDS))
 
 	if err != nil {
@@ -92,8 +94,6 @@ func checkResult(runner ModBuiltin, inverse bool, p, x1, x2 big.Int) (*big.Int,
 		x1Addr, resAddr = resAddr, x1Addr
 	}
 
-	runner.writeNWordsValue(&mem, x1Addr, x1)
-
 	runner.fillValue(&mem, ModBuiltinInputs{
 		p:          p,
 		pValues:    [N_WORDS]fp.Element{}, // not used in fillValue
@@ -102,6 +102,8 @@ func checkResult(runner ModBuiltin, inverse bool, p, x1, x2 big.Int) (*big.Int,
 		offsetsPtr: offsetsPtr,
 	}, 0, Operation(runner.modBuiltinType), Operation("Inv"+runner.modBuiltinType))
 
+	// return big.NewInt(0), nil
+
 	_, OutRes, err := runner.readNWordsValue(&mem, resAddr)
 	if err != nil {
 		return nil, err
@@ -111,7 +113,7 @@ func checkResult(runner ModBuiltin, inverse bool, p, x1, x2 big.Int) (*big.Int,
 }
 
 func TestAddModBuiltinRunnerAddition(t *testing.T) {
-	runner := NewModBuiltin(128, 1, 96, Add)
+	runner := NewModBuiltin(128, 96, 1, Add)
 	res1, err := checkResult(*runner, false, *big.NewInt(67), *big.NewInt(17), *big.NewInt(40))
 	require.NoError(t, err)
 	require.Equal(t, big.NewInt(57), res1)