Skip to content

Commit f434217

Browse files
borsbors
committed
Auto merge of #79608 - alessandrod:bpf, r=nagisa
BPF target support This adds `bpfel-unknown-none` and `bpfeb-unknown-none`, two new no_std targets that generate little and big endian BPF. The approach taken is very similar to the cuda target, where `TargetOptions::obj_is_bitcode` is enabled and code generation is done by the linker. I added the targets to `dist-various-2`. There are [some tests](https://github.com/alessandrod/bpf-linker/tree/main/tests/assembly) in bpf-linker and I'm planning to add more. Those are currently not ran as part of rust CI.
2 parents 6c2dd25 + 0adb933 commit f434217

File tree

33 files changed

+603
-6
lines changed

33 files changed

+603
-6
lines changed

‎compiler/rustc_codegen_cranelift/src/toolchain.rs

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
6767
LinkerFlavor::Msvc => "link.exe",
6868
LinkerFlavor::Lld(_) => "lld",
6969
LinkerFlavor::PtxLinker => "rust-ptx-linker",
70+
LinkerFlavor::BpfLinker => "bpf-linker",
7071
}),
7172
flavor,
7273
)),

‎compiler/rustc_codegen_llvm/src/asm.rs

+6
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ impl AsmBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
288288
InlineAsmArch::Mips | InlineAsmArch::Mips64 => {}
289289
InlineAsmArch::SpirV => {}
290290
InlineAsmArch::Wasm32 => {}
291+
InlineAsmArch::Bpf => {}
291292
}
292293
}
293294
if !options.contains(InlineAsmOptions::NOMEM) {
@@ -593,6 +594,8 @@ fn reg_to_llvm(reg: InlineAsmRegOrRegClass, layout: Option<&TyAndLayout<'tcx>>)
593594
InlineAsmRegClass::X86(X86InlineAsmRegClass::zmm_reg) => "v",
594595
InlineAsmRegClass::X86(X86InlineAsmRegClass::kreg) => "^Yk",
595596
InlineAsmRegClass::Wasm(WasmInlineAsmRegClass::local) => "r",
597+
InlineAsmRegClass::Bpf(BpfInlineAsmRegClass::reg) => "r",
598+
InlineAsmRegClass::Bpf(BpfInlineAsmRegClass::wreg) => "w",
596599
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
597600
bug!("LLVM backend does not support SPIR-V")
598601
}
@@ -661,6 +664,7 @@ fn modifier_to_llvm(
661664
},
662665
InlineAsmRegClass::X86(X86InlineAsmRegClass::kreg) => None,
663666
InlineAsmRegClass::Wasm(WasmInlineAsmRegClass::local) => None,
667+
InlineAsmRegClass::Bpf(_) => None,
664668
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
665669
bug!("LLVM backend does not support SPIR-V")
666670
}
@@ -708,6 +712,8 @@ fn dummy_output_type(cx: &CodegenCx<'ll, 'tcx>, reg: InlineAsmRegClass) -> &'ll
708712
| InlineAsmRegClass::X86(X86InlineAsmRegClass::zmm_reg) => cx.type_f32(),
709713
InlineAsmRegClass::X86(X86InlineAsmRegClass::kreg) => cx.type_i16(),
710714
InlineAsmRegClass::Wasm(WasmInlineAsmRegClass::local) => cx.type_i32(),
715+
InlineAsmRegClass::Bpf(BpfInlineAsmRegClass::reg) => cx.type_i64(),
716+
InlineAsmRegClass::Bpf(BpfInlineAsmRegClass::wreg) => cx.type_i32(),
711717
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
712718
bug!("LLVM backend does not support SPIR-V")
713719
}

‎compiler/rustc_codegen_ssa/src/back/link.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1124,6 +1124,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
11241124
LinkerFlavor::Msvc => "link.exe",
11251125
LinkerFlavor::Lld(_) => "lld",
11261126
LinkerFlavor::PtxLinker => "rust-ptx-linker",
1127+
LinkerFlavor::BpfLinker => "bpf-linker",
11271128
}),
11281129
flavor,
11291130
)),

‎compiler/rustc_codegen_ssa/src/back/linker.rs

+129
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ impl LinkerInfo {
8484
LinkerFlavor::PtxLinker => {
8585
Box::new(PtxLinker { cmd, sess, info: self }) as Box<dyn Linker>
8686
}
87+
88+
LinkerFlavor::BpfLinker => {
89+
Box::new(BpfLinker { cmd, sess, info: self }) as Box<dyn Linker>
90+
}
8791
}
8892
}
8993
}
@@ -1431,3 +1435,128 @@ impl<'a> Linker for PtxLinker<'a> {
14311435

14321436
fn linker_plugin_lto(&mut self) {}
14331437
}
1438+
1439+
pub struct BpfLinker<'a> {
1440+
cmd: Command,
1441+
sess: &'a Session,
1442+
info: &'a LinkerInfo,
1443+
}
1444+
1445+
impl<'a> Linker for BpfLinker<'a> {
1446+
fn cmd(&mut self) -> &mut Command {
1447+
&mut self.cmd
1448+
}
1449+
1450+
fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
1451+
1452+
fn link_rlib(&mut self, path: &Path) {
1453+
self.cmd.arg(path);
1454+
}
1455+
1456+
fn link_whole_rlib(&mut self, path: &Path) {
1457+
self.cmd.arg(path);
1458+
}
1459+
1460+
fn include_path(&mut self, path: &Path) {
1461+
self.cmd.arg("-L").arg(path);
1462+
}
1463+
1464+
fn debuginfo(&mut self, _strip: Strip) {
1465+
self.cmd.arg("--debug");
1466+
}
1467+
1468+
fn add_object(&mut self, path: &Path) {
1469+
self.cmd.arg(path);
1470+
}
1471+
1472+
fn optimize(&mut self) {
1473+
self.cmd.arg(match self.sess.opts.optimize {
1474+
OptLevel::No => "-O0",
1475+
OptLevel::Less => "-O1",
1476+
OptLevel::Default => "-O2",
1477+
OptLevel::Aggressive => "-O3",
1478+
OptLevel::Size => "-Os",
1479+
OptLevel::SizeMin => "-Oz",
1480+
});
1481+
}
1482+
1483+
fn output_filename(&mut self, path: &Path) {
1484+
self.cmd.arg("-o").arg(path);
1485+
}
1486+
1487+
fn finalize(&mut self) {
1488+
self.cmd.arg("--cpu").arg(match self.sess.opts.cg.target_cpu {
1489+
Some(ref s) => s,
1490+
None => &self.sess.target.options.cpu,
1491+
});
1492+
self.cmd.arg("--cpu-features").arg(match &self.sess.opts.cg.target_feature {
1493+
feat if !feat.is_empty() => feat,
1494+
_ => &self.sess.target.options.features,
1495+
});
1496+
}
1497+
1498+
fn link_dylib(&mut self, _lib: Symbol, _verbatim: bool, _as_needed: bool) {
1499+
panic!("external dylibs not supported")
1500+
}
1501+
1502+
fn link_rust_dylib(&mut self, _lib: Symbol, _path: &Path) {
1503+
panic!("external dylibs not supported")
1504+
}
1505+
1506+
fn link_staticlib(&mut self, _lib: Symbol, _verbatim: bool) {
1507+
panic!("staticlibs not supported")
1508+
}
1509+
1510+
fn link_whole_staticlib(&mut self, _lib: Symbol, _verbatim: bool, _search_path: &[PathBuf]) {
1511+
panic!("staticlibs not supported")
1512+
}
1513+
1514+
fn framework_path(&mut self, _path: &Path) {
1515+
panic!("frameworks not supported")
1516+
}
1517+
1518+
fn link_framework(&mut self, _framework: Symbol, _as_needed: bool) {
1519+
panic!("frameworks not supported")
1520+
}
1521+
1522+
fn full_relro(&mut self) {}
1523+
1524+
fn partial_relro(&mut self) {}
1525+
1526+
fn no_relro(&mut self) {}
1527+
1528+
fn gc_sections(&mut self, _keep_metadata: bool) {}
1529+
1530+
fn no_gc_sections(&mut self) {}
1531+
1532+
fn pgo_gen(&mut self) {}
1533+
1534+
fn no_crt_objects(&mut self) {}
1535+
1536+
fn no_default_libraries(&mut self) {}
1537+
1538+
fn control_flow_guard(&mut self) {}
1539+
1540+
fn export_symbols(&mut self, tmpdir: &Path, crate_type: CrateType) {
1541+
let path = tmpdir.join("symbols");
1542+
let res: io::Result<()> = try {
1543+
let mut f = BufWriter::new(File::create(&path)?);
1544+
for sym in self.info.exports[&crate_type].iter() {
1545+
writeln!(f, "{}", sym)?;
1546+
}
1547+
};
1548+
if let Err(e) = res {
1549+
self.sess.fatal(&format!("failed to write symbols file: {}", e));
1550+
} else {
1551+
self.cmd.arg("--export-symbols").arg(&path);
1552+
}
1553+
}
1554+
1555+
fn subsystem(&mut self, _subsystem: &str) {}
1556+
1557+
fn group_start(&mut self) {}
1558+
1559+
fn group_end(&mut self) {}
1560+
1561+
fn linker_plugin_lto(&mut self) {}
1562+
}

‎compiler/rustc_codegen_ssa/src/target_features.rs

+4
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ const WASM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
210210
("nontrapping-fptoint", Some(sym::wasm_target_feature)),
211211
];
212212

213+
const BPF_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[("alu32", Some(sym::bpf_target_feature))];
214+
213215
/// When rustdoc is running, provide a list of all known features so that all their respective
214216
/// primitives may be documented.
215217
///
@@ -224,6 +226,7 @@ pub fn all_known_features() -> impl Iterator<Item = (&'static str, Option<Symbol
224226
.chain(MIPS_ALLOWED_FEATURES.iter())
225227
.chain(RISCV_ALLOWED_FEATURES.iter())
226228
.chain(WASM_ALLOWED_FEATURES.iter())
229+
.chain(BPF_ALLOWED_FEATURES.iter())
227230
.cloned()
228231
}
229232

@@ -237,6 +240,7 @@ pub fn supported_target_features(sess: &Session) -> &'static [(&'static str, Opt
237240
"powerpc" | "powerpc64" => POWERPC_ALLOWED_FEATURES,
238241
"riscv32" | "riscv64" => RISCV_ALLOWED_FEATURES,
239242
"wasm32" | "wasm64" => WASM_ALLOWED_FEATURES,
243+
"bpf" => BPF_ALLOWED_FEATURES,
240244
_ => &[],
241245
}
242246
}

‎compiler/rustc_feature/src/active.rs

+1
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ declare_features! (
250250
(active, f16c_target_feature, "1.36.0", Some(44839), None),
251251
(active, riscv_target_feature, "1.45.0", Some(44839), None),
252252
(active, ermsb_target_feature, "1.49.0", Some(44839), None),
253+
(active, bpf_target_feature, "1.54.0", Some(44839), None),
253254

254255
// -------------------------------------------------------------------------
255256
// feature-group-end: actual feature gates (target features)

‎compiler/rustc_llvm/build.rs

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ fn main() {
8686
"nvptx",
8787
"hexagon",
8888
"riscv",
89+
"bpf",
8990
];
9091

9192
let required_components = &[

‎compiler/rustc_llvm/src/lib.rs

+8
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,12 @@ pub fn initialize_available_targets() {
167167
LLVMInitializeWebAssemblyAsmPrinter,
168168
LLVMInitializeWebAssemblyAsmParser
169169
);
170+
init_target!(
171+
llvm_component = "bpf",
172+
LLVMInitializeBPFTargetInfo,
173+
LLVMInitializeBPFTarget,
174+
LLVMInitializeBPFTargetMC,
175+
LLVMInitializeBPFAsmPrinter,
176+
LLVMInitializeBPFAsmParser
177+
);
170178
}

‎compiler/rustc_span/src/symbol.rs

+2
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ symbols! {
328328
box_free,
329329
box_patterns,
330330
box_syntax,
331+
bpf_target_feature,
331332
braced_empty_structs,
332333
branch,
333334
breakpoint,
@@ -1332,6 +1333,7 @@ symbols! {
13321333
wrapping_add,
13331334
wrapping_mul,
13341335
wrapping_sub,
1336+
wreg,
13351337
write_bytes,
13361338
xmm_reg,
13371339
ymm_reg,

‎compiler/rustc_target/src/abi/call/bpf.rs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// see https://github.com/llvm/llvm-project/blob/main/llvm/lib/Target/BPF/BPFCallingConv.td
2+
use crate::abi::call::{ArgAbi, FnAbi};
3+
4+
fn classify_ret<Ty>(ret: &mut ArgAbi<'_, Ty>) {
5+
if ret.layout.is_aggregate() || ret.layout.size.bits() > 64 {
6+
ret.make_indirect();
7+
} else {
8+
ret.extend_integer_width_to(32);
9+
}
10+
}
11+
12+
fn classify_arg<Ty>(arg: &mut ArgAbi<'_, Ty>) {
13+
if arg.layout.is_aggregate() || arg.layout.size.bits() > 64 {
14+
arg.make_indirect();
15+
} else {
16+
arg.extend_integer_width_to(32);
17+
}
18+
}
19+
20+
pub fn compute_abi_info<Ty>(fn_abi: &mut FnAbi<'_, Ty>) {
21+
if !fn_abi.ret.is_ignore() {
22+
classify_ret(&mut fn_abi.ret);
23+
}
24+
25+
for arg in &mut fn_abi.args {
26+
if arg.is_ignore() {
27+
continue;
28+
}
29+
classify_arg(arg);
30+
}
31+
}

‎compiler/rustc_target/src/abi/call/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ mod aarch64;
66
mod amdgpu;
77
mod arm;
88
mod avr;
9+
mod bpf;
910
mod hexagon;
1011
mod mips;
1112
mod mips64;
@@ -654,6 +655,7 @@ impl<'a, Ty> FnAbi<'a, Ty> {
654655
}
655656
}
656657
"asmjs" => wasm::compute_c_abi_info(cx, self),
658+
"bpf" => bpf::compute_abi_info(self),
657659
a => return Err(format!("unrecognized arch \"{}\" in target specification", a)),
658660
}
659661

0 commit comments

Comments
 (0)