From c648ddc2a98ce27efba927651b86a1f5d7cfa83e Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 20 Oct 2020 17:50:20 -0700
Subject: [PATCH 1/2] Add cargo-build-bpf

---
 Cargo.lock                      |  28 +++-
 Cargo.toml                      |   1 +
 cargo-build-bpf                 |   5 +
 ci/nits.sh                      |   1 +
 frozen-abi/Xargo.toml           |   2 +
 scripts/cargo-install-all.sh    |   1 +
 sdk/bpf/env.sh                  |  39 +++++
 sdk/bpf/rust/build.sh           |  40 +----
 sdk/bpf/rust/xargo-build.sh     |  29 ++++
 sdk/bpf/scripts/dump.sh         |  48 ++++++
 sdk/bpf/scripts/install.sh      |  29 ++--
 sdk/bpf/scripts/objcopy.sh      |   6 +
 sdk/bpf/scripts/strip.sh        |  17 +++
 sdk/cargo-build-bpf/Cargo.toml  |  20 +++
 sdk/cargo-build-bpf/src/main.rs | 258 ++++++++++++++++++++++++++++++++
 15 files changed, 474 insertions(+), 50 deletions(-)
 create mode 100755 cargo-build-bpf
 create mode 100644 frozen-abi/Xargo.toml
 create mode 100644 sdk/bpf/env.sh
 create mode 100755 sdk/bpf/rust/xargo-build.sh
 create mode 100755 sdk/bpf/scripts/dump.sh
 create mode 100755 sdk/bpf/scripts/objcopy.sh
 create mode 100755 sdk/bpf/scripts/strip.sh
 create mode 100644 sdk/cargo-build-bpf/Cargo.toml
 create mode 100644 sdk/cargo-build-bpf/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index b6d2a8c0be73ba..1a1214610b5bf9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -440,6 +440,17 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "cargo_metadata"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
+dependencies = [
+ "semver 0.11.0",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "cast"
 version = "0.2.3"
@@ -499,9 +510,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
  "ansi_term",
  "atty",
@@ -3180,6 +3191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
  "semver-parser 0.10.1",
+ "serde",
 ]
 
 [[package]]
@@ -3238,9 +3250,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
 dependencies = [
  "itoa",
  "ryu",
@@ -3621,6 +3633,14 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "solana-cargo-build-bpf"
+version = "1.5.0"
+dependencies = [
+ "cargo_metadata",
+ "clap",
+]
+
 [[package]]
 name = "solana-clap-utils"
 version = "1.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index 97daafeb1a3b96..310c4c50b2a4d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,6 +53,7 @@ members = [
     "ramp-tps",
     "runtime",
     "sdk",
+    "sdk/cargo-build-bpf",
     "scripts",
     "stake-accounts",
     "stake-monitor",
diff --git a/cargo-build-bpf b/cargo-build-bpf
new file mode 100755
index 00000000000000..09db268ec1ff3e
--- /dev/null
+++ b/cargo-build-bpf
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+here=$(dirname "$0")
+set -x
+exec cargo run --manifest-path $here/sdk/cargo-build-bpf/Cargo.toml -- --bpf-sdk $here/sdk/bpf "$@"
diff --git a/ci/nits.sh b/ci/nits.sh
index f92cde3d0e1def..191b06c29a017f 100755
--- a/ci/nits.sh
+++ b/ci/nits.sh
@@ -26,6 +26,7 @@ declare print_free_tree=(
   ':runtime/src/**.rs'
   ':sdk/bpf/rust/rust-utils/**.rs'
   ':sdk/**.rs'
+  ':^sdk/cargo-build-bpf/**.rs'
   ':^sdk/src/program_option.rs'
   ':^sdk/src/program_stubs.rs'
   ':programs/**.rs'
diff --git a/frozen-abi/Xargo.toml b/frozen-abi/Xargo.toml
new file mode 100644
index 00000000000000..475fb71ed15ac2
--- /dev/null
+++ b/frozen-abi/Xargo.toml
@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 7f3c1f09167dc5..22a6906be295ae 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -75,6 +75,7 @@ else
 
 
   BINS=(
+    cargo-build-bpf
     solana
     solana-bench-exchange
     solana-bench-tps
diff --git a/sdk/bpf/env.sh b/sdk/bpf/env.sh
new file mode 100644
index 00000000000000..821727769447ef
--- /dev/null
+++ b/sdk/bpf/env.sh
@@ -0,0 +1,39 @@
+#
+# Configures the BPF SDK environment
+#
+
+if [ -z "$bpf_sdk" ]; then
+  bpf_sdk=.
+fi
+
+# Ensure the sdk is installed
+"$bpf_sdk"/scripts/install.sh
+
+# Use the SDK's version of llvm to build the compiler-builtins for BPF
+export CC="$bpf_sdk/dependencies/llvm-native/bin/clang"
+export AR="$bpf_sdk/dependencies/llvm-native/bin/llvm-ar"
+export OBJDUMP="$bpf_sdk/dependencies/llvm-native/bin/llvm-objdump"
+export OBJCOPY="$bpf_sdk/dependencies/llvm-native/bin/llvm-objcopy"
+
+# Use the SDK's version of Rust to build for BPF
+export RUSTUP_TOOLCHAIN=bpf
+export RUSTFLAGS="
+    -C lto=no \
+    -C opt-level=2 \
+    -C link-arg=-z -C link-arg=notext \
+    -C link-arg=-T$bpf_sdk/rust/bpf.ld \
+    -C link-arg=--Bdynamic \
+    -C link-arg=-shared \
+    -C link-arg=--entry=entrypoint \
+    -C link-arg=-no-threads \
+    -C linker=$bpf_sdk/dependencies/llvm-native/bin/ld.lld"
+
+# CARGO may be set if run from within cargo, causing
+# incompatibilities between cargo and xargo versions
+unset CARGO
+
+export XARGO="$bpf_sdk"/dependencies/bin/xargo
+export XARGO_TARGET=bpfel-unknown-unknown
+export XARGO_HOME="$bpf_sdk/dependencies/xargo"
+export XARGO_RUST_SRC="$bpf_sdk/dependencies/rust-bpf-sysroot/src"
+export RUST_COMPILER_RT_ROOT="$bpf_sdk/dependencies/rust-bpf-sysroot/src/compiler-rt"
diff --git a/sdk/bpf/rust/build.sh b/sdk/bpf/rust/build.sh
index baff4ae7d0a5b8..11ab8c158126b2 100755
--- a/sdk/bpf/rust/build.sh
+++ b/sdk/bpf/rust/build.sh
@@ -1,49 +1,21 @@
 #!/usr/bin/env bash
 
-if [ "$#" -ne 1 ]; then
+if [[ "$#" -ne 1 ]]; then
     echo "Error: Must provide the full path to the project to build"
     exit 1
 fi
-if [ ! -f "$1/Cargo.toml" ]; then
+if [[ ! -f "$1/Cargo.toml" ]]; then
       echo "Error: Cannot find project: $1"
     exit 1
 fi
+bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
 
 echo "Building $1"
 set -e
-
-bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
-
-# Ensure the sdk is installed
-"$bpf_sdk"/scripts/install.sh
-
-# Use the SDK's version of llvm to build the compiler-builtins for BPF
-export CC="$bpf_sdk/dependencies/llvm-native/bin/clang"
-export AR="$bpf_sdk/dependencies/llvm-native/bin/llvm-ar"
-
-# Use the SDK's version of Rust to build for BPF
-export RUSTUP_TOOLCHAIN=bpf
-export RUSTFLAGS="
-    -C lto=no \
-    -C opt-level=2 \
-    -C link-arg=-z -C link-arg=notext \
-    -C link-arg=-T$bpf_sdk/rust/bpf.ld \
-    -C link-arg=--Bdynamic \
-    -C link-arg=-shared \
-    -C link-arg=--entry=entrypoint \
-    -C link-arg=-no-threads \
-    -C linker=$bpf_sdk/dependencies/llvm-native/bin/ld.lld"
-
-# CARGO may be set if build.sh is run from within cargo, causing
-# incompatibilities between cargo and xargo versions
-unset CARGO
-
-# Setup xargo
-export XARGO_HOME="$bpf_sdk/dependencies/xargo"
-export XARGO_RUST_SRC="$bpf_sdk/dependencies/rust-bpf-sysroot/src"
-export RUST_COMPILER_RT_ROOT="$bpf_sdk/dependencies/rust-bpf-sysroot/src/compiler-rt"
+# shellcheck source=sdk/bpf/env.sh
+source "$bpf_sdk"/env.sh
 
 cd "$1"
-xargo build --target bpfel-unknown-unknown --release --no-default-features --features program
+"$XARGO" build --target "$XARGO_TARGET" --release --no-default-features --features program
 
 { { set +x; } 2>/dev/null; echo Success; }
diff --git a/sdk/bpf/rust/xargo-build.sh b/sdk/bpf/rust/xargo-build.sh
new file mode 100755
index 00000000000000..0d860444221b1c
--- /dev/null
+++ b/sdk/bpf/rust/xargo-build.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=sdk/bpf/env.sh
+source "$bpf_sdk"/env.sh
+
+set -e
+(
+  while true; do
+    if [[ -r Xargo.toml ]]; then
+      break;
+    fi
+    if [[ $PWD = / ]]; then
+      cat <<EOF
+Error: Failed to find Xargo.toml
+
+Please create a Xargo.toml file in the same directory as your Cargo.toml with
+the following contents:
+
+  [target.bpfel-unknown-unknown.dependencies.std]
+  features = []
+
+EOF
+      exit 1
+    fi
+    cd ..
+  done
+)
+exec "$XARGO" build --target "$XARGO_TARGET" --release "$@"
diff --git a/sdk/bpf/scripts/dump.sh b/sdk/bpf/scripts/dump.sh
new file mode 100755
index 00000000000000..8990f17c6a56a6
--- /dev/null
+++ b/sdk/bpf/scripts/dump.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=sdk/bpf/env.sh
+source "$bpf_sdk"/env.sh
+
+so=$1
+dump=$2
+if [[ -z $so ]] || [[ -z $dump ]]; then
+  echo "Usage: $0 bpf-program.so dump.txt"
+  exit 1
+fi
+
+if [[ ! -r $so ]]; then
+  echo "Error: File not found or readable: $so"
+  exit 1
+fi
+
+if ! command -v rustfilt > /dev/null; then
+  echo "Error: rustfilt not found.  It can be installed by running: cargo install rustfilt"
+  exit 1
+fi
+if ! command -v readelf > /dev/null; then
+  if [[ $(uname) = Darwin ]]; then
+      echo "Error: readelf not found.  It can be installed by running: brew install binutils"
+  else
+      echo "Error: readelf not found."
+  fi
+  exit 1
+fi
+
+dump_mangled=$dump.mangled
+
+(
+  set -ex
+  ls -la "$so" > "$dump_mangled"
+  readelf -aW "$so" >>"$dump_mangled"
+  "$OBJDUMP" -print-imm-hex --source --disassemble "$so" >> "$dump_mangled"
+  sed s/://g < "$dump_mangled" | rustfilt > "$dump"
+)
+rm -f "$dump_mangled"
+
+if [[ ! -f "$dump" ]]; then
+  echo "Error: Failed to create $dump"
+  exit 1
+fi
+
+echo "Wrote $dump"
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 41a7bb158c6afc..cb345a82450a4f 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -84,19 +84,24 @@ clone() {
 }
 
 # Install xargo
-(
-  set -ex
-  # shellcheck disable=SC2154
-  if [[ -n $rust_stable ]]; then
-    cargo +"$rust_stable" install xargo
-  else
-    cargo install xargo
+version=0.3.22
+if [[ ! -e xargo-$version.md ]] || [[ ! -x bin/xargo ]]; then
+  (
+    args=()
+    # shellcheck disable=SC2154
+    if [[ -n $rust_stable ]]; then
+      args+=(+"$rust_stable")
+    fi
+    args+=(install xargo --version "$version" --root .)
+    set -ex
+    cargo "${args[@]}"
+    ./bin/xargo --version >xargo-$version.md 2>&1
+  )
+  exitcode=$?
+  if [[ $exitcode -ne 0 ]]; then
+    rm -rf xargo-$version.md
+    exit 1
   fi
-  xargo --version >xargo.md 2>&1
-)
-# shellcheck disable=SC2181
-if [[ $? -ne 0 ]]; then
-  exit 1
 fi
 
 # Install Criterion
diff --git a/sdk/bpf/scripts/objcopy.sh b/sdk/bpf/scripts/objcopy.sh
new file mode 100755
index 00000000000000..1e44719e77724f
--- /dev/null
+++ b/sdk/bpf/scripts/objcopy.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=sdk/bpf/env.sh
+source "$bpf_sdk"/env.sh
+exec "$bpf_sdk"/dependencies/llvm-native/bin/llvm-objcopy "$@"
diff --git a/sdk/bpf/scripts/strip.sh b/sdk/bpf/scripts/strip.sh
new file mode 100755
index 00000000000000..6c579ff0801b6b
--- /dev/null
+++ b/sdk/bpf/scripts/strip.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+so=$1
+if [[ ! -r $so ]]; then
+  echo "Error: file not found: $so"
+  exit 1
+fi
+so_stripped=$2
+if [[ -z $so_stripped ]]; then
+  echo "Usage: $0 unstripped.so stripped.so"
+  exit 1
+fi
+
+bpf_sdk=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=sdk/bpf/env.sh
+source "$bpf_sdk"/env.sh
+"$bpf_sdk"/dependencies/llvm-native/bin/llvm-objcopy --strip-all "$so" "$so_stripped"
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
new file mode 100644
index 00000000000000..62dbea565f77a8
--- /dev/null
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "solana-cargo-build-bpf"
+version = "1.5.0"
+description = "Compile a local package and all of its dependencies using the Solana BPF SDK"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+homepage = "https://solana.com/"
+license = "Apache-2.0"
+edition = "2018"
+
+[dependencies]
+clap = "2.33.3"
+cargo_metadata = "0.12.0"
+
+[features]
+program = []
+
+[[bin]]
+name = "cargo-build-bpf"
+path = "src/main.rs"
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
new file mode 100644
index 00000000000000..ae040c353c5d0f
--- /dev/null
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -0,0 +1,258 @@
+use clap::{
+    crate_description, crate_name, crate_version, value_t, value_t_or_exit, values_t, App, Arg,
+};
+use std::{
+    env,
+    ffi::OsStr,
+    fs,
+    path::{Path, PathBuf},
+    process::exit,
+    process::Command,
+};
+
+struct Config {
+    bpf_sdk: PathBuf,
+    dump: bool,
+    features: Vec<String>,
+    manifest_path: Option<PathBuf>,
+    no_default_features: bool,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            bpf_sdk: env::current_exe()
+                .expect("Unable to get current directory")
+                .parent()
+                .expect("Unable to get parent directory")
+                .to_path_buf()
+                .join("sdk/bpf"),
+            features: vec![],
+            manifest_path: None,
+            no_default_features: false,
+            dump: true,
+        }
+    }
+}
+
+fn spawn<I, S>(program: &Path, args: I)
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<OsStr>,
+{
+    let args = args.into_iter().collect::<Vec<_>>();
+    print!("Running: {}", program.display());
+    for arg in args.iter() {
+        print!(" {}", arg.as_ref().to_str().unwrap_or("?"));
+    }
+    println!();
+
+    let mut child = Command::new(program)
+        .args(&args)
+        .spawn()
+        .unwrap_or_else(|err| {
+            eprintln!("Failed to execute {}: {}", program.display(), err);
+            exit(1);
+        });
+
+    let exit_status = child.wait().expect("failed to wait on child");
+    if !exit_status.success() {
+        exit(1);
+    }
+}
+
+fn build_bpf(config: Config) {
+    let mut metadata_command = cargo_metadata::MetadataCommand::new();
+    if let Some(manifest_path) = config.manifest_path {
+        metadata_command.manifest_path(manifest_path);
+    }
+
+    let metadata = metadata_command.exec().unwrap_or_else(|err| {
+        eprintln!("Failed to obtain package metadata: {}", err);
+        exit(1);
+    });
+
+    let root_package = metadata.root_package().unwrap_or_else(|| {
+        eprintln!(
+            "Workspace does not have a root package: {}",
+            metadata.workspace_root.display()
+        );
+        exit(1);
+    });
+
+    let program_name = {
+        let cdylib_targets = root_package
+            .targets
+            .iter()
+            .filter_map(|target| {
+                if target.crate_types.contains(&"cdylib".to_string()) {
+                    Some(&target.name)
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>();
+
+        match cdylib_targets.len() {
+            0 => {
+                println!(
+                    "Note: {} crate does not contain a cdylib target",
+                    root_package.name
+                );
+                None
+            }
+            1 => Some(cdylib_targets[0].replace("-", "_")),
+            _ => {
+                eprintln!(
+                    "{} crate contains multiple cdylib targets: {:?}",
+                    root_package.name, cdylib_targets
+                );
+                exit(1);
+            }
+        }
+    };
+
+    let legacy_program_feature_present = root_package.features.contains_key("program");
+    let root_package_dir = &root_package.manifest_path.parent().unwrap_or_else(|| {
+        eprintln!(
+            "Unable to get directory of {}",
+            root_package.manifest_path.display()
+        );
+        exit(1);
+    });
+
+    let target_build_directory = metadata
+        .target_directory
+        .join("bpfel-unknown-unknown/release");
+
+    env::set_current_dir(&root_package_dir).unwrap_or_else(|err| {
+        eprintln!(
+            "Unable to set current directory to {}: {}",
+            root_package_dir.display(),
+            err
+        );
+        exit(1);
+    });
+
+    println!("BPF SDK: {}", config.bpf_sdk.display());
+    if config.no_default_features {
+        println!("No default features");
+    }
+    if !config.features.is_empty() {
+        println!("Features: {}", config.features.join(" "));
+    }
+    if legacy_program_feature_present {
+        println!("Legacy program feature detected");
+    }
+
+    let xargo_build = config.bpf_sdk.join("rust/xargo-build.sh");
+    let mut spawn_args = vec![];
+
+    if config.no_default_features {
+        spawn_args.push("--no-default-features");
+    }
+    for feature in &config.features {
+        spawn_args.push("--features");
+        spawn_args.push(feature);
+    }
+    if legacy_program_feature_present {
+        if !config.no_default_features {
+            spawn_args.push("--no-default-features");
+        }
+        spawn_args.push("--features=program");
+    }
+    spawn(&config.bpf_sdk.join(xargo_build), &spawn_args);
+
+    if let Some(program_name) = program_name {
+        let program_unstripped_so = target_build_directory.join(&format!("{}.so", program_name));
+        let program_dump = PathBuf::from(format!("{}-dump.txt", program_name));
+        let program_so = PathBuf::from(format!("{}.so", program_name));
+
+        spawn(
+            &config.bpf_sdk.join("scripts/strip.sh"),
+            &[&program_unstripped_so, &program_so],
+        );
+
+        if config.dump {
+            spawn(
+                &config.bpf_sdk.join("scripts/dump.sh"),
+                &[&program_unstripped_so, &program_dump],
+            );
+        }
+    } else if config.dump {
+        println!("Note: --dump is only available for crates with a cdylib target");
+    }
+}
+
+fn main() {
+    let default_bpf_sdk = format!("{}", Config::default().bpf_sdk.display());
+
+    let mut args = env::args().collect::<Vec<_>>();
+    // When run as a cargo subcommand, the first program argument is the subcommand name.
+    // Remove it
+    if let Some(arg1) = args.get(1) {
+        if arg1 == "build-bpf" {
+            args.remove(1);
+        }
+    }
+
+    let matches = App::new(crate_name!())
+        .about(crate_description!())
+        .version(crate_version!())
+        .arg(
+            Arg::with_name("bpf_sdk")
+                .long("bpf-sdk")
+                .value_name("PATH")
+                .takes_value(true)
+                .default_value(&default_bpf_sdk)
+                .help("Path to the Solana BPF SDK"),
+        )
+        .arg(
+            Arg::with_name("dump")
+                .long("dump")
+                .takes_value(false)
+                .help("Dump ELF information to a text file on success"),
+        )
+        .arg(
+            Arg::with_name("features")
+                .long("features")
+                .value_name("FEATURES")
+                .takes_value(true)
+                .multiple(true)
+                .help("Space-separated list of features to activate"),
+        )
+        .arg(
+            Arg::with_name("no_default_features")
+                .long("no-default-features")
+                .takes_value(false)
+                .help("Do not activate the `default` feature"),
+        )
+        .arg(
+            Arg::with_name("manifest_path")
+                .long("manifest-path")
+                .value_name("PATH")
+                .takes_value(true)
+                .help("Path to Cargo.toml"),
+        )
+        .get_matches_from(args);
+
+    let bpf_sdk = value_t_or_exit!(matches, "bpf_sdk", PathBuf);
+
+    let config = Config {
+        bpf_sdk: fs::canonicalize(&bpf_sdk).unwrap_or_else(|err| {
+            eprintln!(
+                "BPF SDK path does not exist: {}: {}",
+                bpf_sdk.display(),
+                err
+            );
+            exit(1);
+        }),
+        dump: matches.is_present("dump"),
+        features: values_t!(matches, "features", String)
+            .ok()
+            .unwrap_or_else(Vec::new),
+        manifest_path: value_t!(matches, "manifest_path", PathBuf).ok(),
+        no_default_features: matches.is_present("no_default_features"),
+    };
+    build_bpf(config);
+}

From e7187c71c8d46bd5db9519b30abd094d4e32a548 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 21 Oct 2020 17:32:51 -0700
Subject: [PATCH 2/2] Remove do.sh

---
 programs/bpf/build.rs                         |  10 +-
 programs/bpf/rust/128bit/Cargo.toml           |   1 -
 programs/bpf/rust/128bit_dep/Cargo.toml       |   1 -
 programs/bpf/rust/alloc/Cargo.toml            |   1 -
 programs/bpf/rust/call_depth/Cargo.toml       |   1 -
 programs/bpf/rust/custom_heap/Cargo.toml      |   1 -
 programs/bpf/rust/dep_crate/Cargo.toml        |   1 -
 .../bpf/rust/deprecated_loader/Cargo.toml     |   1 -
 programs/bpf/rust/do.sh                       | 123 ------------------
 programs/bpf/rust/dup_accounts/Cargo.toml     |   1 -
 programs/bpf/rust/error_handling/Cargo.toml   |   1 -
 programs/bpf/rust/external_spend/Cargo.toml   |   1 -
 .../rust/instruction_introspection/Cargo.toml |   1 -
 programs/bpf/rust/invoke/Cargo.toml           |   1 -
 programs/bpf/rust/invoked/Cargo.toml          |   1 -
 programs/bpf/rust/iter/Cargo.toml             |   1 -
 programs/bpf/rust/many_args/Cargo.toml        |   1 -
 programs/bpf/rust/many_args_dep/Cargo.toml    |   1 -
 programs/bpf/rust/noop/Cargo.toml             |   1 -
 programs/bpf/rust/panic/Cargo.toml            |   1 -
 programs/bpf/rust/param_passing/Cargo.toml    |   1 -
 .../bpf/rust/param_passing_dep/Cargo.toml     |   1 -
 programs/bpf/rust/rand/Cargo.toml             |   1 -
 programs/bpf/rust/ristretto/Cargo.toml        |   1 -
 programs/bpf/rust/sanity/Cargo.toml           |   1 -
 programs/bpf/rust/sha256/Cargo.toml           |   1 -
 programs/bpf/rust/sysval/Cargo.toml           |   1 -
 sdk/bpf/scripts/bpf-trace.py                  |  11 +-
 28 files changed, 10 insertions(+), 159 deletions(-)
 delete mode 100755 programs/bpf/rust/do.sh

diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs
index 12a4e59c2dda91..ed7fd926547927 100644
--- a/programs/bpf/build.rs
+++ b/programs/bpf/build.rs
@@ -94,16 +94,16 @@ fn main() {
                 program
             );
             assert!(Command::new("bash")
-                .current_dir("rust")
-                .args(&["./do.sh", "build", program])
+                .current_dir(format!("rust/{}", program))
+                .args(&["../../../../cargo-build-bpf"])
                 .status()
-                .expect("Error calling do.sh from build.rs")
+                .expect("Error calling cargo-build-bpf from build.rs")
                 .success());
             let src = format!(
-                "target/bpfel-unknown-unknown/release/solana_bpf_rust_{}.so",
+                "rust/{0}/solana_bpf_rust_{0}.so",
                 program,
             );
-            assert!(Command::new("cp")
+            assert!(Command::new("mv")
                 .arg(&src)
                 .arg(&install_dir)
                 .status()
diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml
index 25d40f934c688e..2652f0f3e4bdac 100644
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-128bit"
diff --git a/programs/bpf/rust/128bit_dep/Cargo.toml b/programs/bpf/rust/128bit_dep/Cargo.toml
index d11eef632bc293..ac9dbd206361a4 100644
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-128bit-dep"
diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml
index fd0abc4f65f080..1c41b347e4d8d9 100644
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-alloc"
diff --git a/programs/bpf/rust/call_depth/Cargo.toml b/programs/bpf/rust/call_depth/Cargo.toml
index cd7ddd3dff8647..d9118671419a15 100644
--- a/programs/bpf/rust/call_depth/Cargo.toml
+++ b/programs/bpf/rust/call_depth/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-call-depth"
diff --git a/programs/bpf/rust/custom_heap/Cargo.toml b/programs/bpf/rust/custom_heap/Cargo.toml
index f2c9f271aa8284..27e253f2a1ca1f 100644
--- a/programs/bpf/rust/custom_heap/Cargo.toml
+++ b/programs/bpf/rust/custom_heap/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-custom-heap"
diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml
index 0b8ae42b157f28..2284f804410b9e 100644
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-dep-crate"
diff --git a/programs/bpf/rust/deprecated_loader/Cargo.toml b/programs/bpf/rust/deprecated_loader/Cargo.toml
index d8d2e9d18520bf..682e23cdafd17c 100644
--- a/programs/bpf/rust/deprecated_loader/Cargo.toml
+++ b/programs/bpf/rust/deprecated_loader/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-deprecated_loader"
diff --git a/programs/bpf/rust/do.sh b/programs/bpf/rust/do.sh
deleted file mode 100755
index 248ab573a5937c..00000000000000
--- a/programs/bpf/rust/do.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$0")"
-
-usage() {
-    cat <<EOF
-
-Usage: do.sh action <project>
-
-If relative_project_path is ommitted then action will
-be performed on all projects
-
-Supported actions:
-    build
-    clean
-    test
-    clippy
-    fmt
-
-EOF
-}
-
-sdkDir=../../../sdk
-targetDir="$PWD"/../target
-profile=bpfel-unknown-unknown/release
-
-perform_action() {
-    set -e
-    case "$1" in
-    build)
-        "$sdkDir"/bpf/rust/build.sh "$2"
-
-        so_path="$targetDir/$profile/"
-        so_name="solana_bpf_rust_${3%/}"
-        if [ -f "$so_path/${so_name}.so" ]; then
-            cp "$so_path/${so_name}.so" "$so_path/${so_name}_debug.so"
-            "$sdkDir/bpf/dependencies/llvm-native/bin/llvm-objcopy" --strip-all "$so_path/${so_name}.so" "$so_path/$so_name.so"
-        fi
-        ;;
-    clean)
-        "$sdkDir"/bpf/rust/clean.sh "$2"
-        ;;
-    test)
-        (
-            cd "$2"
-            echo "test $2"
-            cargo +nightly test
-        )
-        ;;
-    clippy)
-        (
-            cd "$2"
-            echo "clippy $2"
-            cargo +nightly clippy
-        )
-        ;;
-    fmt)
-        (
-            cd "$2"
-            echo "formatting $2"
-            cargo fmt
-        )
-        ;;
-    dump)
-        # Dump depends on tools that are not installed by default and must be installed manually
-        # - greadelf
-        # - rustfilt
-        (
-            pwd
-            "$0" build "$3"
-
-            cd "$3"
-            so="$targetDir/$profile/solana_bpf_rust_${3%/}_debug.so"
-            dump="$targetDir/${3%/}-dump"
-
-            if [ -f "$so" ]; then
-                ls \
-                    -la \
-                    "$so" \
-                    >"${dump}-mangled.txt"
-                greadelf \
-                    -aW \
-                    "$so" \
-                    >>"${dump}-mangled.txt"
-                ../"$sdkDir/bpf/dependencies/llvm-native/bin/llvm-objdump" \
-                    -print-imm-hex \
-                    --source \
-                    --disassemble \
-                    "$so" \
-                    >>"${dump}-mangled.txt"
-                sed \
-                    s/://g \
-                    < "${dump}-mangled.txt" \
-                    | rustfilt \
-                    > "${dump}.txt"
-            else
-                echo "Warning: No dump created, cannot find: $so"
-            fi
-        )
-        ;;
-    help)
-        usage
-        exit
-        ;;
-    *)
-        echo "Error: Unknown command"
-        usage
-        exit
-        ;;
-    esac
-}
-
-set -e
-
-if [ "$#" -ne 2 ]; then
-    # Build all projects
-    for project in */; do
-        perform_action "$1" "$PWD/$project" "$project"
-    done
-else
-    # Build requested project
-    perform_action "$1" "$PWD/$2" "$2"
-fi
diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml
index e9adb53b586636..666717346159c1 100644
--- a/programs/bpf/rust/dup_accounts/Cargo.toml
+++ b/programs/bpf/rust/dup_accounts/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-dup-accounts"
diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml
index d93e4432a4619c..e91f147d59ff4f 100644
--- a/programs/bpf/rust/error_handling/Cargo.toml
+++ b/programs/bpf/rust/error_handling/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-error-handling"
diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml
index ab1c42987210c9..90e17ef615eb49 100644
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-external-spend"
diff --git a/programs/bpf/rust/instruction_introspection/Cargo.toml b/programs/bpf/rust/instruction_introspection/Cargo.toml
index 17b94dd0883243..e8adce8ee81192 100644
--- a/programs/bpf/rust/instruction_introspection/Cargo.toml
+++ b/programs/bpf/rust/instruction_introspection/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-instruction-introspection"
diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml
index 698cfcc9c3b0e8..029914dbea7fc2 100644
--- a/programs/bpf/rust/invoke/Cargo.toml
+++ b/programs/bpf/rust/invoke/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-invoke"
diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml
index 0fb5b8838b49b9..de37b19550eea2 100644
--- a/programs/bpf/rust/invoked/Cargo.toml
+++ b/programs/bpf/rust/invoked/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-invoked"
diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml
index 872c28cdfbcb3e..d6cc3ff0465f2e 100644
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-iter"
diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml
index 82eb59cc27b9cf..9cd10f6f20006a 100644
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-many-args"
diff --git a/programs/bpf/rust/many_args_dep/Cargo.toml b/programs/bpf/rust/many_args_dep/Cargo.toml
index 251e8437375f4b..455fa1220c01a3 100644
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-many-args-dep"
diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml
index 7726da00e3cb95..fef8b293be8316 100644
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-noop"
diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml
index 58f992f6a59855..0fb178e1ed2d30 100644
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-panic"
diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml
index f01238c5b91a8a..061674bdfe4e34 100644
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-param-passing"
diff --git a/programs/bpf/rust/param_passing_dep/Cargo.toml b/programs/bpf/rust/param_passing_dep/Cargo.toml
index 82cf38c9e6bd70..40bcead2a3a13a 100644
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-param-passing-dep"
diff --git a/programs/bpf/rust/rand/Cargo.toml b/programs/bpf/rust/rand/Cargo.toml
index 7db1ae87394f8f..41c66726a8f006 100644
--- a/programs/bpf/rust/rand/Cargo.toml
+++ b/programs/bpf/rust/rand/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-rand"
diff --git a/programs/bpf/rust/ristretto/Cargo.toml b/programs/bpf/rust/ristretto/Cargo.toml
index b957006ad59f0a..b46547df5aa659 100644
--- a/programs/bpf/rust/ristretto/Cargo.toml
+++ b/programs/bpf/rust/ristretto/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-ristretto"
diff --git a/programs/bpf/rust/sanity/Cargo.toml b/programs/bpf/rust/sanity/Cargo.toml
index d71c28554ecdd4..d3d3ff9196d4ee 100644
--- a/programs/bpf/rust/sanity/Cargo.toml
+++ b/programs/bpf/rust/sanity/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sanity"
diff --git a/programs/bpf/rust/sha256/Cargo.toml b/programs/bpf/rust/sha256/Cargo.toml
index 3261f1047415bb..560f23d7406c9c 100644
--- a/programs/bpf/rust/sha256/Cargo.toml
+++ b/programs/bpf/rust/sha256/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sha256"
diff --git a/programs/bpf/rust/sysval/Cargo.toml b/programs/bpf/rust/sysval/Cargo.toml
index 99898764b701b0..202d6d32033cb9 100644
--- a/programs/bpf/rust/sysval/Cargo.toml
+++ b/programs/bpf/rust/sysval/Cargo.toml
@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sysval"
diff --git a/sdk/bpf/scripts/bpf-trace.py b/sdk/bpf/scripts/bpf-trace.py
index d0dad61770948a..e64ff011972bc8 100755
--- a/sdk/bpf/scripts/bpf-trace.py
+++ b/sdk/bpf/scripts/bpf-trace.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 
-# 
+#
 # Prints a BPF program call trace with instruction counts for each call
 #
 # This script requires a dump file containing the instruction dump of the ELF
 # and a trace file that contains the trace output of the BPF VM
 #
-# You can create the dump file with do.sh:
-#  $ do.sh dump <project>
-# Or directly:
+# You can create the dump file by passing the --dump flag to `cargo build-bpf`,
+# or directly:
 #  $ llvm-objdump -print-imm-hex --source --disassemble <ELF file path>
 #
 # You can create the trace file by running the program and setting RUST_LOG:
@@ -53,7 +52,7 @@ def parse_line(rxs, line):
         sys.exit('    Usage: ' + sys.argv[0] + ' dump_file trace_file')
     dumppath = sys.argv[1]
     tracepath = sys.argv[2]
-    
+
     # parse the dump file to create a map
     # of instruction numbers to symbols
     symbols = {}
@@ -76,7 +75,7 @@ def parse_line(rxs, line):
             line = file_object.readline()
     if len(symbols) == 0:
         sys.exit("Error: No instruction dump in: " + dumppath)
-    
+
     # parse the trace file to build a call list
     calls = [] # all the calls made
     with open(tracepath, 'r') as file_object: