[SOL] switch to new SBF LLVM backend

Author: dmakarov

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

@@ -175,6 +175,12 @@ extern "C" void LLVMRustTimeTraceProfilerFinish(const char *FileName) {
 #define SUBTARGET_BPF
 #endif
 
+#ifdef LLVM_COMPONENT_SBF
+#define SUBTARGET_SBF SUBTARGET(SBF)
+#else
+#define SUBTARGET_SBF
+#endif
+
 #define GEN_SUBTARGETS                                                         \
   SUBTARGET_X86                                                                \
   SUBTARGET_ARM                                                                \
@@ -192,6 +198,7 @@ extern "C" void LLVMRustTimeTraceProfilerFinish(const char *FileName) {
   SUBTARGET_RISCV                                                              \
   SUBTARGET_LOONGARCH                                                          \
   SUBTARGET_BPF                                                                \
+  SUBTARGET_SBF                                                                \
 
 #define SUBTARGET(x)                                                           \
   namespace llvm {                                                             \

compiler/rustc_llvm/src/lib.rs

@@ -250,10 +250,10 @@ pub fn initialize_available_targets() {
     );
     init_target!(
         llvm_component = "sbf",
-        LLVMInitializeBPFTargetInfo,
-        LLVMInitializeBPFTarget,
-        LLVMInitializeBPFTargetMC,
-        LLVMInitializeBPFAsmPrinter,
-        LLVMInitializeBPFAsmParser
+        LLVMInitializeSBFTargetInfo,
+        LLVMInitializeSBFTarget,
+        LLVMInitializeSBFTargetMC,
+        LLVMInitializeSBFAsmPrinter,
+        LLVMInitializeSBFAsmParser
     );
 }

config.toml

@@ -66,7 +66,7 @@ targets = "AArch64;X86"
 # not built by default and the experimental Rust compilation targets that depend
 # on them will not work unless the user opts in to building them. By default the
 # `WebAssembly`, `RISCV`, and `BPF` targets are enabled when compiling LLVM from scratch.
-experimental-targets = "BPF"
+experimental-targets = "BPF;SBF"
 
 # Cap the number of parallel linker invocations when compiling LLVM.
 # This can be useful when building LLVM with debug info, which significantly

src/bootstrap/src/core/build_steps/llvm.rs

@@ -311,7 +311,7 @@ impl Step for Llvm {
             Some(s) => s,
             None => {
                 "AArch64;AMDGPU;ARM;BPF;Hexagon;LoongArch;MSP430;Mips;NVPTX;PowerPC;RISCV;\
-                     Sparc;SystemZ;WebAssembly;X86"
+                     SBF;Sparc;SystemZ;WebAssembly;X86"
             }
         };
 

src/ci/docker/host-x86_64/bpfel-unknown-unknown/Dockerfile

@@ -21,7 +21,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/solana-labs/cargo-run-sbf-tests.git \
-    --rev 8b76e26ee3cddca60297847361b67603e4299209 \
+    --rev 9d45e79cf11b2fdf0e3572d916fe058823c7c438 \
     --bin cargo-run-sbf-tests --root /usr/local
 
 COPY scripts/sccache.sh /scripts/