Merge branch 'matthias/flat-structure-again' into matthias/ceno_host

scroll-tech · Dec 13, 2024 · 77df864 · 77df864
2 parents 5a95f70 + 0d2e317
commit 77df864
Show file tree

Hide file tree

Showing 24 changed files with 115 additions and 36 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-exclude = ["guest"]
+exclude = ["ceno_rt", "examples"]
 members = [
   "ceno_emul",
   "ceno_host",

diff --git a/guest/.cargo/config.toml → ceno_rt/.cargo/config.toml b/guest/.cargo/config.toml → ceno_rt/.cargo/config.toml
diff --git a/ceno_rt/Cargo.lock b/ceno_rt/Cargo.lock
diff --git a/guest/Cargo.toml → ceno_rt/Cargo.toml b/guest/Cargo.toml → ceno_rt/Cargo.toml
@@ -1,15 +1,17 @@
-[workspace]
-members = ["examples", "ceno_rt"]
-resolver = "2"
-
-[workspace.package]
+[package]
 categories = ["cryptography", "zk", "blockchain", "ceno"]
+description = "Ceno runtime library"
 edition = "2021"
 keywords = ["cryptography", "zk", "blockchain", "ceno"]
 license = "MIT OR Apache-2.0"
-readme = "../README.md"
+name = "ceno_rt"
+readme = "README.md"
 repository = "https://github.com/scroll-tech/ceno"
 version = "0.1.0"
 
-[profile.release]
-lto = "thin"
+[dependencies]
+riscv = "0.12"
+rkyv = { version = "0.8", default-features = false, features = [
+  "alloc",
+  "bytecheck",
+] }
diff --git a/guest/ceno_rt/README.md → ceno_rt/README.md b/guest/ceno_rt/README.md → ceno_rt/README.md
diff --git a/guest/ceno_rt/build.rs → ceno_rt/build.rs b/guest/ceno_rt/build.rs → ceno_rt/build.rs
diff --git a/guest/ceno_rt/ceno_link.x → ceno_rt/ceno_link.x b/guest/ceno_rt/ceno_link.x → ceno_rt/ceno_link.x
diff --git a/guest/ceno_rt/memory.x → ceno_rt/memory.x b/guest/ceno_rt/memory.x → ceno_rt/memory.x
diff --git a/guest/ceno_rt/src/allocator.rs → ceno_rt/src/allocator.rs b/guest/ceno_rt/src/allocator.rs → ceno_rt/src/allocator.rs
diff --git a/guest/ceno_rt/src/io.rs → ceno_rt/src/io.rs b/guest/ceno_rt/src/io.rs → ceno_rt/src/io.rs
diff --git a/guest/ceno_rt/src/lib.rs → ceno_rt/src/lib.rs b/guest/ceno_rt/src/lib.rs → ceno_rt/src/lib.rs
diff --git a/guest/ceno_rt/src/mmio.rs → ceno_rt/src/mmio.rs b/guest/ceno_rt/src/mmio.rs → ceno_rt/src/mmio.rs
diff --git a/guest/ceno_rt/src/params.rs → ceno_rt/src/params.rs b/guest/ceno_rt/src/params.rs → ceno_rt/src/params.rs
diff --git a/examples-builder/build.rs b/examples-builder/build.rs
@@ -27,7 +27,7 @@ fn build_elfs() {
     // See git history for an attempt to do this.
     let output = Command::new("cargo")
         .args(["build", "--release", "--examples"])
-        .current_dir("../guest/examples")
+        .current_dir("../examples")
         .env_clear()
         .envs(std::env::vars().filter(|x| !x.0.starts_with("CARGO_")))
         .output()
@@ -42,11 +42,11 @@ fn build_elfs() {
             dest,
             r#"#[allow(non_upper_case_globals)]
             pub const {example}: &[u8] =
-                include_bytes!(r"{CARGO_MANIFEST_DIR}/../guest/target/riscv32im-unknown-none-elf/release/examples/{example}");"#
+                include_bytes!(r"{CARGO_MANIFEST_DIR}/../examples/target/riscv32im-unknown-none-elf/release/examples/{example}");"#
         ).expect("failed to write vars.rs");
     }
-    let input_path = "../guest/";
-    let elfs_path = "../guest/target/riscv32im-unknown-none-elf/release/examples/";
+    let input_path = "../examples/";
+    let elfs_path = "../examples/target/riscv32im-unknown-none-elf/release/examples/";
 
     println!("cargo:rerun-if-changed={input_path}");
     println!("cargo:rerun-if-changed={elfs_path}");

diff --git a/examples/.cargo/config.toml b/examples/.cargo/config.toml
@@ -0,0 +1 @@
+../../ceno_rt/.cargo/config.toml
diff --git a/guest/Cargo.lock → examples/Cargo.lock b/guest/Cargo.lock → examples/Cargo.lock
diff --git a/guest/examples/Cargo.toml → examples/Cargo.toml b/guest/examples/Cargo.toml → examples/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
-categories.workspace = true
+categories = ["cryptography", "zk", "blockchain", "ceno"]
 description = "Ceno RiscV guest examples"
-edition.workspace = true
-keywords.workspace = true
-license.workspace = true
+edition = "2021"
+keywords = ["cryptography", "zk", "blockchain", "ceno"]
+license = "MIT OR Apache-2.0"
 name = "examples"
 readme = "README.md"
-repository.workspace = true
-version.workspace = true
+repository = "https://github.com/scroll-tech/ceno"
+version = "0.1.0"
 
 [dependencies]
 ceno_rt = { path = "../ceno_rt" }

diff --git a/guest/examples/examples/ceno_rt_alloc.rs → examples/examples/ceno_rt_alloc.rs b/guest/examples/examples/ceno_rt_alloc.rs → examples/examples/ceno_rt_alloc.rs
diff --git a/guest/examples/examples/ceno_rt_io.rs → examples/examples/ceno_rt_io.rs b/guest/examples/examples/ceno_rt_io.rs → examples/examples/ceno_rt_io.rs
diff --git a/guest/examples/examples/ceno_rt_mem.rs → examples/examples/ceno_rt_mem.rs b/guest/examples/examples/ceno_rt_mem.rs → examples/examples/ceno_rt_mem.rs
diff --git a/guest/examples/examples/ceno_rt_mini.rs → examples/examples/ceno_rt_mini.rs b/guest/examples/examples/ceno_rt_mini.rs → examples/examples/ceno_rt_mini.rs
diff --git a/guest/examples/examples/ceno_rt_panic.rs → examples/examples/ceno_rt_panic.rs b/guest/examples/examples/ceno_rt_panic.rs → examples/examples/ceno_rt_panic.rs
diff --git a/guest/examples/examples/hints.rs → examples/examples/hints.rs b/guest/examples/examples/hints.rs → examples/examples/hints.rs
diff --git a/guest/ceno_rt/Cargo.toml b/guest/ceno_rt/Cargo.toml