Skip to content

Commit

Permalink
more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcw109550
pcw109550 committed Mar 6, 2024
1 parent 73a65a9 commit 567afde
Showing 1 changed file with 76 additions and 54 deletions.
130 changes: 76 additions & 54 deletions rvsol/test/RISCV.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ contract RISCV_Test is CommonTest {
assertEq(postState, outputState(expect), "unexpected post state");
}

// not working
function test_ecall_succeeds() public {
// some syscalls are not supported
// lets choose unsupported syscall clone just for testing functionality
Expand Down Expand Up @@ -675,67 +674,90 @@ contract RISCV_Test is CommonTest {
assertEq(postState, outputState(expect), "unexpected post state");
}

// TODO: not confirmed/ need to fix

// function test_lb_succeeds() public {
// bytes32 value = hex"f9d9c609ec075104";
// uint16 offset = 0x376;
// uint64 addr = 0x98be + offset;
// uint32 insn = encodeIType(0x3, 3, 0, 5, offset); // lb x3, offset(x5)
// (State memory state, bytes memory proof) = constructRISCVState(0, insn, addr, value);
// state.registers[5] = 0x98be;
// bytes memory encodedState = encodeState(state);
function test_lb_succeeds() public {
bytes32 value = hex"f9d9c609ec075104";
uint16 offset = 0x376;
uint64 addr = 0x98be + offset;
uint8 funct3 = 0;
uint32 insn = encodeIType(0x3, 3, funct3, 5, offset); // lb x3, offset(x5)
(State memory state, bytes memory proof) = constructRISCVState(0, insn, addr, value);
state.registers[5] = 0x98be;
bytes memory encodedState = encodeState(state);

// State memory expect;
// expect.memRoot = state.memRoot;
// expect.pc = state.pc + 4;
// expect.step = state.step + 1;
// expect.registers[3] = uint8(value[0]);
// expect.registers[5] = state.registers[5];
State memory expect;
expect.memRoot = state.memRoot;
expect.pc = state.pc + 4;
expect.step = state.step + 1;
expect.registers[3] = uint8(value[0]);
bool signBit = (1 << 7) & expect.registers[3] > 0;
if (signBit) {
uint64 size = uint64(1 << (funct3 & 0x3)) * 8;
uint64 signExtension = uint64(((1 << 64 - size)) - 1) << size;
expect.registers[3] |= signExtension;
}
expect.registers[5] = state.registers[5];

// bytes32 postState = riscv.step(encodedState, proof, 0);
// assertEq(postState, outputState(expect), "unexpected post state");
// }
bytes32 postState = riscv.step(encodedState, proof, 0);
assertEq(postState, outputState(expect), "unexpected post state");
}

// function test_lh_succeeds() public {
// bytes32 value = hex"d75fe3d2157e8954";
// uint16 offset = 0x358;
// uint64 addr = 0xc9b + offset;
// uint32 insn = encodeIType(0x3, 17, 1, 15, offset); // lh x17, offset(x15)
// (State memory state, bytes memory proof) = constructRISCVState(0, insn, addr, value);
// state.registers[15] = 0xc9b;
// bytes memory encodedState = encodeState(state);
function test_lh_succeeds() public {
bytes32 value = hex"d7ffe3d2157e8954";
uint16 offset = 0x358;
uint64 addr = 0xc9b + offset;
uint8 funct3 = 1;
uint32 insn = encodeIType(0x3, 17, funct3, 15, offset); // lh x17, offset(x15)
(State memory state, bytes memory proof) = constructRISCVState(0, insn, addr, value);
state.registers[15] = 0xc9b;
bytes memory encodedState = encodeState(state);

// State memory expect;
// expect.memRoot = state.memRoot;
// expect.pc = state.pc + 4;
// expect.step = state.step + 1;
// expect.registers[17] = uint8(value[0]);
// expect.registers[15] = state.registers[15];
State memory expect;
expect.memRoot = state.memRoot;
expect.pc = state.pc + 4;
expect.step = state.step + 1;
expect.registers[17] = uint8(value[0]);
expect.registers[17] += uint8(value[1]) * (1 << 8);
bool signBit = (1 << 15) & expect.registers[17] > 0;
if (signBit) {
uint64 size = uint64(1 << (funct3 & 0x3)) * 8;
uint64 signExtension = uint64(((1 << 64 - size)) - 1) << size;
expect.registers[17] |= signExtension;
}
expect.registers[15] = state.registers[15];

// bytes32 postState = riscv.step(encodedState, proof, 0);
// assertEq(postState, outputState(expect), "unexpected post state");
// }
bytes32 postState = riscv.step(encodedState, proof, 0);
assertEq(postState, outputState(expect), "unexpected post state");
}

// function test_lw_succeeds() public {
// bytes32 value = hex"dcd20df1dbcda033";
// uint16 offset = 0x76b;
// uint64 addr = 0xa673 + offset;
// uint32 insn = encodeIType(0x3, 27, 2, 28, offset); // lw x27, offset(x28)
// (State memory state, bytes memory proof) = constructRISCVState(0, insn, addr, value);
// state.registers[28] = 0xa673;
// bytes memory encodedState = encodeState(state);
function test_lw_succeeds() public {
bytes32 value = hex"dcd20df1dbcda033";
uint16 offset = 0x358; // 0x76b does not work
uint64 addr = 0xc9b + offset;
uint8 funct3 = 2;
uint32 insn = encodeIType(0x3, 27, funct3, 28, offset); // lw x27, offset(x28)
(State memory state, bytes memory proof) = constructRISCVState(0, insn, addr, value);
state.registers[28] = 0xc9b; // 0xa673 does not work
bytes memory encodedState = encodeState(state);

// State memory expect;
// expect.memRoot = state.memRoot;
// expect.pc = state.pc + 4;
// expect.step = state.step + 1;
// expect.registers[27] = uint8(value[0]);
// expect.registers[28] = state.registers[28];
State memory expect;
expect.memRoot = state.memRoot;
expect.pc = state.pc + 4;
expect.step = state.step + 1;
expect.registers[27] = uint8(value[0]);
expect.registers[27] += uint8(value[1]) * (1 << 8);
expect.registers[27] += uint8(value[2]) * (1 << 16);
expect.registers[27] += uint8(value[3]) * (1 << 24);
bool signBit = (1 << 31) & expect.registers[27] > 0;
if (signBit) {
uint64 size = uint64(1 << (funct3 & 0x3)) * 8;
uint64 signExtension = uint64(((1 << 64 - size)) - 1) << size;
expect.registers[27] |= signExtension;
}
expect.registers[28] = state.registers[28];

// bytes32 postState = riscv.step(encodedState, proof, 0);
// assertEq(postState, outputState(expect), "unexpected post state");
// }
bytes32 postState = riscv.step(encodedState, proof, 0);
assertEq(postState, outputState(expect), "unexpected post state");
}

// function test_ld_succeeds() public {
// bytes32 value = hex"196faeb2a761c3a7";
Expand Down

0 comments on commit 567afde

Please sign in to comment.