Multi rust projects (#4362)

This commit is contained in:
Jack May
2019-05-21 11:22:33 -07:00
committed by GitHub
parent c9ba9e4eb7
commit 28f948aa7f
15 changed files with 132 additions and 35 deletions

4
programs/bpf/rust/build.sh Executable file
View File

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

4
programs/bpf/rust/clean.sh Executable file
View File

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

16
programs/bpf/rust/dump.sh Executable file
View File

@ -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

3
programs/bpf/rust/iter/.gitignore vendored Normal file
View File

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

View File

@ -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"]

View File

@ -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" }

View File

@ -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
}

View File

@ -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" }

View File

@ -1,19 +0,0 @@
PHDRS
{
text PT_LOAD ;
rodata PT_LOAD ;
dynamic PT_DYNAMIC ;
}
SECTIONS
{
. = SIZEOF_HEADERS;
.text : { *(.text) } :text
.rodata : { *(.rodata) } :rodata
.dynamic : { *(.dynamic) } :dynamic
.dynsym : { *(.dynsym) } :dynamic
.dynstr : { *(.dynstr) } :dynamic
.gnu.hash : { *(.gnu.hash) } :dynamic
.rel.dyn : { *(.rel.dyn) } :dynamic
.hash : { *(.hash) } :dynamic
}

View File

@ -1,28 +0,0 @@
#!/usr/bin/env bash
cd "$(dirname "$0")"
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 \
-C lto=no \
-C opt-level=2 \
-C link-arg=-Tbpf.ld \
-C link-arg=-z -C link-arg=notext \
-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
{ { set +x; } 2>/dev/null; echo Success; }

View File

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

View File

@ -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