Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove nbAdded and nbRemoved columns #1505

Merged
merged 4 commits into from
Nov 16, 2024
Merged

remove nbAdded and nbRemoved columns #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8586c1
remove nbAdded and nbRemoved columns
letypequividelespoubelles Nov 15, 2024
c0d1bd3
constrraints
letypequividelespoubelles Nov 16, 2024
93d2e80
regenerate Trace for inst decoder
letypequividelespoubelles Nov 16, 2024
d463307
Merge branch 'arith-dev' into 1468-clean-get-rid-of-stacknbadded-stac…
letypequividelespoubelles Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,766 changes: 768 additions & 998 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Trace.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions ...ization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/StackFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ public Trace trace(Trace trace) {
// Instruction details
.pStackAlpha(UnsignedByte.of(stack.getCurrentOpcodeData().stackSettings().alpha()))
.pStackDelta(UnsignedByte.of(stack.getCurrentOpcodeData().stackSettings().delta()))
.pStackNbAdded(UnsignedByte.of(stack.getCurrentOpcodeData().stackSettings().nbAdded()))
.pStackNbRemoved(UnsignedByte.of(stack.getCurrentOpcodeData().stackSettings().nbRemoved()))
.pStackInstruction(Bytes.of(stack.getCurrentOpcodeData().value()))
.pStackStaticGas(staticGas)
// Opcode families
Expand Down
2 changes: 0 additions & 2 deletions ...ava/net/consensys/linea/zktracer/module/tables/instructionDecoder/InstructionDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ private static void traceStackSettings(OpCodeData op, Trace trace) {
trace
.alpha(UnsignedByte.of(op.stackSettings().alpha()))
.delta(UnsignedByte.of(op.stackSettings().delta()))
.nbAdded(UnsignedByte.of(op.stackSettings().nbAdded()))
.nbRemoved(UnsignedByte.of(op.stackSettings().nbRemoved()))
.staticGas(op.stackSettings().staticGas().cost())
.twoLineInstruction(op.stackSettings().twoLineInstruction())
.staticFlag(op.stackSettings().forbiddenInStatic())
Expand Down
183 changes: 70 additions & 113 deletions ...on/src/main/java/net/consensys/linea/zktracer/module/tables/instructionDecoder/Trace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package net.consensys.linea.zktracer.module.tables.instructionDecoder;

import java.nio.MappedByteBuffer;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;

Expand Down Expand Up @@ -75,62 +76,59 @@ public class Trace {
private final MappedByteBuffer mxpType3;
private final MappedByteBuffer mxpType4;
private final MappedByteBuffer mxpType5;
private final MappedByteBuffer nbAdded;
private final MappedByteBuffer nbRemoved;
private final MappedByteBuffer opcode;
private final MappedByteBuffer staticFlag;
private final MappedByteBuffer staticGas;
private final MappedByteBuffer twoLineInstruction;

public static List<ColumnHeader> headers(int length) {
return List.of(
new ColumnHeader("instdecoder.ALPHA", 1, length),
new ColumnHeader("instdecoder.BILLING_PER_BYTE", 1, length),
new ColumnHeader("instdecoder.BILLING_PER_WORD", 1, length),
new ColumnHeader("instdecoder.DELTA", 1, length),
new ColumnHeader("instdecoder.FAMILY_ACCOUNT", 1, length),
new ColumnHeader("instdecoder.FAMILY_ADD", 1, length),
new ColumnHeader("instdecoder.FAMILY_BATCH", 1, length),
new ColumnHeader("instdecoder.FAMILY_BIN", 1, length),
new ColumnHeader("instdecoder.FAMILY_CALL", 1, length),
new ColumnHeader("instdecoder.FAMILY_CONTEXT", 1, length),
new ColumnHeader("instdecoder.FAMILY_COPY", 1, length),
new ColumnHeader("instdecoder.FAMILY_CREATE", 1, length),
new ColumnHeader("instdecoder.FAMILY_DUP", 1, length),
new ColumnHeader("instdecoder.FAMILY_EXT", 1, length),
new ColumnHeader("instdecoder.FAMILY_HALT", 1, length),
new ColumnHeader("instdecoder.FAMILY_INVALID", 1, length),
new ColumnHeader("instdecoder.FAMILY_JUMP", 1, length),
new ColumnHeader("instdecoder.FAMILY_KEC", 1, length),
new ColumnHeader("instdecoder.FAMILY_LOG", 1, length),
new ColumnHeader("instdecoder.FAMILY_MACHINE_STATE", 1, length),
new ColumnHeader("instdecoder.FAMILY_MOD", 1, length),
new ColumnHeader("instdecoder.FAMILY_MUL", 1, length),
new ColumnHeader("instdecoder.FAMILY_PUSH_POP", 1, length),
new ColumnHeader("instdecoder.FAMILY_SHF", 1, length),
new ColumnHeader("instdecoder.FAMILY_STACK_RAM", 1, length),
new ColumnHeader("instdecoder.FAMILY_STORAGE", 1, length),
new ColumnHeader("instdecoder.FAMILY_SWAP", 1, length),
new ColumnHeader("instdecoder.FAMILY_TRANSACTION", 1, length),
new ColumnHeader("instdecoder.FAMILY_WCP", 1, length),
new ColumnHeader("instdecoder.FLAG_1", 1, length),
new ColumnHeader("instdecoder.FLAG_2", 1, length),
new ColumnHeader("instdecoder.FLAG_3", 1, length),
new ColumnHeader("instdecoder.FLAG_4", 1, length),
new ColumnHeader("instdecoder.IS_JUMPDEST", 1, length),
new ColumnHeader("instdecoder.IS_PUSH", 1, length),
new ColumnHeader("instdecoder.MXP_FLAG", 1, length),
new ColumnHeader("instdecoder.MXP_TYPE_1", 1, length),
new ColumnHeader("instdecoder.MXP_TYPE_2", 1, length),
new ColumnHeader("instdecoder.MXP_TYPE_3", 1, length),
new ColumnHeader("instdecoder.MXP_TYPE_4", 1, length),
new ColumnHeader("instdecoder.MXP_TYPE_5", 1, length),
new ColumnHeader("instdecoder.NB_ADDED", 1, length),
new ColumnHeader("instdecoder.NB_REMOVED", 1, length),
new ColumnHeader("instdecoder.OPCODE", 32, length),
new ColumnHeader("instdecoder.STATIC_FLAG", 1, length),
new ColumnHeader("instdecoder.STATIC_GAS", 4, length),
new ColumnHeader("instdecoder.TWO_LINE_INSTRUCTION", 1, length));
static List<ColumnHeader> headers(int length) {
List<ColumnHeader> headers = new ArrayList<>();
headers.add(new ColumnHeader("instdecoder.ALPHA", 1, length));
headers.add(new ColumnHeader("instdecoder.BILLING_PER_BYTE", 1, length));
headers.add(new ColumnHeader("instdecoder.BILLING_PER_WORD", 1, length));
headers.add(new ColumnHeader("instdecoder.DELTA", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_ACCOUNT", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_ADD", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_BATCH", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_BIN", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_CALL", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_CONTEXT", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_COPY", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_CREATE", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_DUP", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_EXT", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_HALT", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_INVALID", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_JUMP", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_KEC", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_LOG", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_MACHINE_STATE", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_MOD", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_MUL", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_PUSH_POP", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_SHF", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_STACK_RAM", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_STORAGE", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_SWAP", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_TRANSACTION", 1, length));
headers.add(new ColumnHeader("instdecoder.FAMILY_WCP", 1, length));
headers.add(new ColumnHeader("instdecoder.FLAG_1", 1, length));
headers.add(new ColumnHeader("instdecoder.FLAG_2", 1, length));
headers.add(new ColumnHeader("instdecoder.FLAG_3", 1, length));
headers.add(new ColumnHeader("instdecoder.FLAG_4", 1, length));
headers.add(new ColumnHeader("instdecoder.IS_JUMPDEST", 1, length));
headers.add(new ColumnHeader("instdecoder.IS_PUSH", 1, length));
headers.add(new ColumnHeader("instdecoder.MXP_FLAG", 1, length));
headers.add(new ColumnHeader("instdecoder.MXP_TYPE_1", 1, length));
headers.add(new ColumnHeader("instdecoder.MXP_TYPE_2", 1, length));
headers.add(new ColumnHeader("instdecoder.MXP_TYPE_3", 1, length));
headers.add(new ColumnHeader("instdecoder.MXP_TYPE_4", 1, length));
headers.add(new ColumnHeader("instdecoder.MXP_TYPE_5", 1, length));
headers.add(new ColumnHeader("instdecoder.OPCODE", 32, length));
headers.add(new ColumnHeader("instdecoder.STATIC_FLAG", 1, length));
headers.add(new ColumnHeader("instdecoder.STATIC_GAS", 4, length));
headers.add(new ColumnHeader("instdecoder.TWO_LINE_INSTRUCTION", 1, length));
return headers;
}

public Trace(List<MappedByteBuffer> buffers) {
Expand Down Expand Up @@ -175,12 +173,10 @@ public Trace(List<MappedByteBuffer> buffers) {
this.mxpType3 = buffers.get(38);
this.mxpType4 = buffers.get(39);
this.mxpType5 = buffers.get(40);
this.nbAdded = buffers.get(41);
this.nbRemoved = buffers.get(42);
this.opcode = buffers.get(43);
this.staticFlag = buffers.get(44);
this.staticGas = buffers.get(45);
this.twoLineInstruction = buffers.get(46);
this.opcode = buffers.get(41);
this.staticFlag = buffers.get(42);
this.staticGas = buffers.get(43);
this.twoLineInstruction = buffers.get(44);
}

public int size() {
Expand Down Expand Up @@ -683,42 +679,19 @@ public Trace mxpType5(final Boolean b) {
return this;
}

public Trace nbAdded(final UnsignedByte b) {
if (filled.get(41)) {
throw new IllegalStateException("instdecoder.NB_ADDED already set");
} else {
filled.set(41);
}

nbAdded.put(b.toByte());

return this;
}

public Trace nbRemoved(final UnsignedByte b) {
if (filled.get(42)) {
throw new IllegalStateException("instdecoder.NB_REMOVED already set");
} else {
filled.set(42);
}

nbRemoved.put(b.toByte());

return this;
}

public Trace opcode(final Bytes b) {
if (filled.get(43)) {
if (filled.get(41)) {
throw new IllegalStateException("instdecoder.OPCODE already set");
} else {
filled.set(43);
filled.set(41);
}

// Trim array to size
Bytes bs = b.trimLeadingZeros();
// Sanity check against expected width
if (bs.bitLength() > 256) {
throw new IllegalArgumentException("opcode has invalid width (" + bs.bitLength() + "bits)");
throw new IllegalArgumentException(
"instdecoder.OPCODE has invalid width (" + bs.bitLength() + "bits)");
}
// Write padding (if necessary)
for (int i = bs.size(); i < 32; i++) {
Expand All @@ -733,10 +706,10 @@ public Trace opcode(final Bytes b) {
}

public Trace staticFlag(final Boolean b) {
if (filled.get(44)) {
if (filled.get(42)) {
throw new IllegalStateException("instdecoder.STATIC_FLAG already set");
} else {
filled.set(44);
filled.set(42);
}

staticFlag.put((byte) (b ? 1 : 0));
Expand All @@ -745,14 +718,14 @@ public Trace staticFlag(final Boolean b) {
}

public Trace staticGas(final long b) {
if (filled.get(45)) {
if (filled.get(43)) {
throw new IllegalStateException("instdecoder.STATIC_GAS already set");
} else {
filled.set(45);
filled.set(43);
}

if (b >= 4294967296L) {
throw new IllegalArgumentException("staticGas has invalid value (" + b + ")");
throw new IllegalArgumentException("instdecoder.STATIC_GAS has invalid value (" + b + ")");
}
staticGas.put((byte) (b >> 24));
staticGas.put((byte) (b >> 16));
Expand All @@ -763,10 +736,10 @@ public Trace staticGas(final long b) {
}

public Trace twoLineInstruction(final Boolean b) {
if (filled.get(46)) {
if (filled.get(44)) {
throw new IllegalStateException("instdecoder.TWO_LINE_INSTRUCTION already set");
} else {
filled.set(46);
filled.set(44);
}

twoLineInstruction.put((byte) (b ? 1 : 0));
Expand Down Expand Up @@ -940,26 +913,18 @@ public Trace validateRow() {
}

if (!filled.get(41)) {
throw new IllegalStateException("instdecoder.NB_ADDED has not been filled");
}

if (!filled.get(42)) {
throw new IllegalStateException("instdecoder.NB_REMOVED has not been filled");
}

if (!filled.get(43)) {
throw new IllegalStateException("instdecoder.OPCODE has not been filled");
}

if (!filled.get(44)) {
if (!filled.get(42)) {
throw new IllegalStateException("instdecoder.STATIC_FLAG has not been filled");
}

if (!filled.get(45)) {
if (!filled.get(43)) {
throw new IllegalStateException("instdecoder.STATIC_GAS has not been filled");
}

if (!filled.get(46)) {
if (!filled.get(44)) {
throw new IllegalStateException("instdecoder.TWO_LINE_INSTRUCTION has not been filled");
}

Expand Down Expand Up @@ -1135,26 +1100,18 @@ public Trace fillAndValidateRow() {
}

if (!filled.get(41)) {
nbAdded.position(nbAdded.position() + 1);
}

if (!filled.get(42)) {
nbRemoved.position(nbRemoved.position() + 1);
}

if (!filled.get(43)) {
opcode.position(opcode.position() + 32);
}

if (!filled.get(44)) {
if (!filled.get(42)) {
staticFlag.position(staticFlag.position() + 1);
}

if (!filled.get(45)) {
if (!filled.get(43)) {
staticGas.position(staticGas.position() + 4);
}

if (!filled.get(46)) {
if (!filled.get(44)) {
twoLineInstruction.position(twoLineInstruction.position() + 1);
}

Expand Down
13 changes: 0 additions & 13 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/OpCodeData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,6 @@ public record OpCodeData(
RamSettings ramSettings,
Billing billing) {

/**
* Returns the number of arguments supported by the given opcode.
*
* @return number of arguments supported by the given opcode.
*/
public int numberOfArguments() {
return stackSettings.nbRemoved();
}

public RamSettings ramSettings() {
return Objects.requireNonNullElse(ramSettings, RamSettings.DEFAULT);
}

public Billing billing() {
return Objects.requireNonNullElse(billing, Billing.DEFAULT);
}
Expand Down
4 changes: 0 additions & 4 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/stack/StackSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
* @param pattern the stack pattern as given in the spec
* @param alpha alpha as set in the spec
* @param delta delta as set in the sped
* @param nbAdded the number of elements this operation adds on the stack
* @param nbRemoved the number of elements this operation pops from the stack
* @param staticGas the static part of the gas consumed by this operation
* @param twoLineInstruction whether this operation fills one or two stack lines
* @param forbiddenInStatic whether this instruction is forbidden in a static context
Expand All @@ -39,8 +37,6 @@ public record StackSettings(
Pattern pattern,
int alpha,
int delta,
int nbAdded,
int nbRemoved,
GasConstants staticGas,
boolean twoLineInstruction,
boolean forbiddenInStatic,
Expand Down
8 changes: 4 additions & 4 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/runtime/stack/Stack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package net.consensys.linea.zktracer.runtime.stack;

import static com.google.common.base.Preconditions.checkArgument;
import static net.consensys.linea.zktracer.opcode.OpCode.EXTCODECOPY;

import lombok.Getter;
import net.consensys.linea.zktracer.module.hub.Hub;
Expand Down Expand Up @@ -238,9 +239,8 @@ private void log(MessageFrame frame, StackContext pending) {
pending.addLine(line2);
}

private void copy(MessageFrame frame, StackContext pending) {
if (currentOpcodeData.numberOfArguments() == 4) {
// this is the EXTCODECOPY case
private void copy(MessageFrame frame, StackContext pending, OpCode mnemonic) {
if (mnemonic == EXTCODECOPY) {
Bytes val0 = getStack(frame, 0);
Bytes val1 = getStack(frame, 1);
Bytes val2 = getStack(frame, 2);
Expand Down Expand Up @@ -433,7 +433,7 @@ public void processInstruction(final Hub hub, MessageFrame frame, int stackStamp
case DUP -> this.dup(frame, callFrame.pending());
case SWAP -> this.swap(frame, callFrame.pending());
case LOG -> this.log(frame, callFrame.pending());
case COPY -> this.copy(frame, callFrame.pending());
case COPY -> this.copy(frame, callFrame.pending(), currentOpcodeData.mnemonic());
case CALL -> this.call(frame, callFrame.pending());
case CREATE -> this.create(frame, callFrame.pending());
}
Expand Down
Loading
Loading