Multi rust projects (#4362)

programs/bpf/build.rs

@@ -67,14 +67,15 @@ fn main() {
             .expect("Unable to create BPF install directory")
             .success());
 
-        let rust_programs = ["noop"];
+        let rust_programs = ["iter", "noop"];
         for program in rust_programs.iter() {
             println!(
-                "cargo:warning=(not a warning) Building Rust-based BPF program: solana_bpf_rust_{}",
+                "cargo:warning=(not a warning) Building Rust-based BPF programs: solana_bpf_rust_{}",
                 program
             );
             assert!(Command::new("./build.sh")
-                .current_dir(format!("rust/{}", program))
+                .current_dir("rust")
+                .arg(program)
                 .status()
                 .expect(&format!(
                     "Failed to call solana-bpf-rust-{}'s build.sh",

programs/bpf/rust/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+bpf_sdk=../../../sdk/bpf
+./"$bpf_sdk"/rust-utils/build.sh "$PWD"/"$1"

programs/bpf/rust/clean.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+bpf_sdk=../../../sdk/bpf
+./"$bpf_sdk"/rust-utils/clean.sh "$PWD"/"$1"

programs/bpf/rust/dump.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+./clean.sh "$1"
+./build.sh "$1"
+
+cd "$1"
+
+cp ./target/dump.txt ./targetdump-last.txt 2>/dev/null
+
+set -ex
+
+ls -la ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"$1".so > ./target/dump_mangled.txt
+greadelf -aW ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"$1".so >> ./target/dump_mangled.txt
+llvm-objdump -print-imm-hex --source --disassemble ./target/bpfel-unknown-unknown/release/solana_bpf_rust_"$1".so >> ./target/dump_mangled.txt
+sed s/://g < ./target/dump_mangled.txt | rustfilt > ./target/dump.txt
+

programs/bpf/rust/iter/.gitignore

@@ -0,0 +1,3 @@
+/target/
+
+Cargo.lock

programs/bpf/rust/iter/Cargo.toml

@@ -0,0 +1,22 @@
+
+# Note: This crate must be built using build.sh
+
+[package]
+name = "solana-bpf-rust-iter"
+version = "0.15.0"
+description = "Solana BPF iter program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.com>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+edition = "2018"
+
+[dependencies]
+solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.15.0" }
+
+[workspace]
+members = []
+
+[lib]
+name = "solana_bpf_rust_iter"
+crate-type = ["cdylib"]

programs/bpf/rust/iter/Xargo.toml

@@ -0,0 +1,7 @@
+
+
+[dependencies.compiler_builtins]
+path = "../../../../sdk/bpf/rust-bpf-sysroot/src/compiler-builtins"
+
+[target.bpfel-unknown-unknown.dependencies]
+alloc = { path = "../../../../sdk/bpf/rust-bpf-sysroot/src/liballoc" }

programs/bpf/rust/iter/src/lib.rs

@@ -0,0 +1,23 @@
+//! @brief Example Rust-based BPF program that prints out the parameters passed to it
+
+#![no_std]
+
+extern crate solana_sdk_bpf_utils;
+
+use solana_sdk_bpf_utils::*;
+
+#[no_mangle]
+pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
+    const ITERS: usize = 100;
+    let ones = [1_u64; ITERS];
+    let mut sum: u64 = 0;
+
+    for v in ones.iter() {
+        sum += *v;
+    }
+    sol_log_64(0xff, 0, 0, 0, sum);
+    assert_eq!(sum, ITERS as u64);
+
+    sol_log("Success");
+    true
+}

programs/bpf/rust/noop/Xargo.toml

@@ -1,4 +1,7 @@
 
 
 [dependencies.compiler_builtins]
-path = "../../../../sdk/bpf/rust-bpf-sysroot/src/compiler-builtins"
+path = "../../../../sdk/bpf/rust-bpf-sysroot/src/compiler-builtins"
+
+[target.bpfel-unknown-unknown.dependencies]
+alloc = { path = "../../../../sdk/bpf/rust-bpf-sysroot/src/liballoc" }

programs/bpf/rust/noop/clean.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-cargo clean

programs/bpf/rust/noop/dump.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-cp dump.txt dump_last.txt 2>/dev/null
-
-set -x
-set -e
-
-./clean.sh
-./build.sh
-ls -la ./target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so > dump.txt
-greadelf -aW ./target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so | rustfilt >> dump.txt
-llvm-objdump -print-imm-hex --source --disassemble ./target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so >> dump.txt

programs/bpf/tests/programs.rs

@@ -2,7 +2,7 @@
 mod bpf {
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
-    use solana_runtime::loader_utils::{create_invoke_instruction, load_program};
+    use solana_runtime::loader_utils::load_program;
     use solana_sdk::genesis_block::create_genesis_block;
     use solana_sdk::native_loader;
     use std::env;
@@ -27,6 +27,7 @@ mod bpf {
     #[cfg(feature = "bpf_c")]
     mod bpf_c {
         use super::*;
+        use solana_runtime::loader_utils::create_invoke_instruction;
         use solana_sdk::bpf_loader;
         use solana_sdk::client::SyncClient;
         use solana_sdk::signature::KeypairUtil;
@@ -93,22 +94,22 @@ mod bpf {
         }
     }
 
-    // Cannot currently build the Rust BPF program as part
-    // of the rest of the build due to recursive `cargo build` causing
-    // a build deadlock.  Therefore you must build the Rust programs
-    // yourself first by calling `make all` in the Rust BPF program's directory
     #[cfg(feature = "bpf_rust")]
     mod bpf_rust {
         use super::*;
         use solana_sdk::client::SyncClient;
-        use solana_sdk::signature::KeypairUtil;
+        use solana_sdk::instruction::{AccountMeta, Instruction};
+        use solana_sdk::signature::{Keypair, KeypairUtil};
         use std::io::Read;
 
         #[test]
         fn test_program_bpf_rust() {
             solana_logger::setup();
 
-            let programs = ["solana_bpf_rust_noop"];
+            let programs = [
+                // Disable due to #4271 "solana_bpf_rust_iter",
+                "solana_bpf_rust_noop",
+            ];
             for program in programs.iter() {
                 let filename = create_bpf_path(program);
                 println!("Test program: {:?} from {:?}", program, filename);
@@ -129,8 +130,11 @@ mod bpf {
 
                 // Call user program
                 let program_id = load_program(&bank_client, &alice_keypair, &loader_id, elf);
-                let instruction =
-                    create_invoke_instruction(alice_keypair.pubkey(), program_id, &1u8);
+                let account_metas = vec![
+                    AccountMeta::new(alice_keypair.pubkey(), true),
+                    AccountMeta::new(Keypair::new().pubkey(), false),
+                ];
+                let instruction = Instruction::new(program_id, &1u8, account_metas);
                 bank_client
                     .send_instruction(&alice_keypair, instruction)
                     .unwrap();

sdk/bpf/rust-utils/build.sh

@@ -1,27 +1,38 @@
 #!/usr/bin/env bash
 
+if [ "$#" -ne 1 ]; then
+    echo "Error: Must provide the full path to the project to build"
+    exit 1
+fi
+if [ ! -d "$1" ]; then
+      echo "Error: Cannot find project: $1"
+    exit 1
+fi
+
 cd "$(dirname "$0")"
+bpf_sdk="$PWD/.."
+export XARGO_HOME="$PWD/../../../target/xargo"
+
+cd "$1"
 
 cargo install xargo
 
 set -e
 
-bpf_sdk=../../../../sdk/bpf
-
 # Ensure the sdk is installed
 "$bpf_sdk"/scripts/install.sh
 
 export RUSTUP_TOOLCHAIN=bpf
-export RUSTFLAGS="$RUSTFLAGS \
+export RUSTFLAGS="
+    --emit=llvm-ir \
     -C lto=no \
     -C opt-level=2 \
-    -C link-arg=-Tbpf.ld \
     -C link-arg=-z -C link-arg=notext \
+    -C link-arg=-T$bpf_sdk/rust-utils/bpf.ld \
     -C link-arg=--Bdynamic \
     -C link-arg=-shared \
     -C link-arg=--entry=entrypoint \
     -C linker=$bpf_sdk/llvm-native/bin/ld.lld"
-export XARGO_HOME="$PWD/target/xargo"
 export XARGO_RUST_SRC="$bpf_sdk/rust-bpf-sysroot/src"
 xargo build --target bpfel-unknown-unknown --release -v
 

sdk/bpf/rust-utils/clean.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+if [ "$#" -ne 1 ]; then
+    echo "Error: Must provide the full path to the project to build"
+    exit 1
+fi
+if [ ! -d "$1" ]; then
+      echo "Error: Cannot find project: $1"
+    exit 1
+fi
+
+cd "$1"
+
+set -ex
+
+cargo clean