blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert bpf-tools to version 1.8 because of a codegen bug suspicion (#17568)

This commit is contained in:
Dmitri Makarov 2021-05-28 11:36:46 +02:00 committed by GitHub
parent 2422a53df6
commit 2316ddb90a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
programs/bpf/tests/programs.rs
View File

@ -1252,11 +1252,11 @@ fn assert_instruction_count() {
("alloc", 1137), ("alloc", 1137),
("bpf_to_bpf", 13), ("bpf_to_bpf", 13),
("multiple_static", 8), ("multiple_static", 8),
("noop", 5), ("noop", 42),
("noop++", 5), ("noop++", 42),
("relative_call", 10), ("relative_call", 10),
("sanity", 169), ("sanity", 174),
("sanity++", 168), ("sanity++", 174),
("sha", 694), ("sha", 694),
("struct_pass", 8), ("struct_pass", 8),
("struct_ret", 22), ("struct_ret", 22),
@ -1266,17 +1266,17 @@ fn assert_instruction_count() {
{ {
programs.extend_from_slice(&[ programs.extend_from_slice(&[
("solana_bpf_rust_128bit", 584), ("solana_bpf_rust_128bit", 584),
("solana_bpf_rust_alloc", 4967), ("solana_bpf_rust_alloc", 5072),
("solana_bpf_rust_custom_heap", 365), ("solana_bpf_rust_custom_heap", 367),
("solana_bpf_rust_dep_crate", 2), ("solana_bpf_rust_dep_crate", 2),
("solana_bpf_rust_external_spend", 334), ("solana_bpf_rust_external_spend", 336),
("solana_bpf_rust_iter", 8), ("solana_bpf_rust_iter", 279),
("solana_bpf_rust_many_args", 189), ("solana_bpf_rust_many_args", 191),
("solana_bpf_rust_mem", 1665), ("solana_bpf_rust_mem", 1670),
("solana_bpf_rust_noop", 322), ("solana_bpf_rust_noop", 324),
("solana_bpf_rust_param_passing", 46), ("solana_bpf_rust_param_passing", 46),
("solana_bpf_rust_rand", 325), ("solana_bpf_rust_rand", 327),
("solana_bpf_rust_sanity", 587), ("solana_bpf_rust_sanity", 595),
("solana_bpf_rust_sha", 22417), ("solana_bpf_rust_sha", 22417),
]); ]);
} }

2
sdk/bpf/c/bpf.mk
View File

@ -15,7 +15,7 @@ OUT_DIR ?= ./out
OS := $(shell uname) OS := $(shell uname)
LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/12.0.1/include LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/11.0.1/include
COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/rust/lib/rustlib/bpfel-unknown-unknown/lib COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/rust/lib/rustlib/bpfel-unknown-unknown/lib
ifdef LLVM_DIR ifdef LLVM_DIR

2
sdk/bpf/scripts/install.sh
View File

@ -92,7 +92,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi fi
# Install Rust-BPF # Install Rust-BPF
version=v1.9 version=v1.8
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
( (
set -e set -e

2
sdk/cargo-build-bpf/src/main.rs
View File

@ -360,7 +360,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
install_if_missing( install_if_missing(
&config, &config,
"bpf-tools", "bpf-tools",
"v1.9", "v1.8",
"https://github.com/solana-labs/bpf-tools/releases/download", "https://github.com/solana-labs/bpf-tools/releases/download",
&PathBuf::from(bpf_tools_filename), &PathBuf::from(bpf_tools_filename),
) )