Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Remove RISC-V assembler #1852

Merged
merged 6 commits into from
Oct 2, 2024
Merged

Remove RISC-V assembler #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96e0acd
Removing asm path.
lvella Sep 30, 2024
a7446de
Fix instruction tests build.rs.
lvella Sep 30, 2024
0c79dd8
Removing stale dependencies.
lvella Sep 30, 2024
0511024
Fixing identification of binaries.
lvella Sep 30, 2024
907ac58
read-slices as executable
lvella Sep 30, 2024
7c67bd7
Removing unneeded stuff from the build command.
lvella Sep 30, 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
4 changes: 3 additions & 1 deletion .github/workflows/nightly-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ jobs:
run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu
- name: Install nightly
run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install stdlib
- name: Install std source
run: rustup component add rust-src --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install riscv target
run: rustup target add riscv32imac-unknown-none-elf --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we not need this before?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We built the core libraries from source, since we needed the .s files. Now we can use the pre-built.

Then you ask: "Then why do we still need the line above, that installs the rust source?"

Because the risc0 target we use for std support is a lower tier and doesn't have pre-builds, so we still need to build std from source when using it.

- name: Install EStarkPolygon prover dependencies
run: sudo apt-get install -y nlohmann-json3-dev libpqxx-dev nasm
- name: Install pilcom
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/pr-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ jobs:
run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.81-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.81-x86_64-unknown-linux-gnu
- name: Install nightly
run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install stdlib
- name: Install std source
run: rustup component add rust-src --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install riscv target
run: rustup target add riscv32imac-unknown-none-elf --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install pilcom
run: git clone https://github.com/0xPolygonHermez/pilcom.git && cd pilcom && npm install
- uses: taiki-e/install-action@nextest
Expand Down Expand Up @@ -148,8 +150,10 @@ jobs:
run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.81-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.81-x86_64-unknown-linux-gnu
- name: Install nightly
run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install stdlib
- name: Install std source
run: rustup component add rust-src --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install riscv target
run: rustup target add riscv32imac-unknown-none-elf --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install pilcom
run: git clone https://github.com/0xPolygonHermez/pilcom.git && cd pilcom && npm install
- name: Install EStarkPolygon prover system dependency
Expand Down Expand Up @@ -198,8 +202,10 @@ jobs:
run: sudo apt-get install -y binutils-riscv64-unknown-elf lld
- name: Install nightly
run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install stdlib
- name: Install std source
run: rustup component add rust-src --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
- name: Install riscv target
run: rustup target add riscv32imac-unknown-none-elf --toolchain nightly-2024-08-01-x86_64-unknown-linux-gnu
leonardoalt marked this conversation as resolved.
Show resolved Hide resolved
- name: Install pilcom
run: git clone https://github.com/0xPolygonHermez/pilcom.git && cd pilcom && npm install
- uses: taiki-e/install-action@nextest
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ members = [
"ast",
"analysis",
"linker",
"asm-utils",
"isa-utils",
"airgen",
"riscv-executor",
"riscv-syscalls",
Expand All @@ -44,7 +44,7 @@ powdr = { path = "./powdr", version = "0.1.0-alpha.2" }
powdr-airgen = { path = "./airgen", version = "0.1.0-alpha.2" }
powdr-ast = { path = "./ast", version = "0.1.0-alpha.2" }
powdr-asm-to-pil = { path = "./asm-to-pil", version = "0.1.0-alpha.2" }
powdr-asm-utils = { path = "./asm-utils", version = "0.1.0-alpha.2" }
powdr-isa-utils = { path = "./isa-utils", version = "0.1.0-alpha.2" }
powdr-analysis = { path = "./analysis", version = "0.1.0-alpha.2" }
powdr-backend = { path = "./backend", version = "0.1.0-alpha.2" }
powdr-executor = { path = "./executor", version = "0.1.0-alpha.2" }
Expand Down Expand Up @@ -74,4 +74,4 @@ codegen-units = 256

[profile.release-with-debug]
inherits = "release"
debug = true
debug = true
220 changes: 0 additions & 220 deletions asm-utils/src/ast.rs
View file
Open in desktop

This file was deleted.

Loading