feat: Forward ports#49

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

Merged
wwared merged 5 commits into from
Jun 20, 2024
Merged

feat: Forward ports #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b72c9f1
chore: fixes (#821)
jtguibas Jun 3, 2024
8307315
fix: Adapt Sphinx chips to nonce changes
wwared Jun 17, 2024
0977f63
chore: clippy and fmt
wwared Jun 18, 2024
1aa3bf2
fix: Revert some memory chip constraints
wwared Jun 19, 2024
ebb0730
fix: Update `sp1-patches` commits (#56)
samuelburnham Jun 19, 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
13 changes: 4 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down
3 changes: 2 additions & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down
8 changes: 8 additions & 0 deletions core/src/air/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
c: Word<impl Into<Self::Expr>>,
shard: impl Into<Self::Expr>,
channel: impl Into<Self::Expr>,
nonce: impl Into<Self::Expr>,
multiplicity: impl Into<Self::Expr>,
) {
let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
.chain(c.0.into_iter().map(Into::into))
.chain(once(shard.into()))
.chain(once(channel.into()))
.chain(once(nonce.into()))
.collect();

self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
c: Word<impl Into<Self::Expr>>,
shard: impl Into<Self::Expr>,
channel: impl Into<Self::Expr>,
nonce: impl Into<Self::Expr>,
multiplicity: impl Into<Self::Expr>,
) {
let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
.chain(c.0.into_iter().map(Into::into))
.chain(once(shard.into()))
.chain(once(channel.into()))
.chain(once(nonce.into()))
.collect();

self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
shard: impl Into<Self::Expr> + Clone,
channel: impl Into<Self::Expr> + Clone,
clk: impl Into<Self::Expr> + Clone,
nonce: impl Into<Self::Expr> + Clone,
syscall_id: impl Into<Self::Expr> + Clone,
arg1: impl Into<Self::Expr> + Clone,
arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
shard.clone().into(),
channel.clone().into(),
clk.clone().into(),
nonce.clone().into(),
syscall_id.clone().into(),
arg1.clone().into(),
arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
shard: impl Into<Self::Expr> + Clone,
channel: impl Into<Self::Expr> + Clone,
clk: impl Into<Self::Expr> + Clone,
nonce: impl Into<Self::Expr> + Clone,
syscall_id: impl Into<Self::Expr> + Clone,
arg1: impl Into<Self::Expr> + Clone,
arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
shard.clone().into(),
channel.clone().into(),
clk.clone().into(),
nonce.clone().into(),
syscall_id.clone().into(),
arg1.clone().into(),
arg2.clone().into(),
Expand Down
23 changes: 22 additions & 1 deletion core/src/alu/add_sub/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
/// The channel number, used for byte lookup table.
pub channel: T,

/// The nonce of the operation.
pub nonce: T,

/// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
/// It's result will be `a` for the add operation and `b` for the sub operation.
pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
// Pad the trace to a power of two.
pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

// Write the nonces to the trace.
for i in 0..trace.height() {
let cols: &mut AddSubCols<F> =
trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
cols.nonce = F::from_canonical_usize(i);
}

trace
}

Expand All@@ -162,6 +173,14 @@ where
let main = builder.main();
let local = main.row_slice(0);
let local: &AddSubCols<AB::Var> = (*local).borrow();
let next = main.row_slice(1);
let next: &AddSubCols<AB::Var> = (*next).borrow();

// Constrain the incrementing nonce.
builder.when_first_row().assert_zero(local.nonce);
builder
.when_transition()
.assert_eq(local.nonce + AB::Expr::one(), next.nonce);

// Evaluate the addition operation.
AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
local.operand_2,
local.shard,
local.channel,
local.nonce,
local.is_add,
);

Expand All@@ -194,6 +214,7 @@ where
local.operand_2,
local.shard,
local.channel,
local.nonce,
local.is_sub,
);

Expand Down
20 changes: 20 additions & 0 deletions core/src/alu/bitwise/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
/// The channel number, used for byte lookup table.
pub channel: T,

/// The nonce of the operation.
pub nonce: T,

/// The output operand.
pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
// Pad the trace to a power of two.
pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

for i in 0..trace.height() {
let cols: &mut BitwiseCols<F> =
trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
cols.nonce = F::from_canonical_usize(i);
}

trace
}

Expand All@@ -141,6 +152,14 @@ where
let main = builder.main();
let local = main.row_slice(0);
let local: &BitwiseCols<AB::Var> = (*local).borrow();
let next = main.row_slice(1);
let next: &BitwiseCols<AB::Var> = (*next).borrow();

// Constrain the incrementing nonce.
builder.when_first_row().assert_zero(local.nonce);
builder
.when_transition()
.assert_eq(local.nonce + AB::Expr::one(), next.nonce);

// Get the opcode for the operation.
let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
local.c,
local.shard,
local.channel,
local.nonce,
local.is_xor + local.is_or + local.is_and,
);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: Forward ports#49

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

 Merged

wwared
merged 5 commits into

from

Jun 20, 2024
 Merged


feat: Forward ports
#49
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b72c9f1

chore: fixes (#821)


jtguibas Jun 3, 2024
8307315

fix: Adapt Sphinx chips to nonce changes


wwared Jun 17, 2024
0977f63

chore: clippy and fmt


wwared Jun 18, 2024
1aa3bf2

fix: Revert some memory chip constraints


wwared Jun 19, 2024
ebb0730

fix: Update `sp1-patches` commits (#56)


samuelburnham Jun 19, 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


13 changes: 4 additions & 9 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
criterion = "0.5.1"
csv = "1.3.0"
curve25519-dalek = "4.1.2"
curve25519-dalek = "4.1.3"
dotenv = "0.15.0"
elf = "0.7.4"
elliptic-curve = "0.13.8"
Expand Down

3 changes: 2 additions & 1 deletion
core/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,8 +46,8 @@ hex = { workspace = true }
hybrid-array = { workspace = true }
k256 = { workspace = true, features = ["expose-field"] }
num_cpus = { workspace = true }
serde_with = { workspace = true }
serial_test = { workspace = true }
serde_with = { workspace = true }
size = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true }
Expand All@@ -59,6 +59,7 @@ web-time = { workspace = true }
rayon-scan = { workspace = true }
thiserror = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }

[dev-dependencies]
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down

8 changes: 8 additions & 0 deletions
core/src/air/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,6 +307,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -315,6 +316,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.send(AirInteraction::new(
Expand All@@ -334,6 +336,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 c: Word<impl Into<Self::Expr>>,
 shard: impl Into<Self::Expr>,
 channel: impl Into<Self::Expr>,
 nonce: impl Into<Self::Expr>,
 multiplicity: impl Into<Self::Expr>,
 ) {
 let values = once(opcode.into())
Expand All@@ -342,6 +345,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 .chain(c.0.into_iter().map(Into::into))
 .chain(once(shard.into()))
 .chain(once(channel.into()))
 .chain(once(nonce.into()))
 .collect();

 self.receive(AirInteraction::new(
Expand All@@ -358,6 +362,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -368,6 +373,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand All@@ -384,6 +390,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard: impl Into<Self::Expr> + Clone,
 channel: impl Into<Self::Expr> + Clone,
 clk: impl Into<Self::Expr> + Clone,
 nonce: impl Into<Self::Expr> + Clone,
 syscall_id: impl Into<Self::Expr> + Clone,
 arg1: impl Into<Self::Expr> + Clone,
 arg2: impl Into<Self::Expr> + Clone,
Expand All@@ -394,6 +401,7 @@ pub trait AluAirBuilder: BaseAirBuilder {
 shard.clone().into(),
 channel.clone().into(),
 clk.clone().into(),
 nonce.clone().into(),
 syscall_id.clone().into(),
 arg1.clone().into(),
 arg2.clone().into(),
Expand Down

23 changes: 22 additions & 1 deletion
core/src/alu/add_sub/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ use core::{
 mem::size_of,
};

use p3_air::{Air, BaseAir};
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -43,6 +44,9 @@ pub struct AddSubCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// Instance of `AddOperation` to handle addition logic in `AddSubChip`'s ALU operations.
 /// It's result will be `a` for the add operation and `b` for the sub operation.
 pub add_operation: AddOperation<T>,
Expand DownExpand Up@@ -140,6 +144,13 @@ impl<F: PrimeField> MachineAir<F> for AddSubChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_ADD_SUB_COLS, F>(&mut trace.values);

 // Write the nonces to the trace.
 for i in 0..trace.height() {
 let cols: &mut AddSubCols<F> =
 trace.values[i * NUM_ADD_SUB_COLS..(i + 1) * NUM_ADD_SUB_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -162,6 +173,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &AddSubCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &AddSubCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Evaluate the addition operation.
 AddOperation::<AB::F>::eval(
Expand All@@ -183,6 +202,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_add,
 );

Expand All@@ -194,6 +214,7 @@ where
 local.operand_2,
 local.shard,
 local.channel,
 local.nonce,
 local.is_sub,
 );

Expand Down

20 changes: 20 additions & 0 deletions
core/src/alu/bitwise/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,9 @@ use core::{
 mem::size_of,
};

use p3_air::AirBuilder;
use p3_air::{Air, BaseAir};
use p3_field::AbstractField;
use p3_field::PrimeField;
use p3_matrix::dense::RowMajorMatrix;
use p3_matrix::Matrix;
Expand DownExpand Up@@ -35,6 +37,9 @@ pub struct BitwiseCols<T> {
 /// The channel number, used for byte lookup table.
 pub channel: T,

 /// The nonce of the operation.
 pub nonce: T,

 /// The output operand.
 pub a: Word<T>,

Expand DownExpand Up@@ -119,6 +124,12 @@ impl<F: PrimeField> MachineAir<F> for BitwiseChip {
 // Pad the trace to a power of two.
 pad_to_power_of_two::<NUM_BITWISE_COLS, F>(&mut trace.values);

 for i in 0..trace.height() {
 let cols: &mut BitwiseCols<F> =
 trace.values[i * NUM_BITWISE_COLS..(i + 1) * NUM_BITWISE_COLS].borrow_mut();
 cols.nonce = F::from_canonical_usize(i);
 }

 trace
 }

Expand All@@ -141,6 +152,14 @@ where
 let main = builder.main();
 let local = main.row_slice(0);
 let local: &BitwiseCols<AB::Var> = (*local).borrow();
 let next = main.row_slice(1);
 let next: &BitwiseCols<AB::Var> = (*next).borrow();

 // Constrain the incrementing nonce.
 builder.when_first_row().assert_zero(local.nonce);
 builder
 .when_transition()
 .assert_eq(local.nonce + AB::Expr::one(), next.nonce);

 // Get the opcode for the operation.
 let opcode = local.is_xor * ByteOpcode::XOR.as_field::<AB::F>()
Expand DownExpand Up@@ -174,6 +193,7 @@ where
 local.c,
 local.shard,
 local.channel,
 local.nonce,
 local.is_xor + local.is_or + local.is_and,
 );

Expand Down
Loading