From 5c6e51a3ce5dad7925a76cf1f239411883b2566a Mon Sep 17 00:00:00 2001 From: samoht9277 Date: Mon, 4 Nov 2024 16:58:31 -0300 Subject: [PATCH 1/4] Set rust optimizations to 0. --- docker/aligned_base.Dockerfile | 6 ++++++ docker/batcher.Dockerfile | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/docker/aligned_base.Dockerfile b/docker/aligned_base.Dockerfile index 65d4df732..176e3cb41 100644 --- a/docker/aligned_base.Dockerfile +++ b/docker/aligned_base.Dockerfile @@ -41,6 +41,8 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" + # build_sp1_linux COPY operator/sp1/lib/Cargo.toml /aligned_layer/operator/sp1/lib/Cargo.toml COPY operator/sp1/lib/src/ /aligned_layer/operator/sp1/lib/src/ @@ -73,6 +75,8 @@ RUN cargo chef prepare --recipe-path /aligned_layer/operator/merkle_tree/lib/rec FROM chef AS chef_builder +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" + COPY batcher/aligned-sdk /aligned_layer/batcher/aligned-sdk/ # build_sp1_linux @@ -107,6 +111,8 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/operator/merkle_tree/ FROM base AS builder +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" + ENV RELEASE_FLAG=--release ENV TARGET_REL_PATH=release ENV CARGO_NET_GIT_FETCH_WITH_CLI=true diff --git a/docker/batcher.Dockerfile b/docker/batcher.Dockerfile index 0f7689abb..aad5bdb94 100644 --- a/docker/batcher.Dockerfile +++ b/docker/batcher.Dockerfile @@ -11,6 +11,8 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" + COPY batcher/aligned-batcher/Cargo.toml /aligned_layer/batcher/aligned-batcher/Cargo.toml COPY batcher/aligned-batcher/src/main.rs /aligned_layer/batcher/aligned-batcher/src/main.rs WORKDIR /aligned_layer/batcher/aligned-batcher/ @@ -22,6 +24,9 @@ WORKDIR /aligned_layer/batcher/aligned/ RUN cargo chef prepare --recipe-path /aligned_layer/batcher/aligned/recipe.json FROM chef AS chef_builder + +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" + COPY batcher/aligned-sdk/ /aligned_layer/batcher/aligned-sdk/ COPY --from=planner /aligned_layer/batcher/aligned-batcher/recipe.json /aligned_layer/batcher/aligned-batcher/recipe.json @@ -33,6 +38,9 @@ WORKDIR /aligned_layer/batcher/aligned/ RUN cargo chef cook --release --recipe-path /aligned_layer/batcher/aligned/recipe.json FROM base AS builder + +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" + COPY . /aligned_layer/ COPY --from=chef_builder /aligned_layer/batcher/aligned-batcher/target/ /aligned_layer/batcher/aligned-batcher/target/ From 3eda7db1cdc5111d498da297af1ab5bb2a0df8b4 Mon Sep 17 00:00:00 2001 From: MauroFab Date: Tue, 5 Nov 2024 14:13:45 -0300 Subject: [PATCH 2/4] Change opt from 0 to 1 --- docker/aligned_base.Dockerfile | 6 +++--- docker/batcher.Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/aligned_base.Dockerfile b/docker/aligned_base.Dockerfile index 176e3cb41..982370e9a 100644 --- a/docker/aligned_base.Dockerfile +++ b/docker/aligned_base.Dockerfile @@ -41,7 +41,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" # build_sp1_linux COPY operator/sp1/lib/Cargo.toml /aligned_layer/operator/sp1/lib/Cargo.toml @@ -75,7 +75,7 @@ RUN cargo chef prepare --recipe-path /aligned_layer/operator/merkle_tree/lib/rec FROM chef AS chef_builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" COPY batcher/aligned-sdk /aligned_layer/batcher/aligned-sdk/ @@ -111,7 +111,7 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/operator/merkle_tree/ FROM base AS builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" ENV RELEASE_FLAG=--release ENV TARGET_REL_PATH=release diff --git a/docker/batcher.Dockerfile b/docker/batcher.Dockerfile index aad5bdb94..fd1545c53 100644 --- a/docker/batcher.Dockerfile +++ b/docker/batcher.Dockerfile @@ -11,7 +11,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" COPY batcher/aligned-batcher/Cargo.toml /aligned_layer/batcher/aligned-batcher/Cargo.toml COPY batcher/aligned-batcher/src/main.rs /aligned_layer/batcher/aligned-batcher/src/main.rs @@ -25,7 +25,7 @@ RUN cargo chef prepare --recipe-path /aligned_layer/batcher/aligned/recipe.json FROM chef AS chef_builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" COPY batcher/aligned-sdk/ /aligned_layer/batcher/aligned-sdk/ @@ -39,7 +39,7 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/batcher/aligned/recip FROM base AS builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=0" +ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" COPY . /aligned_layer/ From e3a4f76c5d23e124c4859229cd537e28bb3bb0c4 Mon Sep 17 00:00:00 2001 From: MauroFab Date: Tue, 5 Nov 2024 14:32:55 -0300 Subject: [PATCH 3/4] Remove incremental build --- docker/aligned_base.Dockerfile | 6 +++--- docker/batcher.Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/aligned_base.Dockerfile b/docker/aligned_base.Dockerfile index 982370e9a..112749c15 100644 --- a/docker/aligned_base.Dockerfile +++ b/docker/aligned_base.Dockerfile @@ -41,7 +41,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" # build_sp1_linux COPY operator/sp1/lib/Cargo.toml /aligned_layer/operator/sp1/lib/Cargo.toml @@ -75,7 +75,7 @@ RUN cargo chef prepare --recipe-path /aligned_layer/operator/merkle_tree/lib/rec FROM chef AS chef_builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" COPY batcher/aligned-sdk /aligned_layer/batcher/aligned-sdk/ @@ -111,7 +111,7 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/operator/merkle_tree/ FROM base AS builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" ENV RELEASE_FLAG=--release ENV TARGET_REL_PATH=release diff --git a/docker/batcher.Dockerfile b/docker/batcher.Dockerfile index fd1545c53..3f7f50687 100644 --- a/docker/batcher.Dockerfile +++ b/docker/batcher.Dockerfile @@ -11,7 +11,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" COPY batcher/aligned-batcher/Cargo.toml /aligned_layer/batcher/aligned-batcher/Cargo.toml COPY batcher/aligned-batcher/src/main.rs /aligned_layer/batcher/aligned-batcher/src/main.rs @@ -25,7 +25,7 @@ RUN cargo chef prepare --recipe-path /aligned_layer/batcher/aligned/recipe.json FROM chef AS chef_builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" COPY batcher/aligned-sdk/ /aligned_layer/batcher/aligned-sdk/ @@ -39,7 +39,7 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/batcher/aligned/recip FROM base AS builder -ENV RUSTFLAGS="-C codegen-units=256 -C incremental=true -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" COPY . /aligned_layer/ From eb3555b68437f879ac927aeafa9d29d6116e2825 Mon Sep 17 00:00:00 2001 From: MauroFab Date: Tue, 5 Nov 2024 19:54:19 -0300 Subject: [PATCH 4/4] Test opt 2 --- docker/aligned_base.Dockerfile | 6 +++--- docker/batcher.Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/aligned_base.Dockerfile b/docker/aligned_base.Dockerfile index 112749c15..b4185bddd 100644 --- a/docker/aligned_base.Dockerfile +++ b/docker/aligned_base.Dockerfile @@ -41,7 +41,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner -ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=2" # build_sp1_linux COPY operator/sp1/lib/Cargo.toml /aligned_layer/operator/sp1/lib/Cargo.toml @@ -75,7 +75,7 @@ RUN cargo chef prepare --recipe-path /aligned_layer/operator/merkle_tree/lib/rec FROM chef AS chef_builder -ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=2" COPY batcher/aligned-sdk /aligned_layer/batcher/aligned-sdk/ @@ -111,7 +111,7 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/operator/merkle_tree/ FROM base AS builder -ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=2" ENV RELEASE_FLAG=--release ENV TARGET_REL_PATH=release diff --git a/docker/batcher.Dockerfile b/docker/batcher.Dockerfile index 3f7f50687..3fb3fd869 100644 --- a/docker/batcher.Dockerfile +++ b/docker/batcher.Dockerfile @@ -11,7 +11,7 @@ FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef FROM chef AS planner -ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=2" COPY batcher/aligned-batcher/Cargo.toml /aligned_layer/batcher/aligned-batcher/Cargo.toml COPY batcher/aligned-batcher/src/main.rs /aligned_layer/batcher/aligned-batcher/src/main.rs @@ -25,7 +25,7 @@ RUN cargo chef prepare --recipe-path /aligned_layer/batcher/aligned/recipe.json FROM chef AS chef_builder -ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=2" COPY batcher/aligned-sdk/ /aligned_layer/batcher/aligned-sdk/ @@ -39,7 +39,7 @@ RUN cargo chef cook --release --recipe-path /aligned_layer/batcher/aligned/recip FROM base AS builder -ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=1" +ENV RUSTFLAGS="-C codegen-units=256 -C opt-level=2" COPY . /aligned_layer/