Skip to content

[SBF] backport sbpfv3 changes to 1.84.1 #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nagisa wants to merge 1 commit into
base: solana-1.84.1
Choose a base branch
from
Open

[SBF] backport sbpfv3 changes to 1.84.1 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions compiler/rustc_codegen_ssa/src/back/linker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,9 +456,6 @@ impl<'a> GccLinker<'a> {
.unwrap_or(self.sess.target.cpu.as_ref().to_string());
if cpu_type == "v3" || cpu_type == "v4" {
self.link_arg("-Bsymbolic");
if self.sess.opts.debuginfo == DebugInfo::None {
self.link_arg("--strip-all");
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions compiler/rustc_codegen_ssa/src/back/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
"loongarch64" => (Architecture::LoongArch64, None),
"csky" => (Architecture::Csky, None),
"arm64ec" => (Architecture::Aarch64, Some(SubArchitecture::Arm64EC)),
"sbf" if sess.target.options.cpu.as_ref() == "v3" || sess.target.options.cpu.as_ref() == "v4" => {
(Architecture::Bpf, None)
},
"sbf" => (Architecture::Sbf, None),
// Unsupported architecture.
_ => return None,
Expand Down
30 changes: 8 additions & 22 deletions compiler/rustc_target/src/spec/base/sbf_base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,15 @@ SECTIONS
const V3_LINKER_SCRIPT: &str = r"
SECTIONS
{
.text 0x000000000 : {
. = 0x00;
KEEP(*(.text.abort))
*(.text*)
} :text
.rodata 0x100000000 : {
.rodata 0x000000000 : SUBALIGN(8) {
BYTE(0);
*(.rodata*)
*(.data.rel.ro*)
BYTE(0);
. = ALIGN(8);
} :rodata
.bss.stack 0x200000000 (NOLOAD) : {
_stack_start = .;
. = . + 0x1000;
_stack_end = .;
. = ALIGN(8);
} :stack
.bss.heap 0x300000000 (NOLOAD) : {
_heap_start = .;
. = . + 0x1000;
_heap_end = .;
. = ALIGN(8);
} :heap
.text 0x100000000 : {
*(.text*)
} :text
/DISCARD/ : {
*(.comment*)
*(.eh_frame*)
Expand All @@ -66,12 +52,12 @@ SECTIONS
*(.dynstr)
}
}

PHDRS
{
text PT_LOAD FLAGS(1);
rodata PT_LOAD FLAGS(4);
stack PT_LOAD FLAGS(6);
heap PT_LOAD FLAGS(6);
text PT_LOAD FLAGS(1);
other PT_NULL FLAGS(0);
}
";

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/target_features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ const WASM_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
];

const BPF_FEATURES: &[(&str, Stability, ImpliedFeatures)] =
&[("alu32", Unstable(sym::bpf_target_feature), &[])];
&[("alu32", Stable, &[])];

const SBF_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
("alu32", Unstable(sym::sbf_target_feature), &[]),
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

RUN PATH="${HOME}/.cargo/bin:${PATH}" \
cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
--rev db104fd1ce22986a0935f10f07e7e1f889db7e80 \
--bin cargo-run-solana-tests --root /usr/local

COPY scripts/sccache.sh /scripts/
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:24.10
FROM ubuntu:24.04

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Open in desktop
Submodule llvm-project updated 66 files
+83 −0 .github/workflows/anza-main.yml
+0 −40 .github/workflows/lld-tests.yml
+0 −39 .github/workflows/lldb-tests.yml
+0 −63 .github/workflows/llvm-bugs.yml
+0 −163 .github/workflows/llvm-project-tests.yml
+0 −32 .github/workflows/llvm-project-workflow-tests.yml
+0 −211 .github/workflows/llvm-tests.yml
+2 −0 lld/ELF/Arch/SBF.cpp
+2 −0 lld/ELF/InputFiles.cpp
+1 −1 lld/ELF/InputSection.cpp
+1 −0 lld/ELF/Target.cpp
+34 −0 lld/test/ELF/sbf-abs64-addend.s
+1 −0 lld/test/lit.cfg.py
+76 −76 lldb/source/Utility/ArchSpec.cpp
+1 −0 llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
+1 −1 llvm/lib/Object/ELF.cpp
+1 −1 llvm/lib/ObjectYAML/ELFYAML.cpp
+4 −2 llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+1 −1 llvm/lib/Target/SBF/GISel/SBFCallLowering.cpp
+1 −1 llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
+13 −8 llvm/lib/Target/SBF/SBFFrameLowering.cpp
+6 −7 llvm/lib/Target/SBF/SBFFrameLowering.h
+23 −13 llvm/lib/Target/SBF/SBFISelLowering.cpp
+0 −3 llvm/lib/Target/SBF/SBFISelLowering.h
+22 −35 llvm/lib/Target/SBF/SBFInstrInfo.td
+4 −44 llvm/lib/Target/SBF/SBFMIPeephole.cpp
+60 −37 llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+3 −2 llvm/lib/Target/SBF/SBFRegisterInfo.h
+9 −3 llvm/lib/Target/SBF/SBFSubtarget.cpp
+16 −1 llvm/lib/Target/SBF/SBFSubtarget.h
+15 −9 llvm/lib/Target/SBF/SBFTargetFeatures.td
+2 −1 llvm/test/CodeGen/BPF/reloc-2.ll
+1 −0 llvm/test/CodeGen/BPF/reloc-3.ll
+1 −0 llvm/test/CodeGen/BPF/reloc-btf-2.ll
+1 −0 llvm/test/CodeGen/BPF/reloc-btf.ll
+1 −0 llvm/test/CodeGen/BPF/reloc.ll
+1 −0 llvm/test/CodeGen/Mips/ldexp.ll
+5 −5 llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
+1 −1 llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
+6 −8 llvm/test/CodeGen/SBF/call_internal.ll
+3 −0 llvm/test/CodeGen/SBF/callx.ll
+22 −1 llvm/test/CodeGen/SBF/dynamic_stack_frame_add_and_sub.ll
+32 −0 llvm/test/CodeGen/SBF/f64-intrinsics.ll
+61 −17 llvm/test/CodeGen/SBF/many_args_new_conv.ll
+16 −1 llvm/test/CodeGen/SBF/many_args_value_size.ll
+3 −3 llvm/test/CodeGen/SBF/objdump_trivial.ll
+1 −1 llvm/test/CodeGen/SBF/reloc-btf.ll
+1 −1 llvm/test/CodeGen/SBF/reloc.ll
+0 −14 llvm/test/CodeGen/SBF/return_instr.ll
+6 −10 llvm/test/CodeGen/SBF/static_syscall.ll
+2 −2 llvm/test/CodeGen/SBF/static_syscall_2.ll
+1 −2 llvm/test/CodeGen/SBF/unreachable_return.ll
+70 −0 llvm/test/CodeGen/SBF/v3_stack_warnings.ll
+9 −7 llvm/test/CodeGen/SBF/warn-stack.ll
+1 −1 llvm/test/MC/BPF/insn-unit.s
+9 −8 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
+21 −18 llvm/test/MC/SBF/elf-header.s
+8 −1 llvm/test/MC/SBF/sbf-jmp.s
+0 −8 llvm/test/MC/SBF/sbf-return-syscall.s
+4 −4 llvm/test/Object/BPF/yaml2obj-elf-bpf-rel.yaml
+9 −9 llvm/test/tools/llvm-objdump/BPF/core-relo-formatting.s
+1 −0 llvm/test/tools/lto/hide-linkonce-odr.ll
+1 −0 llvm/test/tools/lto/no-bitcode.s
+1 −0 llvm/test/tools/lto/opt-level.ll
+14 −1 llvm/tools/llvm-objdump/llvm-objdump.cpp
+1 −1 llvm/unittests/TargetParser/Host.cpp
Loading