From 3ee60685571449ad8b52451e010ddbe2091dd758 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Fri, 14 Oct 2022 17:50:49 -0500
Subject: [PATCH 001/114] [SOL] Initial squash commit for new SBF LLVM back-end
 and related.

- New SBF back-end subdirectory and corresponding test directories.
- Corresponding changes in ADT, Support, MC, Object, BinaryFormat for
  new SBF architecture and EM_SBF ELF object.
- Corresponding changes in clang to instantiate SBF for Triple::sbf
  rather than the old BPF back-end, etc.
- Corresponding changes in lld to add SBF arch recognition, etc.
- Corresponding changes in llvm-readelf to and opt.
---
 clang/lib/Basic/Targets/BPF.cpp               |    8 +
 lld/ELF/Arch/SBF.cpp                          |  140 ++
 lld/ELF/CMakeLists.txt                        |    1 +
 lld/ELF/Target.cpp                            |    4 +
 lld/ELF/Target.h                              |    1 +
 llvm/CMakeLists.txt                           |    1 +
 llvm/include/llvm/BinaryFormat/ELF.h          |   11 +
 .../llvm/BinaryFormat/ELFRelocs/SBF.def       |   12 +
 llvm/include/llvm/Object/ELFObjectFile.h      |    4 +
 llvm/include/llvm/TargetParser/Triple.h       |    6 +
 llvm/include/module.modulemap                 |    1 +
 llvm/lib/Analysis/TargetLibraryInfo.cpp       |    7 +
 llvm/lib/BinaryFormat/ELF.cpp                 |    3 +
 llvm/lib/Object/ELF.cpp                       |    9 +
 llvm/lib/Object/RelocationResolver.cpp        |   24 +
 llvm/lib/ObjectYAML/ELFYAML.cpp               |    4 +
 llvm/lib/Target/BPF/BPFSubtarget.cpp          |    8 +-
 llvm/lib/Target/BPF/BPFTargetMachine.cpp      |   15 +-
 .../lib/Target/BPF/TargetInfo/BPFTargetInfo.h |    1 -
 llvm/lib/Target/SBF/AsmParser/CMakeLists.txt  |   13 +
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp |  509 ++++++
 llvm/lib/Target/SBF/BTF.def                   |   37 +
 llvm/lib/Target/SBF/BTF.h                     |  261 +++
 llvm/lib/Target/SBF/BTFDebug.cpp              | 1514 +++++++++++++++++
 llvm/lib/Target/SBF/BTFDebug.h                |  409 +++++
 llvm/lib/Target/SBF/CMakeLists.txt            |   60 +
 .../Target/SBF/Disassembler/CMakeLists.txt    |   12 +
 .../SBF/Disassembler/SBFDisassembler.cpp      |  219 +++
 .../Target/SBF/MCTargetDesc/CMakeLists.txt    |   15 +
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |  120 ++
 .../SBF/MCTargetDesc/SBFELFObjectWriter.cpp   |  109 ++
 .../SBF/MCTargetDesc/SBFInstPrinter.cpp       |  108 ++
 .../Target/SBF/MCTargetDesc/SBFInstPrinter.h  |   41 +
 .../Target/SBF/MCTargetDesc/SBFMCAsmInfo.h    |   58 +
 .../SBF/MCTargetDesc/SBFMCCodeEmitter.cpp     |  180 ++
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |  148 ++
 .../Target/SBF/MCTargetDesc/SBFMCTargetDesc.h |   64 +
 llvm/lib/Target/SBF/SBF.h                     |   75 +
 llvm/lib/Target/SBF/SBF.td                    |   72 +
 .../Target/SBF/SBFAbstractMemberAccess.cpp    | 1125 ++++++++++++
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp          |  387 +++++
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |  156 ++
 llvm/lib/Target/SBF/SBFCORE.h                 |   76 +
 llvm/lib/Target/SBF/SBFCallingConv.td         |   68 +
 llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp   |  173 ++
 llvm/lib/Target/SBF/SBFFrameLowering.cpp      |   70 +
 llvm/lib/Target/SBF/SBFFrameLowering.h        |   40 +
 llvm/lib/Target/SBF/SBFIRPeephole.cpp         |  118 ++
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |  542 ++++++
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 1197 +++++++++++++
 llvm/lib/Target/SBF/SBFISelLowering.h         |  174 ++
 llvm/lib/Target/SBF/SBFInstrFormats.td        |  124 ++
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |  260 +++
 llvm/lib/Target/SBF/SBFInstrInfo.h            |   65 +
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 1008 +++++++++++
 llvm/lib/Target/SBF/SBFMCInstLower.cpp        |   81 +
 llvm/lib/Target/SBF/SBFMCInstLower.h          |   41 +
 llvm/lib/Target/SBF/SBFMIChecking.cpp         |  251 +++
 llvm/lib/Target/SBF/SBFMIPeephole.cpp         |  564 ++++++
 .../lib/Target/SBF/SBFMISimplifyPatchable.cpp |  312 ++++
 llvm/lib/Target/SBF/SBFPreserveDIType.cpp     |  153 ++
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp       |  150 ++
 llvm/lib/Target/SBF/SBFRegisterInfo.h         |   40 +
 llvm/lib/Target/SBF/SBFRegisterInfo.td        |   51 +
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp   |   42 +
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.h     |   44 +
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |   80 +
 llvm/lib/Target/SBF/SBFSubtarget.h            |  110 ++
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |  184 ++
 llvm/lib/Target/SBF/SBFTargetMachine.h        |   48 +
 llvm/lib/Target/SBF/SBFTargetTransformInfo.h  |   78 +
 llvm/lib/Target/SBF/TargetInfo/CMakeLists.txt |   10 +
 .../Target/SBF/TargetInfo/SBFTargetInfo.cpp   |   22 +
 .../lib/Target/SBF/TargetInfo/SBFTargetInfo.h |   19 +
 llvm/lib/TargetParser/Triple.cpp              |    1 +
 llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll    |  299 ++++
 .../CodeGen/SBF/32-bit-subreg-cond-select.ll  |  117 ++
 .../CodeGen/SBF/32-bit-subreg-load-store.ll   |  107 ++
 .../SBF/32-bit-subreg-peephole-phi-1.ll       |   34 +
 .../SBF/32-bit-subreg-peephole-phi-2.ll       |   34 +
 .../SBF/32-bit-subreg-peephole-phi-3.ll       |   53 +
 .../CodeGen/SBF/32-bit-subreg-peephole.ll     |  126 ++
 llvm/test/CodeGen/SBF/32-bit-subreg-zext.ll   |   21 +
 llvm/test/CodeGen/SBF/TODO-NOTES              |   12 +
 llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll     |   95 ++
 llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll     |   98 ++
 llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll     |   85 +
 llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll     |   85 +
 .../CodeGen/SBF/adjust-opt-speculative1.ll    |   84 +
 .../CodeGen/SBF/adjust-opt-speculative2.ll    |   93 +
 llvm/test/CodeGen/SBF/alu8.ll                 |   45 +
 llvm/test/CodeGen/SBF/atomics_sbf.ll          |  276 +++
 llvm/test/CodeGen/SBF/basictest.ll            |   28 +
 llvm/test/CodeGen/SBF/byval.ll                |   31 +
 llvm/test/CodeGen/SBF/callx.ll                |   20 +
 llvm/test/CodeGen/SBF/cc_args.ll              |   93 +
 llvm/test/CodeGen/SBF/cc_ret.ll               |   48 +
 llvm/test/CodeGen/SBF/cmp.ll                  |  119 ++
 llvm/test/CodeGen/SBF/dwarfdump.ll            |   66 +
 .../CodeGen/SBF/elf-symbol-information.ll     |    8 +
 llvm/test/CodeGen/SBF/ex1.ll                  |   46 +
 llvm/test/CodeGen/SBF/fi_ri.ll                |   25 +
 llvm/test/CodeGen/SBF/i128.ll                 |   68 +
 llvm/test/CodeGen/SBF/inline_asm.ll           |   53 +
 .../CodeGen/SBF/inlineasm-output-template.ll  |   26 +
 llvm/test/CodeGen/SBF/inlineasm-wreg.ll       |   17 +
 llvm/test/CodeGen/SBF/intrinsics.ll           |  100 ++
 llvm/test/CodeGen/SBF/is_trunc_free.ll        |   80 +
 llvm/test/CodeGen/SBF/is_zext_free.ll         |   26 +
 llvm/test/CodeGen/SBF/lit.local.cfg           |    4 +
 llvm/test/CodeGen/SBF/load.ll                 |   43 +
 llvm/test/CodeGen/SBF/loop-exit-cond.ll       |  131 ++
 llvm/test/CodeGen/SBF/loops.ll                |  111 ++
 llvm/test/CodeGen/SBF/many_args1.ll           |   18 +
 llvm/test/CodeGen/SBF/many_args2.ll           |   17 +
 llvm/test/CodeGen/SBF/mem_offset.ll           |   17 +
 .../CodeGen/SBF/memcpy-expand-in-order.ll     |   78 +
 llvm/test/CodeGen/SBF/objdump_atomics.ll      |   21 +
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |   69 +
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll    |   39 +
 llvm/test/CodeGen/SBF/objdump_dis_all.ll      |   26 +
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      |   65 +
 llvm/test/CodeGen/SBF/objdump_intrinsics.ll   |   37 +
 llvm/test/CodeGen/SBF/objdump_nop.ll          |   19 +
 llvm/test/CodeGen/SBF/objdump_static_var.ll   |   39 +
 llvm/test/CodeGen/SBF/objdump_trivial.ll      |   18 +
 llvm/test/CodeGen/SBF/objdump_two_funcs.ll    |   68 +
 llvm/test/CodeGen/SBF/optnone-1.ll            |   52 +
 llvm/test/CodeGen/SBF/optnone-2.ll            |   53 +
 llvm/test/CodeGen/SBF/preprocess-loads.ll     |   35 +
 llvm/test/CodeGen/SBF/reloc-2.ll              |   58 +
 llvm/test/CodeGen/SBF/reloc-3.ll              |   23 +
 llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll      |   20 +
 llvm/test/CodeGen/SBF/reloc-btf-2.ll          |   63 +
 llvm/test/CodeGen/SBF/reloc-btf.ll            |   33 +
 llvm/test/CodeGen/SBF/reloc.ll                |   43 +
 llvm/test/CodeGen/SBF/remove_truncate_1.ll    |   87 +
 llvm/test/CodeGen/SBF/remove_truncate_2.ll    |   65 +
 llvm/test/CodeGen/SBF/remove_truncate_3.ll    |  106 ++
 llvm/test/CodeGen/SBF/remove_truncate_5.ll    |   50 +
 llvm/test/CodeGen/SBF/remove_truncate_6.ll    |   80 +
 llvm/test/CodeGen/SBF/remove_truncate_7.ll    |   55 +
 llvm/test/CodeGen/SBF/remove_truncate_8.ll    |   41 +
 llvm/test/CodeGen/SBF/rodata_1.ll             |   55 +
 llvm/test/CodeGen/SBF/rodata_2.ll             |   51 +
 llvm/test/CodeGen/SBF/rodata_3.ll             |   40 +
 llvm/test/CodeGen/SBF/rodata_4.ll             |   43 +
 llvm/test/CodeGen/SBF/rodata_5.ll             |   49 +
 llvm/test/CodeGen/SBF/rodata_6.ll             |   25 +
 llvm/test/CodeGen/SBF/rodata_7.ll             |   25 +
 llvm/test/CodeGen/SBF/sanity.ll               |  117 ++
 llvm/test/CodeGen/SBF/sdiv.ll                 |   10 +
 llvm/test/CodeGen/SBF/select_ri.ll            |   66 +
 llvm/test/CodeGen/SBF/selectiondag-bug.ll     |   82 +
 llvm/test/CodeGen/SBF/setcc.ll                |  112 ++
 llvm/test/CodeGen/SBF/shifts.ll               |  100 ++
 llvm/test/CodeGen/SBF/simplifycfg.ll          |  139 ++
 llvm/test/CodeGen/SBF/spill-alu32.ll          |   35 +
 llvm/test/CodeGen/SBF/struct_ret1.ll          |   21 +
 llvm/test/CodeGen/SBF/struct_ret2.ll          |   16 +
 llvm/test/CodeGen/SBF/undef.ll                |   55 +
 llvm/test/CodeGen/SBF/vararg1.ll              |    9 +
 llvm/test/CodeGen/SBF/vla.ll                  |  115 ++
 llvm/test/CodeGen/SBF/warn-stack.ll           |   75 +
 llvm/test/CodeGen/SBF/xadd.ll                 |   60 +
 llvm/test/CodeGen/SBF/xadd_legal.ll           |   30 +
 llvm/test/DebugInfo/SBF/extern-void.ll        |   80 +
 llvm/test/DebugInfo/SBF/lit.local.cfg         |    2 +
 llvm/test/MC/SBF/insn-unit-32.s               |  103 ++
 llvm/test/MC/SBF/insn-unit.s                  |  178 ++
 llvm/test/MC/SBF/lit.local.cfg                |    2 +
 llvm/test/MC/SBF/load-store-32.s              |   28 +
 llvm/test/MC/SBF/sbf-sdiv.s                   |   15 +
 llvm/test/Object/SBF/lit.local.cfg            |    2 +
 .../test/Object/SBF/yaml2obj-elf-sbf-rel.yaml |   86 +
 .../ELF/file-header-machine-types.test        |    3 +
 llvm/tools/llvm-readobj/ELFDumper.cpp         |    1 +
 llvm/tools/opt/opt.cpp                        |    2 -
 llvm/unittests/Object/ELFObjectFileTest.cpp   |    8 +
 llvm/unittests/TargetParser/TripleTest.cpp    |   32 +
 180 files changed, 18213 insertions(+), 9 deletions(-)
 create mode 100644 lld/ELF/Arch/SBF.cpp
 create mode 100644 llvm/include/llvm/BinaryFormat/ELFRelocs/SBF.def
 create mode 100644 llvm/lib/Target/SBF/AsmParser/CMakeLists.txt
 create mode 100644 llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
 create mode 100644 llvm/lib/Target/SBF/BTF.def
 create mode 100644 llvm/lib/Target/SBF/BTF.h
 create mode 100644 llvm/lib/Target/SBF/BTFDebug.cpp
 create mode 100644 llvm/lib/Target/SBF/BTFDebug.h
 create mode 100644 llvm/lib/Target/SBF/CMakeLists.txt
 create mode 100644 llvm/lib/Target/SBF/Disassembler/CMakeLists.txt
 create mode 100644 llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
 create mode 100644 llvm/lib/Target/SBF/SBF.h
 create mode 100644 llvm/lib/Target/SBF/SBF.td
 create mode 100644 llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFAdjustOpt.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFAsmPrinter.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFCORE.h
 create mode 100644 llvm/lib/Target/SBF/SBFCallingConv.td
 create mode 100644 llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFFrameLowering.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFFrameLowering.h
 create mode 100644 llvm/lib/Target/SBF/SBFIRPeephole.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFISelLowering.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFISelLowering.h
 create mode 100644 llvm/lib/Target/SBF/SBFInstrFormats.td
 create mode 100644 llvm/lib/Target/SBF/SBFInstrInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFInstrInfo.h
 create mode 100644 llvm/lib/Target/SBF/SBFInstrInfo.td
 create mode 100644 llvm/lib/Target/SBF/SBFMCInstLower.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFMCInstLower.h
 create mode 100644 llvm/lib/Target/SBF/SBFMIChecking.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFMIPeephole.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFPreserveDIType.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFRegisterInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFRegisterInfo.h
 create mode 100644 llvm/lib/Target/SBF/SBFRegisterInfo.td
 create mode 100644 llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
 create mode 100644 llvm/lib/Target/SBF/SBFSubtarget.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFSubtarget.h
 create mode 100644 llvm/lib/Target/SBF/SBFTargetMachine.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFTargetMachine.h
 create mode 100644 llvm/lib/Target/SBF/SBFTargetTransformInfo.h
 create mode 100644 llvm/lib/Target/SBF/TargetInfo/CMakeLists.txt
 create mode 100644 llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
 create mode 100644 llvm/test/CodeGen/SBF/32-bit-subreg-zext.ll
 create mode 100644 llvm/test/CodeGen/SBF/TODO-NOTES
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
 create mode 100644 llvm/test/CodeGen/SBF/alu8.ll
 create mode 100644 llvm/test/CodeGen/SBF/atomics_sbf.ll
 create mode 100644 llvm/test/CodeGen/SBF/basictest.ll
 create mode 100644 llvm/test/CodeGen/SBF/byval.ll
 create mode 100644 llvm/test/CodeGen/SBF/callx.ll
 create mode 100644 llvm/test/CodeGen/SBF/cc_args.ll
 create mode 100644 llvm/test/CodeGen/SBF/cc_ret.ll
 create mode 100644 llvm/test/CodeGen/SBF/cmp.ll
 create mode 100644 llvm/test/CodeGen/SBF/dwarfdump.ll
 create mode 100644 llvm/test/CodeGen/SBF/elf-symbol-information.ll
 create mode 100644 llvm/test/CodeGen/SBF/ex1.ll
 create mode 100644 llvm/test/CodeGen/SBF/fi_ri.ll
 create mode 100644 llvm/test/CodeGen/SBF/i128.ll
 create mode 100644 llvm/test/CodeGen/SBF/inline_asm.ll
 create mode 100644 llvm/test/CodeGen/SBF/inlineasm-output-template.ll
 create mode 100644 llvm/test/CodeGen/SBF/inlineasm-wreg.ll
 create mode 100644 llvm/test/CodeGen/SBF/intrinsics.ll
 create mode 100644 llvm/test/CodeGen/SBF/is_trunc_free.ll
 create mode 100644 llvm/test/CodeGen/SBF/is_zext_free.ll
 create mode 100644 llvm/test/CodeGen/SBF/lit.local.cfg
 create mode 100644 llvm/test/CodeGen/SBF/load.ll
 create mode 100644 llvm/test/CodeGen/SBF/loop-exit-cond.ll
 create mode 100644 llvm/test/CodeGen/SBF/loops.ll
 create mode 100644 llvm/test/CodeGen/SBF/many_args1.ll
 create mode 100644 llvm/test/CodeGen/SBF/many_args2.ll
 create mode 100644 llvm/test/CodeGen/SBF/mem_offset.ll
 create mode 100644 llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_atomics.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_cond_op.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_dis_all.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_imm_hex.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_intrinsics.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_nop.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_static_var.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_trivial.ll
 create mode 100644 llvm/test/CodeGen/SBF/objdump_two_funcs.ll
 create mode 100644 llvm/test/CodeGen/SBF/optnone-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/optnone-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/preprocess-loads.ll
 create mode 100644 llvm/test/CodeGen/SBF/reloc-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/reloc-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
 create mode 100644 llvm/test/CodeGen/SBF/reloc-btf-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/reloc-btf.ll
 create mode 100644 llvm/test/CodeGen/SBF/reloc.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_1.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_2.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_3.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_5.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_6.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_7.ll
 create mode 100644 llvm/test/CodeGen/SBF/remove_truncate_8.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_1.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_2.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_3.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_4.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_5.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_6.ll
 create mode 100644 llvm/test/CodeGen/SBF/rodata_7.ll
 create mode 100644 llvm/test/CodeGen/SBF/sanity.ll
 create mode 100644 llvm/test/CodeGen/SBF/sdiv.ll
 create mode 100644 llvm/test/CodeGen/SBF/select_ri.ll
 create mode 100644 llvm/test/CodeGen/SBF/selectiondag-bug.ll
 create mode 100644 llvm/test/CodeGen/SBF/setcc.ll
 create mode 100644 llvm/test/CodeGen/SBF/shifts.ll
 create mode 100644 llvm/test/CodeGen/SBF/simplifycfg.ll
 create mode 100644 llvm/test/CodeGen/SBF/spill-alu32.ll
 create mode 100644 llvm/test/CodeGen/SBF/struct_ret1.ll
 create mode 100644 llvm/test/CodeGen/SBF/struct_ret2.ll
 create mode 100644 llvm/test/CodeGen/SBF/undef.ll
 create mode 100644 llvm/test/CodeGen/SBF/vararg1.ll
 create mode 100644 llvm/test/CodeGen/SBF/vla.ll
 create mode 100644 llvm/test/CodeGen/SBF/warn-stack.ll
 create mode 100644 llvm/test/CodeGen/SBF/xadd.ll
 create mode 100644 llvm/test/CodeGen/SBF/xadd_legal.ll
 create mode 100644 llvm/test/DebugInfo/SBF/extern-void.ll
 create mode 100644 llvm/test/DebugInfo/SBF/lit.local.cfg
 create mode 100644 llvm/test/MC/SBF/insn-unit-32.s
 create mode 100644 llvm/test/MC/SBF/insn-unit.s
 create mode 100644 llvm/test/MC/SBF/lit.local.cfg
 create mode 100644 llvm/test/MC/SBF/load-store-32.s
 create mode 100644 llvm/test/MC/SBF/sbf-sdiv.s
 create mode 100644 llvm/test/Object/SBF/lit.local.cfg
 create mode 100644 llvm/test/Object/SBF/yaml2obj-elf-sbf-rel.yaml

diff --git a/clang/lib/Basic/Targets/BPF.cpp b/clang/lib/Basic/Targets/BPF.cpp
index f4684765b7ffb..7af9965f81c6e 100644
--- a/clang/lib/Basic/Targets/BPF.cpp
+++ b/clang/lib/Basic/Targets/BPF.cpp
@@ -12,8 +12,10 @@
 
 #include "BPF.h"
 #include "Targets.h"
+#include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/MacroBuilder.h"
 #include "clang/Basic/TargetBuiltins.h"
+#include "clang/Driver/DriverDiagnostic.h"
 #include "llvm/ADT/StringRef.h"
 
 using namespace clang;
@@ -88,6 +90,12 @@ ArrayRef<Builtin::Info> BPFTargetInfo::getTargetBuiltins() const {
 
 bool BPFTargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
                                          DiagnosticsEngine &Diags) {
+  // TODO: The SBF back-end now provides the sbf target. Issue deprecation
+  // warning directing use of '-target sbf' instead. Eventually remove the
+  // +solana support from the BPF back-end.
+  if (getTriple().getArch() != llvm::Triple::sbf && HasSolanaFeature)
+    Diags.Report(diag::warn_drv_no_solana_with_bpf);
+
   for (const auto &Feature : Features) {
     if (Feature == "+alu32") {
       HasAlu32 = true;
diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
new file mode 100644
index 0000000000000..b5358c5e3d587
--- /dev/null
+++ b/lld/ELF/Arch/SBF.cpp
@@ -0,0 +1,140 @@
+//===- SBF.cpp ------------------------------------------------------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "InputFiles.h"
+#include "Symbols.h"
+#include "Target.h"
+#include "lld/Common/ErrorHandler.h"
+#include "llvm/Object/ELF.h"
+#include "llvm/Support/Endian.h"
+
+using namespace llvm;
+using namespace llvm::object;
+using namespace llvm::support::endian;
+using namespace llvm::ELF;
+
+namespace lld {
+namespace elf {
+
+namespace {
+class SBF final : public TargetInfo {
+public:
+  SBF();
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  int64_t getImplicitAddend(const uint8_t *buf, RelType type) const override;
+  void relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const override;
+  uint32_t calcEFlags() const override;
+};
+} // namespace
+
+SBF::SBF(Ctx &ctx) : TargetInfo(ctx) {
+  relativeRel = R_SBF_64_RELATIVE;
+  symbolicRel = R_SBF_64_64;
+}
+
+RelExpr SBF::getRelExpr(RelType type, const Symbol &s,
+                        const uint8_t *loc) const {
+  switch (type) {
+    case R_SBF_64_32:
+      return R_PC;
+    case R_SBF_64_ABS32:
+    case R_SBF_64_NODYLD32:
+    case R_SBF_64_ABS64:
+    case R_SBF_64_64:
+      return R_ABS;
+    default:
+      error(getErrorLocation(loc) + "unrecognized reloc " + toString(type));
+  }
+  return R_NONE;
+}
+
+RelType SBF::getDynRel(RelType type) const {
+  switch (type) {
+    case R_SBF_64_ABS64:
+        // R_SBF_64_ABS64 is symbolic like R_SBF_64_64, which is set as our
+        // symbolicRel in the constructor. Return R_SBF_64_64 here so that if
+        // the symbol isn't preemptible, we emit a _RELATIVE relocation instead
+        // and skip emitting the symbol.
+        //
+        // See https://github.com/solana-labs/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
+        return R_SBF_64_64;
+    default:
+        return type;
+  }
+}
+
+int64_t SBF::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  return 0;
+}
+
+void SBF::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
+  switch (rel.type) {
+    case R_SBF_64_32: {
+      // Relocation of a symbol
+      write32le(loc + 4, ((val - 8) / 8) & 0xFFFFFFFF);
+      break;
+    }
+    case R_SBF_64_ABS32:
+    case R_SBF_64_NODYLD32: {
+      // Relocation used by .BTF.ext and DWARF
+      write32le(loc, val & 0xFFFFFFFF);
+      break;
+    }
+    case R_SBF_64_64: {
+      // Relocation of a lddw instruction
+      // 64 bit address is divided into the imm of this and the following
+      // instructions, lower 32 first.
+      write32le(loc + 4, val & 0xFFFFFFFF);
+      write32le(loc + 8 + 4, val >> 32);
+      break;
+    }
+    case R_SBF_64_ABS64: {
+      // The relocation type is used for normal 64-bit data. The
+      // actual to-be-relocated data is stored at r_offset and the
+      // read/write data bitsize is 64 (8 bytes). The relocation can
+      // be resolved with the symbol value plus implicit addend.
+      write64le(loc, val);
+      break;
+    }
+    default:
+      error(getErrorLocation(loc) + "unrecognized reloc " + toString(rel.type));
+  }
+}
+
+static uint32_t getEFlags(InputFile *file) {
+  if (config->ekind == ELF64BEKind)
+    return cast<ObjFile<ELF64BE>>(file)->getObj().getHeader().e_flags;
+  return cast<ObjFile<ELF64LE>>(file)->getObj().getHeader().e_flags;
+}
+
+uint32_t SBF::calcEFlags() const {
+  uint32_t ret = 0;
+
+  // Ensure that all the object files were compiled with the same flags, as
+  // different flags indicate different ABIs.
+  for (InputFile *f : objectFiles) {
+    uint32_t flags = getEFlags(f);
+    if (ret == 0) {
+      ret = flags;
+    } else if (ret != flags) {
+      error("can not link object files with incompatible flags");
+    }
+  }
+
+  return ret;
+}
+
+void setSBFTargetInfo(Ctx &ctx) {
+  ctx.target.reset(new SBF(ctx));
+}
+
+} // namespace elf
+} // namespace lld
diff --git a/lld/ELF/CMakeLists.txt b/lld/ELF/CMakeLists.txt
index 83d816ddb0601..00182c9f146e4 100644
--- a/lld/ELF/CMakeLists.txt
+++ b/lld/ELF/CMakeLists.txt
@@ -32,6 +32,7 @@ add_lld_library(lldELF
   Arch/PPC.cpp
   Arch/PPC64.cpp
   Arch/RISCV.cpp
+  Arch/SBF.cpp
   Arch/SPARCV9.cpp
   Arch/SystemZ.cpp
   Arch/X86.cpp
diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp
index c90ef8505aadd..86072ef06f539 100644
--- a/lld/ELF/Target.cpp
+++ b/lld/ELF/Target.cpp
@@ -63,6 +63,10 @@ void elf::setTarget(Ctx &ctx) {
     return setARMTargetInfo(ctx);
   case EM_AVR:
     return setAVRTargetInfo(ctx);
+  case EM_BPF:
+    return setSBFTargetInfo(ctx);
+  case EM_SBF:
+    return setSBFTargetInfo(ctx);
   case EM_HEXAGON:
     return setHexagonTargetInfo(ctx);
   case EM_LOONGARCH:
diff --git a/lld/ELF/Target.h b/lld/ELF/Target.h
index fd1e5d33c438a..227089c9bfe3e 100644
--- a/lld/ELF/Target.h
+++ b/lld/ELF/Target.h
@@ -194,6 +194,7 @@ void setSPARCV9TargetInfo(Ctx &);
 void setSystemZTargetInfo(Ctx &);
 void setX86TargetInfo(Ctx &);
 void setX86_64TargetInfo(Ctx &);
+void setSBFTargetInfo(Ctx &);
 
 struct ErrorPlace {
   InputSectionBase *isec;
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index f5293e8663243..e58be29f1f664 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -492,6 +492,7 @@ set(LLVM_ALL_TARGETS
   NVPTX
   PowerPC
   RISCV
+  SBF
   Sparc
   SPIRV
   SystemZ
diff --git a/llvm/include/llvm/BinaryFormat/ELF.h b/llvm/include/llvm/BinaryFormat/ELF.h
index 8853c4a88b0b5..b594a7734cbc7 100644
--- a/llvm/include/llvm/BinaryFormat/ELF.h
+++ b/llvm/include/llvm/BinaryFormat/ELF.h
@@ -323,6 +323,7 @@ enum {
   EM_VE = 251,            // NEC SX-Aurora VE
   EM_CSKY = 252,          // C-SKY 32-bit processor
   EM_LOONGARCH = 258,     // LoongArch
+  EM_SBF = 263            // Solana Bytecode Format
 };
 
 // Object file classes.
@@ -950,6 +951,16 @@ enum : unsigned {
   EF_CUDA_VIRTUAL_SM = 0xff0000,
 };
 
+// SBF specific e_flags
+enum : unsigned {
+  EF_SBF_V2 = 0x20,
+};
+
+// ELF Relocation types for SBF.
+enum {
+#include "ELFRelocs/SBF.def"
+};
+
 // ELF Relocation types for BPF
 enum {
 #include "ELFRelocs/BPF.def"
diff --git a/llvm/include/llvm/BinaryFormat/ELFRelocs/SBF.def b/llvm/include/llvm/BinaryFormat/ELFRelocs/SBF.def
new file mode 100644
index 0000000000000..01a7eb09e8ec6
--- /dev/null
+++ b/llvm/include/llvm/BinaryFormat/ELFRelocs/SBF.def
@@ -0,0 +1,12 @@
+#ifndef ELF_RELOC
+#error "ELF_RELOC must be defined"
+#endif
+
+// Currently these match one-to-one with BPF relocations.
+ELF_RELOC(R_SBF_NONE,        0)
+ELF_RELOC(R_SBF_64_64,       1)
+ELF_RELOC(R_SBF_64_ABS64,    2)
+ELF_RELOC(R_SBF_64_ABS32,    3)
+ELF_RELOC(R_SBF_64_NODYLD32, 4)
+ELF_RELOC(R_SBF_64_RELATIVE, 8)  // B + A
+ELF_RELOC(R_SBF_64_32,      10)
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h
index 60c72062a3f6a..aae09c5bed3b1 100644
--- a/llvm/include/llvm/Object/ELFObjectFile.h
+++ b/llvm/include/llvm/Object/ELFObjectFile.h
@@ -1343,6 +1343,8 @@ StringRef ELFObjectFile<ELFT>::getFileFormatName() const {
       return "elf64-amdgpu";
     case ELF::EM_BPF:
       return "elf64-bpf";
+    case ELF::EM_SBF:
+      return "elf64-sbf";
     case ELF::EM_VE:
       return "elf64-ve";
     case ELF::EM_LOONGARCH:
@@ -1432,6 +1434,8 @@ template <class ELFT> Triple::ArchType ELFObjectFile<ELFT>::getArch() const {
 
   case ELF::EM_BPF:
     return IsLittleEndian ? Triple::bpfel : Triple::bpfeb;
+  case ELF::EM_SBF:
+    return Triple::sbf;
 
   case ELF::EM_VE:
     return Triple::ve;
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index 7d67966d17256..c1b366cd73849 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -1089,6 +1089,7 @@ class Triple {
   }
 
   /// Tests whether the target is eBPF.
+  /// TODO/TBD: For new sbf backend, we should probably remove sbf check here.
   bool isBPF() const {
     return getArch() == Triple::bpfel || getArch() == Triple::bpfeb;
   }
@@ -1109,6 +1110,11 @@ class Triple {
            Env == llvm::Triple::EABIHF;
   }
 
+  /// Tests whether the target is SBF (little endian).
+  bool isSBF() const {
+    return getArch() == Triple::sbf;
+  }
+
   /// Tests whether the target supports comdat
   bool supportsCOMDAT() const {
     return !(isOSBinFormatMachO() || isOSBinFormatXCOFF() ||
diff --git a/llvm/include/module.modulemap b/llvm/include/module.modulemap
index b378023453241..adfb9a1cfa47b 100644
--- a/llvm/include/module.modulemap
+++ b/llvm/include/module.modulemap
@@ -97,6 +97,7 @@ module LLVM_BinaryFormat {
     textual header "llvm/BinaryFormat/ELFRelocs/PowerPC.def"
     textual header "llvm/BinaryFormat/ELFRelocs/RISCV.def"
     textual header "llvm/BinaryFormat/ELFRelocs/RISCV_nonstandard.def"
+    textual header "llvm/BinaryFormat/ELFRelocs/SBF.def"
     textual header "llvm/BinaryFormat/ELFRelocs/Sparc.def"
     textual header "llvm/BinaryFormat/ELFRelocs/SystemZ.def"
     textual header "llvm/BinaryFormat/ELFRelocs/VE.def"
diff --git a/llvm/lib/Analysis/TargetLibraryInfo.cpp b/llvm/lib/Analysis/TargetLibraryInfo.cpp
index 8557901192e40..136e333673b7e 100644
--- a/llvm/lib/Analysis/TargetLibraryInfo.cpp
+++ b/llvm/lib/Analysis/TargetLibraryInfo.cpp
@@ -908,6 +908,13 @@ static void initializeLibCalls(TargetLibraryInfoImpl &TLI, const Triple &T,
   if (T.isOSAIX())
     TLI.setUnavailable(LibFunc_memrchr);
 
+
+  if (T.isBPF() || T.isSBF()) {
+    TLI.setUnavailable(LibFunc_rust_alloc);
+    TLI.setUnavailable(LibFunc_rust_dealloc);
+    TLI.setUnavailable(LibFunc_rust_realloc);
+  }
+
   TLI.addVectorizableFunctionsFromVecLib(ClVectorLibrary, T);
 }
 
diff --git a/llvm/lib/BinaryFormat/ELF.cpp b/llvm/lib/BinaryFormat/ELF.cpp
index 9878f5769087e..f60d0be94c191 100644
--- a/llvm/lib/BinaryFormat/ELF.cpp
+++ b/llvm/lib/BinaryFormat/ELF.cpp
@@ -194,6 +194,7 @@ uint16_t ELF::convertArchNameToEMachine(StringRef Arch) {
       .Case("riscv", EM_RISCV)
       .Case("lanai", EM_LANAI)
       .Case("bpf", EM_BPF)
+      .Case("sbf", EM_SBF)
       .Case("ve", EM_VE)
       .Case("csky", EM_CSKY)
       .Case("loongarch", EM_LOONGARCH)
@@ -557,6 +558,8 @@ StringRef ELF::convertEMachineToArchName(uint16_t EMachine) {
     return "lanai";
   case EM_BPF:
     return "bpf";
+  case EM_SBF:
+    return "sbf";
   case EM_VE:
     return "ve";
   case EM_CSKY:
diff --git a/llvm/lib/Object/ELF.cpp b/llvm/lib/Object/ELF.cpp
index b6d0699ee4fe0..fa3c93d45c43f 100644
--- a/llvm/lib/Object/ELF.cpp
+++ b/llvm/lib/Object/ELF.cpp
@@ -147,6 +147,13 @@ StringRef llvm::object::getELFRelocationTypeName(uint32_t Machine,
       break;
     }
     break;
+  case ELF::EM_SBF:
+    switch (Type) {
+#include "llvm/BinaryFormat/ELFRelocs/SBF.def"
+    default:
+      break;
+    }
+    break;
   case ELF::EM_MSP430:
     switch (Type) {
 #include "llvm/BinaryFormat/ELFRelocs/MSP430.def"
@@ -230,6 +237,8 @@ uint32_t llvm::object::getELFRelativeRelocationType(uint32_t Machine) {
     return ELF::R_VE_RELATIVE;
   case ELF::EM_AMDGPU:
     break;
+  case ELF::EM_SBF:
+    break;
   case ELF::EM_BPF:
     break;
   case ELF::EM_LOONGARCH:
diff --git a/llvm/lib/Object/RelocationResolver.cpp b/llvm/lib/Object/RelocationResolver.cpp
index a28f5943c320d..5a7391a51d414 100644
--- a/llvm/lib/Object/RelocationResolver.cpp
+++ b/llvm/lib/Object/RelocationResolver.cpp
@@ -125,6 +125,28 @@ static uint64_t resolveBPF(uint64_t Type, uint64_t Offset, uint64_t S,
   }
 }
 
+static bool supportsSBF(uint64_t Type) {
+  switch (Type) {
+  case ELF::R_SBF_64_ABS32:
+  case ELF::R_SBF_64_ABS64:
+    return true;
+  default:
+    return false;
+  }
+}
+
+static uint64_t resolveSBF(uint64_t Type, uint64_t Offset, uint64_t S,
+                           uint64_t LocData, int64_t /*Addend*/) {
+  switch (Type) {
+  case ELF::R_SBF_64_ABS32:
+    return (S + LocData) & 0xFFFFFFFF;
+  case ELF::R_SBF_64_ABS64:
+    return S + LocData;
+  default:
+    llvm_unreachable("Invalid relocation type");
+  }
+}
+
 static bool supportsMips64(uint64_t Type) {
   switch (Type) {
   case ELF::R_MIPS_32:
@@ -797,6 +819,8 @@ getRelocationResolver(const ObjectFile &Obj) {
         return {supportsBPF, resolveBPF};
       case Triple::loongarch64:
         return {supportsLoongArch, resolveLoongArch};
+      case Triple::sbf:
+        return {supportsSBF, resolveSBF};
       case Triple::mips64el:
       case Triple::mips64:
         return {supportsMips64, resolveMips64};
diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp
index 539834fc8d4db..6007cf187f548 100644
--- a/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/llvm/lib/ObjectYAML/ELFYAML.cpp
@@ -355,6 +355,7 @@ void ScalarEnumerationTraits<ELFYAML::ELF_EM>::enumeration(
   ECase(EM_RISCV);
   ECase(EM_LANAI);
   ECase(EM_BPF);
+  ECase(EM_SBF);
   ECase(EM_VE);
   ECase(EM_CSKY);
   ECase(EM_LOONGARCH);
@@ -940,6 +941,9 @@ void ScalarEnumerationTraits<ELFYAML::ELF_REL>::enumeration(
   case ELF::EM_BPF:
 #include "llvm/BinaryFormat/ELFRelocs/BPF.def"
     break;
+  case ELF::EM_SBF:
+#include "llvm/BinaryFormat/ELFRelocs/SBF.def"
+    break;
   case ELF::EM_VE:
 #include "llvm/BinaryFormat/ELFRelocs/VE.def"
     break;
diff --git a/llvm/lib/Target/BPF/BPFSubtarget.cpp b/llvm/lib/Target/BPF/BPFSubtarget.cpp
index 305e9a2bf2cda..a110cb2c8fff6 100644
--- a/llvm/lib/Target/BPF/BPFSubtarget.cpp
+++ b/llvm/lib/Target/BPF/BPFSubtarget.cpp
@@ -51,7 +51,9 @@ BPFSubtarget &BPFSubtarget::initializeSubtargetDependencies(StringRef CPU,
   return *this;
 }
 
-void BPFSubtarget::initializeEnvironment() {
+void BPFSubtarget::initializeEnvironment(const Triple &TT) {
+  // TODO: jle: remove, sbf is now provided by the SBF backend.
+  IsSolana = false;
   HasJmpExt = false;
   HasJmp32 = false;
   HasAlu32 = false;
@@ -101,6 +103,10 @@ BPFSubtarget::BPFSubtarget(const Triple &TT, const std::string &CPU,
       FrameLowering(initializeSubtargetDependencies(CPU, FS)),
       TLInfo(TM, *this) {
   IsLittleEndian = TT.isLittleEndian();
+<<<<<<< HEAD
+=======
+  TSInfo.setSolanaFlag(false);
+>>>>>>> 3d16ab60503b ([SOL] Initial squash commit for new SBF LLVM back-end and related.)
 
   CallLoweringInfo.reset(new BPFCallLowering(*getTargetLowering()));
   Legalizer.reset(new BPFLegalizerInfo(*this));
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
index 3379af6fe8744..0ad56ecb4a4d4 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.cpp
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -51,11 +51,16 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeBPFTarget() {
 }
 
 // DataLayout: little or big endian
-static std::string computeDataLayout(const Triple &TT) {
-  if (TT.getArch() == Triple::bpfeb)
-    return "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
-  else
-    return "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+static std::string computeDataLayout(const Triple &TT, StringRef FS) {
+  // TODO: jle: remove 'solana', sbf is now provided by the SBF backend.
+  bool IsSolana = FS.contains("solana");
+  if (TT.getArch() == Triple::bpfeb) {
+    return IsSolana ? "E-m:e-p:64:64-i64:64-n32:64-S128"
+      : "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+  } else {
+    return IsSolana ? "e-m:e-p:64:64-i64:64-n32:64-S128"
+      : "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+  }
 }
 
 static Reloc::Model getEffectiveRelocModel(std::optional<Reloc::Model> RM) {
diff --git a/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h b/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h
index 150526c1a9db6..81d1be39d6232 100644
--- a/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h
+++ b/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h
@@ -16,7 +16,6 @@ class Target;
 Target &getTheBPFleTarget();
 Target &getTheBPFbeTarget();
 Target &getTheBPFTarget();
-
 } // namespace llvm
 
 #endif // LLVM_LIB_TARGET_BPF_TARGETINFO_BPFTARGETINFO_H
diff --git a/llvm/lib/Target/SBF/AsmParser/CMakeLists.txt b/llvm/lib/Target/SBF/AsmParser/CMakeLists.txt
new file mode 100644
index 0000000000000..1a8255366fb32
--- /dev/null
+++ b/llvm/lib/Target/SBF/AsmParser/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_llvm_component_library(LLVMSBFAsmParser
+  SBFAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  SBFDesc
+  SBFInfo
+  Support
+
+  ADD_TO_COMPONENT
+  SBF
+  )
diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
new file mode 100644
index 0000000000000..927593a749247
--- /dev/null
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -0,0 +1,509 @@
+//===-- SBFAsmParser.cpp - Parse SBF assembly to MCInst instructions --===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "TargetInfo/SBFTargetInfo.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCExpr.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
+#include "llvm/MC/MCParser/MCTargetAsmParser.h"
+#include "llvm/MC/MCRegisterInfo.h"
+#include "llvm/MC/MCStreamer.h"
+#include "llvm/MC/MCSubtargetInfo.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/Casting.h"
+
+using namespace llvm;
+
+namespace {
+struct SBFOperand;
+
+class SBFAsmParser : public MCTargetAsmParser {
+
+  SMLoc getLoc() const { return getParser().getTok().getLoc(); }
+
+  bool PreMatchCheck(OperandVector &Operands);
+
+  bool MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
+                               OperandVector &Operands, MCStreamer &Out,
+                               uint64_t &ErrorInfo,
+                               bool MatchingInlineAsm) override;
+
+  bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) override;
+  OperandMatchResultTy tryParseRegister(unsigned &RegNo, SMLoc &StartLoc,
+                                        SMLoc &EndLoc) override;
+
+  bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
+                        SMLoc NameLoc, OperandVector &Operands) override;
+
+  bool ParseDirective(AsmToken DirectiveID) override;
+
+  // "=" is used as assignment operator for assembly statment, so can't be used
+  // for symbol assignment.
+  bool equalIsAsmAssignment() override { return false; }
+  // "*" is used for dereferencing memory that it will be the start of
+  // statement.
+  bool starIsStartOfStatement() override { return true; }
+
+#define GET_ASSEMBLER_HEADER
+#include "SBFGenAsmMatcher.inc"
+
+  OperandMatchResultTy parseImmediate(OperandVector &Operands);
+  OperandMatchResultTy parseRegister(OperandVector &Operands);
+  OperandMatchResultTy parseOperandAsOperator(OperandVector &Operands);
+
+public:
+  enum SBFMatchResultTy {
+    Match_Dummy = FIRST_TARGET_MATCH_RESULT_TY,
+#define GET_OPERAND_DIAGNOSTIC_TYPES
+#include "SBFGenAsmMatcher.inc"
+#undef GET_OPERAND_DIAGNOSTIC_TYPES
+  };
+
+  SBFAsmParser(const MCSubtargetInfo &STI, MCAsmParser &Parser,
+               const MCInstrInfo &MII, const MCTargetOptions &Options)
+      : MCTargetAsmParser(Options, STI, MII) {
+    setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
+  }
+};
+
+/// SBFOperand - Instances of this class represent a parsed machine
+/// instruction
+struct SBFOperand : public MCParsedAsmOperand {
+
+  enum KindTy {
+    Token,
+    Register,
+    Immediate,
+  } Kind;
+
+  struct RegOp {
+    unsigned RegNum;
+  };
+
+  struct ImmOp {
+    const MCExpr *Val;
+  };
+
+  SMLoc StartLoc, EndLoc;
+  union {
+    StringRef Tok;
+    RegOp Reg;
+    ImmOp Imm;
+  };
+
+  SBFOperand(KindTy K) : Kind(K) {}
+
+public:
+  SBFOperand(const SBFOperand &o) : MCParsedAsmOperand() {
+    Kind = o.Kind;
+    StartLoc = o.StartLoc;
+    EndLoc = o.EndLoc;
+
+    switch (Kind) {
+    case Register:
+      Reg = o.Reg;
+      break;
+    case Immediate:
+      Imm = o.Imm;
+      break;
+    case Token:
+      Tok = o.Tok;
+      break;
+    }
+  }
+
+  bool isToken() const override { return Kind == Token; }
+  bool isReg() const override { return Kind == Register; }
+  bool isImm() const override { return Kind == Immediate; }
+  bool isMem() const override { return false; }
+
+  bool isConstantImm() const {
+    return isImm() && isa<MCConstantExpr>(getImm());
+  }
+
+  int64_t getConstantImm() const {
+    const MCExpr *Val = getImm();
+    return static_cast<const MCConstantExpr *>(Val)->getValue();
+  }
+
+  bool isSImm12() const {
+    return (isConstantImm() && isInt<12>(getConstantImm()));
+  }
+
+  /// getStartLoc - Gets location of the first token of this operand
+  SMLoc getStartLoc() const override { return StartLoc; }
+  /// getEndLoc - Gets location of the last token of this operand
+  SMLoc getEndLoc() const override { return EndLoc; }
+
+  unsigned getReg() const override {
+    assert(Kind == Register && "Invalid type access!");
+    return Reg.RegNum;
+  }
+
+  const MCExpr *getImm() const {
+    assert(Kind == Immediate && "Invalid type access!");
+    return Imm.Val;
+  }
+
+  StringRef getToken() const {
+    assert(Kind == Token && "Invalid type access!");
+    return Tok;
+  }
+
+  void print(raw_ostream &OS) const override {
+    switch (Kind) {
+    case Immediate:
+      OS << *getImm();
+      break;
+    case Register:
+      OS << "<register x";
+      OS << getReg() << ">";
+      break;
+    case Token:
+      OS << "'" << getToken() << "'";
+      break;
+    }
+  }
+
+  void addExpr(MCInst &Inst, const MCExpr *Expr) const {
+    assert(Expr && "Expr shouldn't be null!");
+
+    if (auto *CE = dyn_cast<MCConstantExpr>(Expr))
+      Inst.addOperand(MCOperand::createImm(CE->getValue()));
+    else
+      Inst.addOperand(MCOperand::createExpr(Expr));
+  }
+
+  // Used by the TableGen Code
+  void addRegOperands(MCInst &Inst, unsigned N) const {
+    assert(N == 1 && "Invalid number of operands!");
+    Inst.addOperand(MCOperand::createReg(getReg()));
+  }
+
+  void addImmOperands(MCInst &Inst, unsigned N) const {
+    assert(N == 1 && "Invalid number of operands!");
+    addExpr(Inst, getImm());
+  }
+
+  static std::unique_ptr<SBFOperand> createToken(StringRef Str, SMLoc S) {
+    auto Op = std::make_unique<SBFOperand>(Token);
+    Op->Tok = Str;
+    Op->StartLoc = S;
+    Op->EndLoc = S;
+    return Op;
+  }
+
+  static std::unique_ptr<SBFOperand> createReg(unsigned RegNo, SMLoc S,
+                                               SMLoc E) {
+    auto Op = std::make_unique<SBFOperand>(Register);
+    Op->Reg.RegNum = RegNo;
+    Op->StartLoc = S;
+    Op->EndLoc = E;
+    return Op;
+  }
+
+  static std::unique_ptr<SBFOperand> createImm(const MCExpr *Val, SMLoc S,
+                                               SMLoc E) {
+    auto Op = std::make_unique<SBFOperand>(Immediate);
+    Op->Imm.Val = Val;
+    Op->StartLoc = S;
+    Op->EndLoc = E;
+    return Op;
+  }
+
+  // Identifiers that can be used at the start of a statment.
+  static bool isValidIdAtStart(StringRef Name) {
+    return StringSwitch<bool>(Name.lower())
+        .Case("if", true)
+        .Case("call", true)
+        .Case("callx", true)
+        .Case("goto", true)
+        .Case("*", true)
+        .Case("exit", true)
+        .Case("lock", true)
+        .Case("ld_pseudo", true)
+        .Default(false);
+  }
+
+  // Identifiers that can be used in the middle of a statment.
+  static bool isValidIdInMiddle(StringRef Name) {
+    return StringSwitch<bool>(Name.lower())
+        .Case("u64", true)
+        .Case("u32", true)
+        .Case("u16", true)
+        .Case("u8", true)
+        .Case("be64", true)
+        .Case("be32", true)
+        .Case("be16", true)
+        .Case("le64", true)
+        .Case("le32", true)
+        .Case("le16", true)
+        .Case("goto", true)
+        .Case("ll", true)
+        .Case("skb", true)
+        .Case("s", true)
+        .Default(false);
+  }
+};
+} // end anonymous namespace.
+
+#define GET_REGISTER_MATCHER
+#define GET_MATCHER_IMPLEMENTATION
+#include "SBFGenAsmMatcher.inc"
+
+bool SBFAsmParser::PreMatchCheck(OperandVector &Operands) {
+
+  if (Operands.size() == 4) {
+    // check "reg1 = -reg2" and "reg1 = be16/be32/be64/le16/le32/le64 reg2",
+    // reg1 must be the same as reg2
+    SBFOperand &Op0 = (SBFOperand &)*Operands[0];
+    SBFOperand &Op1 = (SBFOperand &)*Operands[1];
+    SBFOperand &Op2 = (SBFOperand &)*Operands[2];
+    SBFOperand &Op3 = (SBFOperand &)*Operands[3];
+    if (Op0.isReg() && Op1.isToken() && Op2.isToken() && Op3.isReg()
+        && Op1.getToken() == "="
+        && (Op2.getToken() == "-" || Op2.getToken() == "be16"
+            || Op2.getToken() == "be32" || Op2.getToken() == "be64"
+            || Op2.getToken() == "le16" || Op2.getToken() == "le32"
+            || Op2.getToken() == "le64")
+        && Op0.getReg() != Op3.getReg())
+      return true;
+  }
+
+  return false;
+}
+
+bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
+                                           OperandVector &Operands,
+                                           MCStreamer &Out, uint64_t &ErrorInfo,
+                                           bool MatchingInlineAsm) {
+  MCInst Inst;
+  SMLoc ErrorLoc;
+
+  if (PreMatchCheck(Operands))
+    return Error(IDLoc, "additional inst constraint not met");
+
+  switch (MatchInstructionImpl(Operands, Inst, ErrorInfo, MatchingInlineAsm)) {
+  default:
+    break;
+  case Match_Success:
+    Inst.setLoc(IDLoc);
+    Out.emitInstruction(Inst, getSTI());
+    return false;
+  case Match_MissingFeature:
+    return Error(IDLoc, "instruction use requires an option to be enabled");
+  case Match_MnemonicFail:
+    return Error(IDLoc, "unrecognized instruction mnemonic");
+  case Match_InvalidOperand:
+    ErrorLoc = IDLoc;
+
+    if (ErrorInfo != ~0U) {
+      if (ErrorInfo >= Operands.size())
+        return Error(ErrorLoc, "too few operands for instruction");
+
+      ErrorLoc = ((SBFOperand &)*Operands[ErrorInfo]).getStartLoc();
+
+      if (ErrorLoc == SMLoc())
+        ErrorLoc = IDLoc;
+    }
+
+    return Error(ErrorLoc, "invalid operand for instruction");
+  }
+
+  llvm_unreachable("Unknown match type detected!");
+}
+
+bool SBFAsmParser::ParseRegister(unsigned &RegNo, SMLoc &StartLoc,
+                                 SMLoc &EndLoc) {
+  if (tryParseRegister(RegNo, StartLoc, EndLoc) != MatchOperand_Success)
+    return Error(StartLoc, "invalid register name");
+  return false;
+}
+
+OperandMatchResultTy SBFAsmParser::tryParseRegister(unsigned &RegNo,
+                                                    SMLoc &StartLoc,
+                                                    SMLoc &EndLoc) {
+  const AsmToken &Tok = getParser().getTok();
+  StartLoc = Tok.getLoc();
+  EndLoc = Tok.getEndLoc();
+  RegNo = 0;
+  StringRef Name = getLexer().getTok().getIdentifier();
+
+  if (!MatchRegisterName(Name)) {
+    getParser().Lex(); // Eat identifier token.
+    return MatchOperand_Success;
+  }
+
+  return MatchOperand_NoMatch;
+}
+
+OperandMatchResultTy
+SBFAsmParser::parseOperandAsOperator(OperandVector &Operands) {
+  SMLoc S = getLoc();
+
+  if (getLexer().getKind() == AsmToken::Identifier) {
+    StringRef Name = getLexer().getTok().getIdentifier();
+
+    if (SBFOperand::isValidIdInMiddle(Name)) {
+      getLexer().Lex();
+      Operands.push_back(SBFOperand::createToken(Name, S));
+      return MatchOperand_Success;
+    }
+
+    return MatchOperand_NoMatch;
+  }
+
+  switch (getLexer().getKind()) {
+  case AsmToken::Minus:
+  case AsmToken::Plus: {
+    if (getLexer().peekTok().is(AsmToken::Integer))
+      return MatchOperand_NoMatch;
+    LLVM_FALLTHROUGH;
+  }
+
+  case AsmToken::Equal:
+  case AsmToken::Greater:
+  case AsmToken::Less:
+  case AsmToken::Pipe:
+  case AsmToken::Star:
+  case AsmToken::LParen:
+  case AsmToken::RParen:
+  case AsmToken::LBrac:
+  case AsmToken::RBrac:
+  case AsmToken::Slash:
+  case AsmToken::Amp:
+  case AsmToken::Percent:
+  case AsmToken::Caret: {
+    StringRef Name = getLexer().getTok().getString();
+    getLexer().Lex();
+    Operands.push_back(SBFOperand::createToken(Name, S));
+
+    return MatchOperand_Success;
+  }
+
+  case AsmToken::EqualEqual:
+  case AsmToken::ExclaimEqual:
+  case AsmToken::GreaterEqual:
+  case AsmToken::GreaterGreater:
+  case AsmToken::LessEqual:
+  case AsmToken::LessLess: {
+    Operands.push_back(SBFOperand::createToken(
+        getLexer().getTok().getString().substr(0, 1), S));
+    Operands.push_back(SBFOperand::createToken(
+        getLexer().getTok().getString().substr(1, 1), S));
+    getLexer().Lex();
+
+    return MatchOperand_Success;
+  }
+
+  default:
+    break;
+  }
+
+  return MatchOperand_NoMatch;
+}
+
+OperandMatchResultTy SBFAsmParser::parseRegister(OperandVector &Operands) {
+  SMLoc S = getLoc();
+  SMLoc E = SMLoc::getFromPointer(S.getPointer() - 1);
+
+  switch (getLexer().getKind()) {
+  default:
+    return MatchOperand_NoMatch;
+  case AsmToken::Identifier:
+    StringRef Name = getLexer().getTok().getIdentifier();
+    unsigned RegNo = MatchRegisterName(Name);
+
+    if (RegNo == 0)
+      return MatchOperand_NoMatch;
+
+    getLexer().Lex();
+    Operands.push_back(SBFOperand::createReg(RegNo, S, E));
+  }
+  return MatchOperand_Success;
+}
+
+OperandMatchResultTy SBFAsmParser::parseImmediate(OperandVector &Operands) {
+  switch (getLexer().getKind()) {
+  default:
+    return MatchOperand_NoMatch;
+  case AsmToken::LParen:
+  case AsmToken::Minus:
+  case AsmToken::Plus:
+  case AsmToken::Integer:
+  case AsmToken::String:
+  case AsmToken::Identifier:
+    break;
+  }
+
+  const MCExpr *IdVal;
+  SMLoc S = getLoc();
+
+  if (getParser().parseExpression(IdVal))
+    return MatchOperand_ParseFail;
+
+  SMLoc E = SMLoc::getFromPointer(S.getPointer() - 1);
+  Operands.push_back(SBFOperand::createImm(IdVal, S, E));
+
+  return MatchOperand_Success;
+}
+
+/// ParseInstruction - Parse an SBF instruction which is in SBF verifier
+/// format.
+bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
+                                    SMLoc NameLoc, OperandVector &Operands) {
+  // The first operand could be either register or actually an operator.
+  unsigned RegNo = MatchRegisterName(Name);
+
+  if (RegNo != 0) {
+    SMLoc E = SMLoc::getFromPointer(NameLoc.getPointer() - 1);
+    Operands.push_back(SBFOperand::createReg(RegNo, NameLoc, E));
+  } else if (SBFOperand::isValidIdAtStart (Name))
+    Operands.push_back(SBFOperand::createToken(Name, NameLoc));
+  else
+    return Error(NameLoc, "invalid register/token name");
+
+  while (!getLexer().is(AsmToken::EndOfStatement)) {
+    // Attempt to parse token as operator
+    if (parseOperandAsOperator(Operands) == MatchOperand_Success)
+      continue;
+
+    // Attempt to parse token as register
+    if (parseRegister(Operands) == MatchOperand_Success)
+      continue;
+
+    // Attempt to parse token as an immediate
+    if (parseImmediate(Operands) != MatchOperand_Success) {
+      SMLoc Loc = getLexer().getLoc();
+      return Error(Loc, "unexpected token");
+    }
+  }
+
+  if (getLexer().isNot(AsmToken::EndOfStatement)) {
+    SMLoc Loc = getLexer().getLoc();
+
+    getParser().eatToEndOfStatement();
+
+    return Error(Loc, "unexpected token");
+  }
+
+  // Consume the EndOfStatement.
+  getParser().Lex();
+  return false;
+}
+
+bool SBFAsmParser::ParseDirective(AsmToken DirectiveID) { return true; }
+
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFAsmParser() {
+  RegisterMCAsmParser<SBFAsmParser> XX(getTheSBFXTarget());
+}
diff --git a/llvm/lib/Target/SBF/BTF.def b/llvm/lib/Target/SBF/BTF.def
new file mode 100644
index 0000000000000..0ae4194bc512e
--- /dev/null
+++ b/llvm/lib/Target/SBF/BTF.def
@@ -0,0 +1,37 @@
+//===- BTF.def - BTF definitions --------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Macros for BTF.
+//
+//===----------------------------------------------------------------------===//
+
+#if !defined(HANDLE_BTF_KIND)
+#error "Missing macro definition of HANDLE_BTF_*"
+#endif
+
+HANDLE_BTF_KIND(0, UNKN)
+HANDLE_BTF_KIND(1, INT)
+HANDLE_BTF_KIND(2, PTR)
+HANDLE_BTF_KIND(3, ARRAY)
+HANDLE_BTF_KIND(4, STRUCT)
+HANDLE_BTF_KIND(5, UNION)
+HANDLE_BTF_KIND(6, ENUM)
+HANDLE_BTF_KIND(7, FWD)
+HANDLE_BTF_KIND(8, TYPEDEF)
+HANDLE_BTF_KIND(9, VOLATILE)
+HANDLE_BTF_KIND(10, CONST)
+HANDLE_BTF_KIND(11, RESTRICT)
+HANDLE_BTF_KIND(12, FUNC)
+HANDLE_BTF_KIND(13, FUNC_PROTO)
+HANDLE_BTF_KIND(14, VAR)
+HANDLE_BTF_KIND(15, DATASEC)
+HANDLE_BTF_KIND(16, FLOAT)
+HANDLE_BTF_KIND(17, DECL_TAG)
+HANDLE_BTF_KIND(18, TYPE_TAG)
+
+#undef HANDLE_BTF_KIND
diff --git a/llvm/lib/Target/SBF/BTF.h b/llvm/lib/Target/SBF/BTF.h
new file mode 100644
index 0000000000000..89fe9e9f4c9d3
--- /dev/null
+++ b/llvm/lib/Target/SBF/BTF.h
@@ -0,0 +1,261 @@
+//===-- BTF.h --------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file contains the layout of .BTF and .BTF.ext ELF sections.
+///
+/// The binary layout for .BTF section:
+///   struct Header
+///   Type and Str subsections
+/// The Type subsection is a collection of types with type id starting with 1.
+/// The Str subsection is simply a collection of strings.
+///
+/// The binary layout for .BTF.ext section:
+///   struct ExtHeader
+///   FuncInfo, LineInfo, FieldReloc and ExternReloc subsections
+/// The FuncInfo subsection is defined as below:
+///   BTFFuncInfo Size
+///   struct SecFuncInfo for ELF section #1
+///   A number of struct SBFFuncInfo for ELF section #1
+///   struct SecFuncInfo for ELF section #2
+///   A number of struct SBFFuncInfo for ELF section #2
+///   ...
+/// The LineInfo subsection is defined as below:
+///   SBFLineInfo Size
+///   struct SecLineInfo for ELF section #1
+///   A number of struct SBFLineInfo for ELF section #1
+///   struct SecLineInfo for ELF section #2
+///   A number of struct SBFLineInfo for ELF section #2
+///   ...
+/// The FieldReloc subsection is defined as below:
+///   SBFFieldReloc Size
+///   struct SecFieldReloc for ELF section #1
+///   A number of struct SBFFieldReloc for ELF section #1
+///   struct SecFieldReloc for ELF section #2
+///   A number of struct SBFFieldReloc for ELF section #2
+///   ...
+///
+/// The section formats are also defined at
+///    https://github.com/torvalds/linux/blob/master/include/uapi/linux/btf.h
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_BTF_H
+#define LLVM_LIB_TARGET_SBF_BTF_H
+
+namespace llvm {
+namespace BTF {
+
+enum : uint32_t { MAGIC = 0xeB9F, VERSION = 1 };
+
+/// Sizes in bytes of various things in the BTF format.
+enum {
+  HeaderSize = 24,
+  ExtHeaderSize = 32,
+  CommonTypeSize = 12,
+  BTFArraySize = 12,
+  BTFEnumSize = 8,
+  BTFMemberSize = 12,
+  BTFParamSize = 8,
+  BTFDataSecVarSize = 12,
+  SecFuncInfoSize = 8,
+  SecLineInfoSize = 8,
+  SecFieldRelocSize = 8,
+  SBFFuncInfoSize = 8,
+  SBFLineInfoSize = 16,
+  SBFFieldRelocSize = 16,
+};
+
+/// The .BTF section header definition.
+struct Header {
+  uint16_t Magic;  ///< Magic value
+  uint8_t Version; ///< Version number
+  uint8_t Flags;   ///< Extra flags
+  uint32_t HdrLen; ///< Length of this header
+
+  /// All offsets are in bytes relative to the end of this header.
+  uint32_t TypeOff; ///< Offset of type section
+  uint32_t TypeLen; ///< Length of type section
+  uint32_t StrOff;  ///< Offset of string section
+  uint32_t StrLen;  ///< Length of string section
+};
+
+enum : uint32_t {
+  MAX_VLEN = 0xffff ///< Max # of struct/union/enum members or func args
+};
+
+enum TypeKinds : uint8_t {
+#define HANDLE_BTF_KIND(ID, NAME) BTF_KIND_##NAME = ID,
+#include "BTF.def"
+};
+
+/// The BTF common type definition. Different kinds may have
+/// additional information after this structure data.
+struct CommonType {
+  /// Type name offset in the string table.
+  uint32_t NameOff;
+
+  /// "Info" bits arrangement:
+  /// Bits  0-15: vlen (e.g. # of struct's members)
+  /// Bits 16-23: unused
+  /// Bits 24-27: kind (e.g. int, ptr, array...etc)
+  /// Bits 28-30: unused
+  /// Bit     31: kind_flag, currently used by
+  ///             struct, union and fwd
+  uint32_t Info;
+
+  /// "Size" is used by INT, ENUM, STRUCT and UNION.
+  /// "Size" tells the size of the type it is describing.
+  ///
+  /// "Type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
+  /// FUNC, FUNC_PROTO, VAR, DECL_TAG and TYPE_TAG.
+  /// "Type" is a type_id referring to another type.
+  union {
+    uint32_t Size;
+    uint32_t Type;
+  };
+};
+
+// For some specific BTF_KIND, "struct CommonType" is immediately
+// followed by extra data.
+
+// BTF_KIND_INT is followed by a u32 and the following
+// is the 32 bits arrangement:
+// BTF_INT_ENCODING(VAL) : (((VAL) & 0x0f000000) >> 24)
+// BTF_INT_OFFSET(VAL) : (((VAL & 0x00ff0000)) >> 16)
+// BTF_INT_BITS(VAL) : ((VAL) & 0x000000ff)
+
+/// Attributes stored in the INT_ENCODING.
+enum : uint8_t {
+  INT_SIGNED = (1 << 0),
+  INT_CHAR = (1 << 1),
+  INT_BOOL = (1 << 2)
+};
+
+/// BTF_KIND_ENUM is followed by multiple "struct BTFEnum".
+/// The exact number of btf_enum is stored in the vlen (of the
+/// info in "struct CommonType").
+struct BTFEnum {
+  uint32_t NameOff; ///< Enum name offset in the string table
+  int32_t Val;      ///< Enum member value
+};
+
+/// BTF_KIND_ARRAY is followed by one "struct BTFArray".
+struct BTFArray {
+  uint32_t ElemType;  ///< Element type
+  uint32_t IndexType; ///< Index type
+  uint32_t Nelems;    ///< Number of elements for this array
+};
+
+/// BTF_KIND_STRUCT and BTF_KIND_UNION are followed
+/// by multiple "struct BTFMember".  The exact number
+/// of BTFMember is stored in the vlen (of the info in
+/// "struct CommonType").
+///
+/// If the struct/union contains any bitfield member,
+/// the Offset below represents BitOffset (bits 0 - 23)
+/// and BitFieldSize(bits 24 - 31) with BitFieldSize = 0
+/// for non bitfield members. Otherwise, the Offset
+/// represents the BitOffset.
+struct BTFMember {
+  uint32_t NameOff; ///< Member name offset in the string table
+  uint32_t Type;    ///< Member type
+  uint32_t Offset;  ///< BitOffset or BitFieldSize+BitOffset
+};
+
+/// BTF_KIND_FUNC_PROTO are followed by multiple "struct BTFParam".
+/// The exist number of BTFParam is stored in the vlen (of the info
+/// in "struct CommonType").
+struct BTFParam {
+  uint32_t NameOff;
+  uint32_t Type;
+};
+
+/// BTF_KIND_FUNC can be global, static or extern.
+enum : uint8_t {
+  FUNC_STATIC = 0,
+  FUNC_GLOBAL = 1,
+  FUNC_EXTERN = 2,
+};
+
+/// Variable scoping information.
+enum : uint8_t {
+  VAR_STATIC = 0,           ///< Linkage: InternalLinkage
+  VAR_GLOBAL_ALLOCATED = 1, ///< Linkage: ExternalLinkage
+  VAR_GLOBAL_EXTERNAL = 2,  ///< Linkage: ExternalLinkage
+};
+
+/// BTF_KIND_DATASEC are followed by multiple "struct BTFDataSecVar".
+/// The exist number of BTFDataSec is stored in the vlen (of the info
+/// in "struct CommonType").
+struct BTFDataSec {
+  uint32_t Type;   ///< A BTF_KIND_VAR type
+  uint32_t Offset; ///< In-section offset
+  uint32_t Size;   ///< Occupied memory size
+};
+
+/// The .BTF.ext section header definition.
+struct ExtHeader {
+  uint16_t Magic;
+  uint8_t Version;
+  uint8_t Flags;
+  uint32_t HdrLen;
+
+  uint32_t FuncInfoOff;    ///< Offset of func info section
+  uint32_t FuncInfoLen;    ///< Length of func info section
+  uint32_t LineInfoOff;    ///< Offset of line info section
+  uint32_t LineInfoLen;    ///< Length of line info section
+  uint32_t FieldRelocOff; ///< Offset of offset reloc section
+  uint32_t FieldRelocLen; ///< Length of offset reloc section
+};
+
+/// Specifying one function info.
+struct SBFFuncInfo {
+  uint32_t InsnOffset; ///< Byte offset in the section
+  uint32_t TypeId;     ///< Type id referring to .BTF type section
+};
+
+/// Specifying function info's in one section.
+struct SecFuncInfo {
+  uint32_t SecNameOff;  ///< Section name index in the .BTF string table
+  uint32_t NumFuncInfo; ///< Number of func info's in this section
+};
+
+/// Specifying one line info.
+struct SBFLineInfo {
+  uint32_t InsnOffset;  ///< Byte offset in this section
+  uint32_t FileNameOff; ///< File name index in the .BTF string table
+  uint32_t LineOff;     ///< Line index in the .BTF string table
+  uint32_t LineCol;     ///< Line num: line_col >> 10,
+                        ///  col num: line_col & 0x3ff
+};
+
+/// Specifying line info's in one section.
+struct SecLineInfo {
+  uint32_t SecNameOff;  ///< Section name index in the .BTF string table
+  uint32_t NumLineInfo; ///< Number of line info's in this section
+};
+
+/// Specifying one offset relocation.
+struct SBFFieldReloc {
+  uint32_t InsnOffset;    ///< Byte offset in this section
+  uint32_t TypeID;        ///< TypeID for the relocation
+  uint32_t OffsetNameOff; ///< The string to traverse types
+  uint32_t RelocKind;     ///< What to patch the instruction
+};
+
+/// Specifying offset relocation's in one section.
+struct SecFieldReloc {
+  uint32_t SecNameOff;     ///< Section name index in the .BTF string table
+  uint32_t NumFieldReloc; ///< Number of offset reloc's in this section
+};
+
+} // End namespace BTF.
+} // End namespace llvm.
+
+#endif
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
new file mode 100644
index 0000000000000..b3f6e626011d7
--- /dev/null
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -0,0 +1,1514 @@
+//===- BTFDebug.cpp - BTF Generator ---------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains support for writing BTF debug info.
+//
+//===----------------------------------------------------------------------===//
+
+#include "BTFDebug.h"
+#include "SBF.h"
+#include "SBFCORE.h"
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "llvm/BinaryFormat/ELF.h"
+#include "llvm/CodeGen/AsmPrinter.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCObjectFileInfo.h"
+#include "llvm/MC/MCSectionELF.h"
+#include "llvm/MC/MCStreamer.h"
+#include "llvm/Support/LineIterator.h"
+#include "llvm/Target/TargetLoweringObjectFile.h"
+
+using namespace llvm;
+using namespace BTFX;
+
+static const char *BTFKindStr[] = {
+#define HANDLE_BTF_KIND(ID, NAME) "BTF_KIND_" #NAME,
+#include "BTF.def"
+};
+
+/// Emit a BTF common type.
+void BTFTypeBase::emitType(MCStreamer &OS) {
+  OS.AddComment(std::string(BTFKindStr[Kind]) + "(id = " + std::to_string(Id) +
+                ")");
+  OS.emitInt32(BTFType.NameOff);
+  OS.AddComment("0x" + Twine::utohexstr(BTFType.Info));
+  OS.emitInt32(BTFType.Info);
+  OS.emitInt32(BTFType.Size);
+}
+
+BTFTypeDerived::BTFTypeDerived(const DIDerivedType *DTy, unsigned Tag,
+                               bool NeedsFixup)
+    : DTy(DTy), NeedsFixup(NeedsFixup), Name(DTy->getName()) {
+  switch (Tag) {
+  case dwarf::DW_TAG_pointer_type:
+    Kind = BTF::BTF_KIND_PTR;
+    break;
+  case dwarf::DW_TAG_const_type:
+    Kind = BTF::BTF_KIND_CONST;
+    break;
+  case dwarf::DW_TAG_volatile_type:
+    Kind = BTF::BTF_KIND_VOLATILE;
+    break;
+  case dwarf::DW_TAG_typedef:
+    Kind = BTF::BTF_KIND_TYPEDEF;
+    break;
+  case dwarf::DW_TAG_restrict_type:
+    Kind = BTF::BTF_KIND_RESTRICT;
+    break;
+  default:
+    llvm_unreachable("Unknown DIDerivedType Tag");
+  }
+  BTFType.Info = Kind << 24;
+}
+
+/// Used by DW_TAG_pointer_type only.
+BTFTypeDerived::BTFTypeDerived(unsigned NextTypeId, unsigned Tag,
+                               StringRef Name)
+    : DTy(nullptr), NeedsFixup(false), Name(Name) {
+  Kind = BTF::BTF_KIND_PTR;
+  BTFType.Info = Kind << 24;
+  BTFType.Type = NextTypeId;
+}
+
+void BTFTypeDerived::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(Name);
+
+  if (NeedsFixup || !DTy)
+    return;
+
+  // The base type for PTR/CONST/VOLATILE could be void.
+  const DIType *ResolvedType = DTy->getBaseType();
+  if (!ResolvedType) {
+    assert((Kind == BTF::BTF_KIND_PTR || Kind == BTF::BTF_KIND_CONST ||
+            Kind == BTF::BTF_KIND_VOLATILE) &&
+           "Invalid null basetype");
+    BTFType.Type = 0;
+  } else {
+    BTFType.Type = BDebug.getTypeId(ResolvedType);
+  }
+}
+
+void BTFTypeDerived::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS); }
+
+void BTFTypeDerived::setPointeeType(uint32_t PointeeType) {
+  BTFType.Type = PointeeType;
+}
+
+/// Represent a struct/union forward declaration.
+BTFTypeFwd::BTFTypeFwd(StringRef Name, bool IsUnion) : Name(Name) {
+  Kind = BTF::BTF_KIND_FWD;
+  BTFType.Info = IsUnion << 31 | Kind << 24;
+  BTFType.Type = 0;
+}
+
+void BTFTypeFwd::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(Name);
+}
+
+void BTFTypeFwd::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS); }
+
+BTFTypeInt::BTFTypeInt(uint32_t Encoding, uint32_t SizeInBits,
+                       uint32_t OffsetInBits, StringRef TypeName)
+    : Name(TypeName) {
+  // Translate IR int encoding to BTF int encoding.
+  uint8_t BTFEncoding;
+  switch (Encoding) {
+  case dwarf::DW_ATE_boolean:
+    BTFEncoding = BTF::INT_BOOL;
+    break;
+  case dwarf::DW_ATE_signed:
+  case dwarf::DW_ATE_signed_char:
+    BTFEncoding = BTF::INT_SIGNED;
+    break;
+  case dwarf::DW_ATE_unsigned:
+  case dwarf::DW_ATE_unsigned_char:
+    BTFEncoding = 0;
+    break;
+  default:
+    llvm_unreachable("Unknown BTFTypeInt Encoding");
+  }
+
+  Kind = BTF::BTF_KIND_INT;
+  BTFType.Info = Kind << 24;
+  BTFType.Size = roundupToBytes(SizeInBits);
+  IntVal = (BTFEncoding << 24) | OffsetInBits << 16 | SizeInBits;
+}
+
+void BTFTypeInt::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(Name);
+}
+
+void BTFTypeInt::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  OS.AddComment("0x" + Twine::utohexstr(IntVal));
+  OS.emitInt32(IntVal);
+}
+
+BTFTypeEnum::BTFTypeEnum(const DICompositeType *ETy, uint32_t VLen) : ETy(ETy) {
+  Kind = BTF::BTF_KIND_ENUM;
+  BTFType.Info = Kind << 24 | VLen;
+  BTFType.Size = roundupToBytes(ETy->getSizeInBits());
+}
+
+void BTFTypeEnum::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(ETy->getName());
+
+  DINodeArray Elements = ETy->getElements();
+  for (const auto Element : Elements) {
+    const auto *Enum = cast<DIEnumerator>(Element);
+
+    struct BTF::BTFEnum BTFEnum;
+    BTFEnum.NameOff = BDebug.addString(Enum->getName());
+    // BTF enum value is 32bit, enforce it.
+    uint32_t Value;
+    if (Enum->isUnsigned())
+      Value = static_cast<uint32_t>(Enum->getValue().getZExtValue());
+    else
+      Value = static_cast<uint32_t>(Enum->getValue().getSExtValue());
+    BTFEnum.Val = Value;
+    EnumValues.push_back(BTFEnum);
+  }
+}
+
+void BTFTypeEnum::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  for (const auto &Enum : EnumValues) {
+    OS.emitInt32(Enum.NameOff);
+    OS.emitInt32(Enum.Val);
+  }
+}
+
+BTFTypeArray::BTFTypeArray(uint32_t ElemTypeId, uint32_t NumElems) {
+  Kind = BTF::BTF_KIND_ARRAY;
+  BTFType.NameOff = 0;
+  BTFType.Info = Kind << 24;
+  BTFType.Size = 0;
+
+  ArrayInfo.ElemType = ElemTypeId;
+  ArrayInfo.Nelems = NumElems;
+}
+
+/// Represent a BTF array.
+void BTFTypeArray::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  // The IR does not really have a type for the index.
+  // A special type for array index should have been
+  // created during initial type traversal. Just
+  // retrieve that type id.
+  ArrayInfo.IndexType = BDebug.getArrayIndexTypeId();
+}
+
+void BTFTypeArray::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  OS.emitInt32(ArrayInfo.ElemType);
+  OS.emitInt32(ArrayInfo.IndexType);
+  OS.emitInt32(ArrayInfo.Nelems);
+}
+
+/// Represent either a struct or a union.
+BTFTypeStruct::BTFTypeStruct(const DICompositeType *STy, bool IsStruct,
+                             bool HasBitField, uint32_t Vlen)
+    : STy(STy), HasBitField(HasBitField) {
+  Kind = IsStruct ? BTF::BTF_KIND_STRUCT : BTF::BTF_KIND_UNION;
+  BTFType.Size = roundupToBytes(STy->getSizeInBits());
+  BTFType.Info = (HasBitField << 31) | (Kind << 24) | Vlen;
+}
+
+void BTFTypeStruct::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(STy->getName());
+
+  // Add struct/union members.
+  const DINodeArray Elements = STy->getElements();
+  for (const auto *Element : Elements) {
+    struct BTF::BTFMember BTFMember;
+    const auto *DDTy = cast<DIDerivedType>(Element);
+
+    BTFMember.NameOff = BDebug.addString(DDTy->getName());
+    if (HasBitField) {
+      uint8_t BitFieldSize = DDTy->isBitField() ? DDTy->getSizeInBits() : 0;
+      BTFMember.Offset = BitFieldSize << 24 | DDTy->getOffsetInBits();
+    } else {
+      BTFMember.Offset = DDTy->getOffsetInBits();
+    }
+    const auto *BaseTy = DDTy->getBaseType();
+    BTFMember.Type = BDebug.getTypeId(BaseTy);
+    Members.push_back(BTFMember);
+  }
+}
+
+void BTFTypeStruct::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  for (const auto &Member : Members) {
+    OS.emitInt32(Member.NameOff);
+    OS.emitInt32(Member.Type);
+    OS.AddComment("0x" + Twine::utohexstr(Member.Offset));
+    OS.emitInt32(Member.Offset);
+  }
+}
+
+std::string BTFTypeStruct::getName() { return std::string(STy->getName()); }
+
+/// The Func kind represents both subprogram and pointee of function
+/// pointers. If the FuncName is empty, it represents a pointee of function
+/// pointer. Otherwise, it represents a subprogram. The func arg names
+/// are empty for pointee of function pointer case, and are valid names
+/// for subprogram.
+BTFTypeFuncProto::BTFTypeFuncProto(
+    const DISubroutineType *STy, uint32_t VLen,
+    const std::unordered_map<uint32_t, StringRef> &FuncArgNames)
+    : STy(STy), FuncArgNames(FuncArgNames) {
+  Kind = BTF::BTF_KIND_FUNC_PROTO;
+  BTFType.Info = (Kind << 24) | VLen;
+}
+
+void BTFTypeFuncProto::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  DITypeRefArray Elements = STy->getTypeArray();
+  auto RetType = Elements[0];
+  BTFType.Type = RetType ? BDebug.getTypeId(RetType) : 0;
+  BTFType.NameOff = 0;
+
+  // For null parameter which is typically the last one
+  // to represent the vararg, encode the NameOff/Type to be 0.
+  for (unsigned I = 1, N = Elements.size(); I < N; ++I) {
+    struct BTF::BTFParam Param;
+    auto Element = Elements[I];
+    if (Element) {
+      Param.NameOff = BDebug.addString(FuncArgNames[I]);
+      Param.Type = BDebug.getTypeId(Element);
+    } else {
+      Param.NameOff = 0;
+      Param.Type = 0;
+    }
+    Parameters.push_back(Param);
+  }
+}
+
+void BTFTypeFuncProto::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  for (const auto &Param : Parameters) {
+    OS.emitInt32(Param.NameOff);
+    OS.emitInt32(Param.Type);
+  }
+}
+
+BTFTypeFunc::BTFTypeFunc(StringRef FuncName, uint32_t ProtoTypeId,
+    uint32_t Scope)
+    : Name(FuncName) {
+  Kind = BTF::BTF_KIND_FUNC;
+  BTFType.Info = (Kind << 24) | Scope;
+  BTFType.Type = ProtoTypeId;
+}
+
+void BTFTypeFunc::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(Name);
+}
+
+void BTFTypeFunc::emitType(MCStreamer &OS) { BTFTypeBase::emitType(OS); }
+
+BTFKindVar::BTFKindVar(StringRef VarName, uint32_t TypeId, uint32_t VarInfo)
+    : Name(VarName) {
+  Kind = BTF::BTF_KIND_VAR;
+  BTFType.Info = Kind << 24;
+  BTFType.Type = TypeId;
+  Info = VarInfo;
+}
+
+void BTFKindVar::completeType(BTFDebug &BDebug) {
+  BTFType.NameOff = BDebug.addString(Name);
+}
+
+void BTFKindVar::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  OS.emitInt32(Info);
+}
+
+BTFKindDataSec::BTFKindDataSec(AsmPrinter *AsmPrt, std::string SecName)
+    : Asm(AsmPrt), Name(SecName) {
+  Kind = BTF::BTF_KIND_DATASEC;
+  BTFType.Info = Kind << 24;
+  BTFType.Size = 0;
+}
+
+void BTFKindDataSec::completeType(BTFDebug &BDebug) {
+  BTFType.NameOff = BDebug.addString(Name);
+  BTFType.Info |= Vars.size();
+}
+
+void BTFKindDataSec::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+
+  for (const auto &V : Vars) {
+    OS.emitInt32(std::get<0>(V));
+    Asm->emitLabelReference(std::get<1>(V), 4);
+    OS.emitInt32(std::get<2>(V));
+  }
+}
+
+BTFTypeFloat::BTFTypeFloat(uint32_t SizeInBits, StringRef TypeName)
+    : Name(TypeName) {
+  Kind = BTF::BTF_KIND_FLOAT;
+  BTFType.Info = Kind << 24;
+  BTFType.Size = roundupToBytes(SizeInBits);
+}
+
+void BTFTypeFloat::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(Name);
+}
+
+BTFTypeDeclTag::BTFTypeDeclTag(uint32_t BaseTypeId, int ComponentIdx,
+                               StringRef Tag)
+    : Tag(Tag) {
+  Kind = BTF::BTF_KIND_DECL_TAG;
+  BTFType.Info = Kind << 24;
+  BTFType.Type = BaseTypeId;
+  Info = ComponentIdx;
+}
+
+void BTFTypeDeclTag::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(Tag);
+}
+
+void BTFTypeDeclTag::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  OS.emitInt32(Info);
+}
+
+BTFTypeTypeTag::BTFTypeTypeTag(uint32_t NextTypeId, StringRef Tag)
+    : DTy(nullptr), Tag(Tag) {
+  Kind = BTF::BTF_KIND_TYPE_TAG;
+  BTFType.Info = Kind << 24;
+  BTFType.Type = NextTypeId;
+}
+
+BTFTypeTypeTag::BTFTypeTypeTag(const DIDerivedType *DTy, StringRef Tag)
+    : DTy(DTy), Tag(Tag) {
+  Kind = BTF::BTF_KIND_TYPE_TAG;
+  BTFType.Info = Kind << 24;
+}
+
+void BTFTypeTypeTag::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+  BTFType.NameOff = BDebug.addString(Tag);
+  if (DTy) {
+    const DIType *ResolvedType = DTy->getBaseType();
+    if (!ResolvedType)
+      BTFType.Type = 0;
+    else
+      BTFType.Type = BDebug.getTypeId(ResolvedType);
+  }
+}
+
+uint32_t BTFStringTable::addString(StringRef S) {
+  // Check whether the string already exists.
+  for (auto &OffsetM : OffsetToIdMap) {
+    if (Table[OffsetM.second] == S)
+      return OffsetM.first;
+  }
+  // Not find, add to the string table.
+  uint32_t Offset = Size;
+  OffsetToIdMap[Offset] = Table.size();
+  Table.push_back(std::string(S));
+  Size += S.size() + 1;
+  return Offset;
+}
+
+BTFDebug::BTFDebug(AsmPrinter *AP)
+    : DebugHandlerBase(AP), OS(*Asm->OutStreamer), SkipInstruction(false),
+      LineInfoGenerated(false), SecNameOff(0), ArrayIndexTypeId(0),
+      MapDefNotCollected(true) {
+  addString("\0");
+}
+
+uint32_t BTFDebug::addType(std::unique_ptr<BTFTypeBase> TypeEntry,
+                           const DIType *Ty) {
+  TypeEntry->setId(TypeEntries.size() + 1);
+  uint32_t Id = TypeEntry->getId();
+  DIToIdMap[Ty] = Id;
+  TypeEntries.push_back(std::move(TypeEntry));
+  return Id;
+}
+
+uint32_t BTFDebug::addType(std::unique_ptr<BTFTypeBase> TypeEntry) {
+  TypeEntry->setId(TypeEntries.size() + 1);
+  uint32_t Id = TypeEntry->getId();
+  TypeEntries.push_back(std::move(TypeEntry));
+  return Id;
+}
+
+void BTFDebug::visitBasicType(const DIBasicType *BTy, uint32_t &TypeId) {
+  // Only int and binary floating point types are supported in BTF.
+  uint32_t Encoding = BTy->getEncoding();
+  std::unique_ptr<BTFTypeBase> TypeEntry;
+  switch (Encoding) {
+  case dwarf::DW_ATE_boolean:
+  case dwarf::DW_ATE_signed:
+  case dwarf::DW_ATE_signed_char:
+  case dwarf::DW_ATE_unsigned:
+  case dwarf::DW_ATE_unsigned_char:
+    // Create a BTF type instance for this DIBasicType and put it into
+    // DIToIdMap for cross-type reference check.
+    TypeEntry = std::make_unique<BTFTypeInt>(
+        Encoding, BTy->getSizeInBits(), BTy->getOffsetInBits(), BTy->getName());
+    break;
+  case dwarf::DW_ATE_float:
+    TypeEntry =
+        std::make_unique<BTFTypeFloat>(BTy->getSizeInBits(), BTy->getName());
+    break;
+  default:
+    return;
+  }
+
+  TypeId = addType(std::move(TypeEntry), BTy);
+}
+
+/// Handle subprogram or subroutine types.
+void BTFDebug::visitSubroutineType(
+    const DISubroutineType *STy, bool ForSubprog,
+    const std::unordered_map<uint32_t, StringRef> &FuncArgNames,
+    uint32_t &TypeId) {
+  DITypeRefArray Elements = STy->getTypeArray();
+  uint32_t VLen = Elements.size() - 1;
+  if (VLen > BTF::MAX_VLEN)
+    return;
+
+  // Subprogram has a valid non-zero-length name, and the pointee of
+  // a function pointer has an empty name. The subprogram type will
+  // not be added to DIToIdMap as it should not be referenced by
+  // any other types.
+  auto TypeEntry = std::make_unique<BTFTypeFuncProto>(STy, VLen, FuncArgNames);
+  if (ForSubprog)
+    TypeId = addType(std::move(TypeEntry)); // For subprogram
+  else
+    TypeId = addType(std::move(TypeEntry), STy); // For func ptr
+
+  // Visit return type and func arg types.
+  for (const auto Element : Elements) {
+    visitTypeEntry(Element);
+  }
+}
+
+void BTFDebug::processDeclAnnotations(DINodeArray Annotations,
+                                      uint32_t BaseTypeId,
+                                      int ComponentIdx) {
+  if (!Annotations)
+     return;
+
+  for (const Metadata *Annotation : Annotations->operands()) {
+    const MDNode *MD = cast<MDNode>(Annotation);
+    const MDString *Name = cast<MDString>(MD->getOperand(0));
+    if (!Name->getString().equals("btf_decl_tag"))
+      continue;
+
+    const MDString *Value = cast<MDString>(MD->getOperand(1));
+    auto TypeEntry = std::make_unique<BTFTypeDeclTag>(BaseTypeId, ComponentIdx,
+                                                      Value->getString());
+    addType(std::move(TypeEntry));
+  }
+}
+
+/// Handle structure/union types.
+void BTFDebug::visitStructType(const DICompositeType *CTy, bool IsStruct,
+                               uint32_t &TypeId) {
+  const DINodeArray Elements = CTy->getElements();
+  uint32_t VLen = Elements.size();
+  if (VLen > BTF::MAX_VLEN)
+    return;
+
+  // Check whether we have any bitfield members or not
+  bool HasBitField = false;
+  for (const auto *Element : Elements) {
+    auto E = cast<DIDerivedType>(Element);
+    if (E->isBitField()) {
+      HasBitField = true;
+      break;
+    }
+  }
+
+  auto TypeEntry =
+      std::make_unique<BTFTypeStruct>(CTy, IsStruct, HasBitField, VLen);
+  StructTypes.push_back(TypeEntry.get());
+  TypeId = addType(std::move(TypeEntry), CTy);
+
+  // Check struct/union annotations
+  processDeclAnnotations(CTy->getAnnotations(), TypeId, -1);
+
+  // Visit all struct members.
+  int FieldNo = 0;
+  for (const auto *Element : Elements) {
+    const auto Elem = cast<DIDerivedType>(Element);
+    visitTypeEntry(Elem);
+    processDeclAnnotations(Elem->getAnnotations(), TypeId, FieldNo);
+    FieldNo++;
+  }
+}
+
+void BTFDebug::visitArrayType(const DICompositeType *CTy, uint32_t &TypeId) {
+  // Visit array element type.
+  uint32_t ElemTypeId;
+  const DIType *ElemType = CTy->getBaseType();
+  visitTypeEntry(ElemType, ElemTypeId, false, false);
+
+  // Visit array dimensions.
+  DINodeArray Elements = CTy->getElements();
+  for (int I = Elements.size() - 1; I >= 0; --I) {
+    if (auto *Element = dyn_cast_or_null<DINode>(Elements[I]))
+      if (Element->getTag() == dwarf::DW_TAG_subrange_type) {
+        const DISubrange *SR = cast<DISubrange>(Element);
+        auto *CI = SR->getCount().dyn_cast<ConstantInt *>();
+        int64_t Count = CI->getSExtValue();
+
+        // For struct s { int b; char c[]; }, the c[] will be represented
+        // as an array with Count = -1.
+        auto TypeEntry =
+            std::make_unique<BTFTypeArray>(ElemTypeId,
+                Count >= 0 ? Count : 0);
+        if (I == 0)
+          ElemTypeId = addType(std::move(TypeEntry), CTy);
+        else
+          ElemTypeId = addType(std::move(TypeEntry));
+      }
+  }
+
+  // The array TypeId is the type id of the outermost dimension.
+  TypeId = ElemTypeId;
+
+  // The IR does not have a type for array index while BTF wants one.
+  // So create an array index type if there is none.
+  if (!ArrayIndexTypeId) {
+    auto TypeEntry = std::make_unique<BTFTypeInt>(dwarf::DW_ATE_unsigned, 32,
+                                                   0, "__ARRAY_SIZE_TYPE__");
+    ArrayIndexTypeId = addType(std::move(TypeEntry));
+  }
+}
+
+void BTFDebug::visitEnumType(const DICompositeType *CTy, uint32_t &TypeId) {
+  DINodeArray Elements = CTy->getElements();
+  uint32_t VLen = Elements.size();
+  if (VLen > BTF::MAX_VLEN)
+    return;
+
+  auto TypeEntry = std::make_unique<BTFTypeEnum>(CTy, VLen);
+  TypeId = addType(std::move(TypeEntry), CTy);
+  // No need to visit base type as BTF does not encode it.
+}
+
+/// Handle structure/union forward declarations.
+void BTFDebug::visitFwdDeclType(const DICompositeType *CTy, bool IsUnion,
+                                uint32_t &TypeId) {
+  auto TypeEntry = std::make_unique<BTFTypeFwd>(CTy->getName(), IsUnion);
+  TypeId = addType(std::move(TypeEntry), CTy);
+}
+
+/// Handle structure, union, array and enumeration types.
+void BTFDebug::visitCompositeType(const DICompositeType *CTy,
+                                  uint32_t &TypeId) {
+  auto Tag = CTy->getTag();
+  if (Tag == dwarf::DW_TAG_structure_type || Tag == dwarf::DW_TAG_union_type) {
+    // Handle forward declaration differently as it does not have members.
+    if (CTy->isForwardDecl())
+      visitFwdDeclType(CTy, Tag == dwarf::DW_TAG_union_type, TypeId);
+    else
+      visitStructType(CTy, Tag == dwarf::DW_TAG_structure_type, TypeId);
+  } else if (Tag == dwarf::DW_TAG_array_type)
+    visitArrayType(CTy, TypeId);
+  else if (Tag == dwarf::DW_TAG_enumeration_type)
+    visitEnumType(CTy, TypeId);
+}
+
+/// Handle pointer, typedef, const, volatile, restrict and member types.
+void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
+                                bool CheckPointer, bool SeenPointer) {
+  unsigned Tag = DTy->getTag();
+
+  /// Try to avoid chasing pointees, esp. structure pointees which may
+  /// unnecessary bring in a lot of types.
+  if (CheckPointer && !SeenPointer) {
+    SeenPointer = Tag == dwarf::DW_TAG_pointer_type;
+  }
+
+  if (CheckPointer && SeenPointer) {
+    const DIType *Base = DTy->getBaseType();
+    if (Base) {
+      if (const auto *CTy = dyn_cast<DICompositeType>(Base)) {
+        auto CTag = CTy->getTag();
+        if ((CTag == dwarf::DW_TAG_structure_type ||
+             CTag == dwarf::DW_TAG_union_type) &&
+            !CTy->getName().empty() && !CTy->isForwardDecl()) {
+          /// Find a candidate, generate a fixup. Later on the struct/union
+          /// pointee type will be replaced with either a real type or
+          /// a forward declaration.
+          auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, true);
+          auto &Fixup = FixupDerivedTypes[CTy->getName()];
+          Fixup.first = CTag == dwarf::DW_TAG_union_type;
+          Fixup.second.push_back(TypeEntry.get());
+          TypeId = addType(std::move(TypeEntry), DTy);
+          return;
+        }
+      }
+    }
+  }
+
+  if (Tag == dwarf::DW_TAG_pointer_type) {
+    SmallVector<const MDString *, 4> MDStrs;
+    DINodeArray Annots = DTy->getAnnotations();
+    if (Annots) {
+      // For type with "int __tag1 __tag2 *p", the MDStrs will have
+      // content: [__tag1, __tag2].
+      for (const Metadata *Annotations : Annots->operands()) {
+        const MDNode *MD = cast<MDNode>(Annotations);
+        const MDString *Name = cast<MDString>(MD->getOperand(0));
+        if (!Name->getString().equals("btf_type_tag"))
+          continue;
+        MDStrs.push_back(cast<MDString>(MD->getOperand(1)));
+      }
+    }
+
+    if (MDStrs.size() > 0) {
+      // With MDStrs [__tag1, __tag2], the output type chain looks like
+      //   PTR -> __tag2 -> __tag1 -> BaseType
+      // In the below, we construct BTF types with the order of __tag1, __tag2
+      // and PTR.
+      auto TypeEntry =
+          std::make_unique<BTFTypeTypeTag>(DTy, MDStrs[0]->getString());
+      unsigned TmpTypeId = addType(std::move(TypeEntry));
+      for (unsigned I = 1; I < MDStrs.size(); I++) {
+        const MDString *Value = MDStrs[I];
+        TypeEntry =
+            std::make_unique<BTFTypeTypeTag>(TmpTypeId, Value->getString());
+        TmpTypeId = addType(std::move(TypeEntry));
+      }
+      auto TypeDEntry =
+          std::make_unique<BTFTypeDerived>(TmpTypeId, Tag, DTy->getName());
+      TypeId = addType(std::move(TypeDEntry), DTy);
+    } else {
+      auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, false);
+      TypeId = addType(std::move(TypeEntry), DTy);
+    }
+  } else if (Tag == dwarf::DW_TAG_typedef || Tag == dwarf::DW_TAG_const_type ||
+             Tag == dwarf::DW_TAG_volatile_type ||
+             Tag == dwarf::DW_TAG_restrict_type) {
+    auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, false);
+    TypeId = addType(std::move(TypeEntry), DTy);
+    if (Tag == dwarf::DW_TAG_typedef)
+      processDeclAnnotations(DTy->getAnnotations(), TypeId, -1);
+  } else if (Tag != dwarf::DW_TAG_member) {
+    return;
+  }
+
+  // Visit base type of pointer, typedef, const, volatile, restrict or
+  // struct/union member.
+  uint32_t TempTypeId = 0;
+  if (Tag == dwarf::DW_TAG_member)
+    visitTypeEntry(DTy->getBaseType(), TempTypeId, true, false);
+  else
+    visitTypeEntry(DTy->getBaseType(), TempTypeId, CheckPointer, SeenPointer);
+}
+
+void BTFDebug::visitTypeEntry(const DIType *Ty, uint32_t &TypeId,
+                              bool CheckPointer, bool SeenPointer) {
+  if (!Ty || DIToIdMap.find(Ty) != DIToIdMap.end()) {
+    TypeId = DIToIdMap[Ty];
+
+    // To handle the case like the following:
+    //    struct t;
+    //    typedef struct t _t;
+    //    struct s1 { _t *c; };
+    //    int test1(struct s1 *arg) { ... }
+    //
+    //    struct t { int a; int b; };
+    //    struct s2 { _t c; }
+    //    int test2(struct s2 *arg) { ... }
+    //
+    // During traversing test1() argument, "_t" is recorded
+    // in DIToIdMap and a forward declaration fixup is created
+    // for "struct t" to avoid pointee type traversal.
+    //
+    // During traversing test2() argument, even if we see "_t" is
+    // already defined, we should keep moving to eventually
+    // bring in types for "struct t". Otherwise, the "struct s2"
+    // definition won't be correct.
+    if (Ty && (!CheckPointer || !SeenPointer)) {
+      if (const auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
+        unsigned Tag = DTy->getTag();
+        if (Tag == dwarf::DW_TAG_typedef || Tag == dwarf::DW_TAG_const_type ||
+            Tag == dwarf::DW_TAG_volatile_type ||
+            Tag == dwarf::DW_TAG_restrict_type) {
+          uint32_t TmpTypeId;
+          visitTypeEntry(DTy->getBaseType(), TmpTypeId, CheckPointer,
+                         SeenPointer);
+        }
+      }
+    }
+
+    return;
+  }
+
+  if (const auto *BTy = dyn_cast<DIBasicType>(Ty))
+    visitBasicType(BTy, TypeId);
+  else if (const auto *STy = dyn_cast<DISubroutineType>(Ty))
+    visitSubroutineType(STy, false, std::unordered_map<uint32_t, StringRef>(),
+                        TypeId);
+  else if (const auto *CTy = dyn_cast<DICompositeType>(Ty))
+    visitCompositeType(CTy, TypeId);
+  else if (const auto *DTy = dyn_cast<DIDerivedType>(Ty))
+    visitDerivedType(DTy, TypeId, CheckPointer, SeenPointer);
+  else
+    llvm_unreachable("Unknown DIType");
+}
+
+void BTFDebug::visitTypeEntry(const DIType *Ty) {
+  uint32_t TypeId;
+  visitTypeEntry(Ty, TypeId, false, false);
+}
+
+void BTFDebug::visitMapDefType(const DIType *Ty, uint32_t &TypeId) {
+  if (!Ty || DIToIdMap.find(Ty) != DIToIdMap.end()) {
+    TypeId = DIToIdMap[Ty];
+    return;
+  }
+
+  // MapDef type may be a struct type or a non-pointer derived type
+  const DIType *OrigTy = Ty;
+  while (auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
+    auto Tag = DTy->getTag();
+    if (Tag != dwarf::DW_TAG_typedef && Tag != dwarf::DW_TAG_const_type &&
+        Tag != dwarf::DW_TAG_volatile_type &&
+        Tag != dwarf::DW_TAG_restrict_type)
+      break;
+    Ty = DTy->getBaseType();
+  }
+
+  const auto *CTy = dyn_cast<DICompositeType>(Ty);
+  if (!CTy)
+    return;
+
+  auto Tag = CTy->getTag();
+  if (Tag != dwarf::DW_TAG_structure_type || CTy->isForwardDecl())
+    return;
+
+  // Visit all struct members to ensure pointee type is visited
+  const DINodeArray Elements = CTy->getElements();
+  for (const auto *Element : Elements) {
+    const auto *MemberType = cast<DIDerivedType>(Element);
+    visitTypeEntry(MemberType->getBaseType());
+  }
+
+  // Visit this type, struct or a const/typedef/volatile/restrict type
+  visitTypeEntry(OrigTy, TypeId, false, false);
+}
+
+/// Read file contents from the actual file or from the source
+std::string BTFDebug::populateFileContent(const DISubprogram *SP) {
+  auto File = SP->getFile();
+  std::string FileName;
+
+  if (!File->getFilename().startswith("/") && File->getDirectory().size())
+    FileName = File->getDirectory().str() + "/" + File->getFilename().str();
+  else
+    FileName = std::string(File->getFilename());
+
+  // No need to populate the contends if it has been populated!
+  if (FileContent.find(FileName) != FileContent.end())
+    return FileName;
+
+  std::vector<std::string> Content;
+  std::string Line;
+  Content.push_back(Line); // Line 0 for empty string
+
+  std::unique_ptr<MemoryBuffer> Buf;
+  auto Source = File->getSource();
+  if (Source)
+    Buf = MemoryBuffer::getMemBufferCopy(*Source);
+  else if (ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
+               MemoryBuffer::getFile(FileName))
+    Buf = std::move(*BufOrErr);
+  if (Buf)
+    for (line_iterator I(*Buf, false), E; I != E; ++I)
+      Content.push_back(std::string(*I));
+
+  FileContent[FileName] = Content;
+  return FileName;
+}
+
+void BTFDebug::constructLineInfo(const DISubprogram *SP, MCSymbol *Label,
+                                 uint32_t Line, uint32_t Column) {
+  std::string FileName = populateFileContent(SP);
+  BTFLineInfo LineInfo;
+
+  LineInfo.Label = Label;
+  LineInfo.FileNameOff = addString(FileName);
+  // If file content is not available, let LineOff = 0.
+  if (Line < FileContent[FileName].size())
+    LineInfo.LineOff = addString(FileContent[FileName][Line]);
+  else
+    LineInfo.LineOff = 0;
+  LineInfo.LineNum = Line;
+  LineInfo.ColumnNum = Column;
+  LineInfoTable[SecNameOff].push_back(LineInfo);
+}
+
+void BTFDebug::emitCommonHeader() {
+  OS.AddComment("0x" + Twine::utohexstr(BTF::MAGIC));
+  OS.emitIntValue(BTF::MAGIC, 2);
+  OS.emitInt8(BTF::VERSION);
+  OS.emitInt8(0);
+}
+
+void BTFDebug::emitBTFSection() {
+  // Do not emit section if no types and only "" string.
+  if (!TypeEntries.size() && StringTable.getSize() == 1)
+    return;
+
+  MCContext &Ctx = OS.getContext();
+  MCSectionELF *Sec = Ctx.getELFSection(".BTF", ELF::SHT_PROGBITS, 0);
+  Sec->setAlignment(Align(4));
+  OS.SwitchSection(Sec);
+
+  // Emit header.
+  emitCommonHeader();
+  OS.emitInt32(BTF::HeaderSize);
+
+  uint32_t TypeLen = 0, StrLen;
+  for (const auto &TypeEntry : TypeEntries)
+    TypeLen += TypeEntry->getSize();
+  StrLen = StringTable.getSize();
+
+  OS.emitInt32(0);
+  OS.emitInt32(TypeLen);
+  OS.emitInt32(TypeLen);
+  OS.emitInt32(StrLen);
+
+  // Emit type table.
+  for (const auto &TypeEntry : TypeEntries)
+    TypeEntry->emitType(OS);
+
+  // Emit string table.
+  uint32_t StringOffset = 0;
+  for (const auto &S : StringTable.getTable()) {
+    OS.AddComment("string offset=" + std::to_string(StringOffset));
+    OS.emitBytes(S);
+    OS.emitBytes(StringRef("\0", 1));
+    StringOffset += S.size() + 1;
+  }
+}
+
+void BTFDebug::emitBTFExtSection() {
+  // Do not emit section if empty FuncInfoTable and LineInfoTable
+  // and FieldRelocTable.
+  if (!FuncInfoTable.size() && !LineInfoTable.size() &&
+      !FieldRelocTable.size())
+    return;
+
+  MCContext &Ctx = OS.getContext();
+  MCSectionELF *Sec = Ctx.getELFSection(".BTF.ext", ELF::SHT_PROGBITS, 0);
+  Sec->setAlignment(Align(4));
+  OS.SwitchSection(Sec);
+
+  // Emit header.
+  emitCommonHeader();
+  OS.emitInt32(BTF::ExtHeaderSize);
+
+  // Account for FuncInfo/LineInfo record size as well.
+  uint32_t FuncLen = 4, LineLen = 4;
+  // Do not account for optional FieldReloc.
+  uint32_t FieldRelocLen = 0;
+  for (const auto &FuncSec : FuncInfoTable) {
+    FuncLen += BTF::SecFuncInfoSize;
+    FuncLen += FuncSec.second.size() * BTF::SBFFuncInfoSize;
+  }
+  for (const auto &LineSec : LineInfoTable) {
+    LineLen += BTF::SecLineInfoSize;
+    LineLen += LineSec.second.size() * BTF::SBFLineInfoSize;
+  }
+  for (const auto &FieldRelocSec : FieldRelocTable) {
+    FieldRelocLen += BTF::SecFieldRelocSize;
+    FieldRelocLen += FieldRelocSec.second.size() * BTF::SBFFieldRelocSize;
+  }
+
+  if (FieldRelocLen)
+    FieldRelocLen += 4;
+
+  OS.emitInt32(0);
+  OS.emitInt32(FuncLen);
+  OS.emitInt32(FuncLen);
+  OS.emitInt32(LineLen);
+  OS.emitInt32(FuncLen + LineLen);
+  OS.emitInt32(FieldRelocLen);
+
+  // Emit func_info table.
+  OS.AddComment("FuncInfo");
+  OS.emitInt32(BTF::SBFFuncInfoSize);
+  for (const auto &FuncSec : FuncInfoTable) {
+    OS.AddComment("FuncInfo section string offset=" +
+                  std::to_string(FuncSec.first));
+    OS.emitInt32(FuncSec.first);
+    OS.emitInt32(FuncSec.second.size());
+    for (const auto &FuncInfo : FuncSec.second) {
+      Asm->emitLabelReference(FuncInfo.Label, 4);
+      OS.emitInt32(FuncInfo.TypeId);
+    }
+  }
+
+  // Emit line_info table.
+  OS.AddComment("LineInfo");
+  OS.emitInt32(BTF::SBFLineInfoSize);
+  for (const auto &LineSec : LineInfoTable) {
+    OS.AddComment("LineInfo section string offset=" +
+                  std::to_string(LineSec.first));
+    OS.emitInt32(LineSec.first);
+    OS.emitInt32(LineSec.second.size());
+    for (const auto &LineInfo : LineSec.second) {
+      Asm->emitLabelReference(LineInfo.Label, 4);
+      OS.emitInt32(LineInfo.FileNameOff);
+      OS.emitInt32(LineInfo.LineOff);
+      OS.AddComment("Line " + std::to_string(LineInfo.LineNum) + " Col " +
+                    std::to_string(LineInfo.ColumnNum));
+      OS.emitInt32(LineInfo.LineNum << 10 | LineInfo.ColumnNum);
+    }
+  }
+
+  // Emit field reloc table.
+  if (FieldRelocLen) {
+    OS.AddComment("FieldReloc");
+    OS.emitInt32(BTF::SBFFieldRelocSize);
+    for (const auto &FieldRelocSec : FieldRelocTable) {
+      OS.AddComment("Field reloc section string offset=" +
+                    std::to_string(FieldRelocSec.first));
+      OS.emitInt32(FieldRelocSec.first);
+      OS.emitInt32(FieldRelocSec.second.size());
+      for (const auto &FieldRelocInfo : FieldRelocSec.second) {
+        Asm->emitLabelReference(FieldRelocInfo.Label, 4);
+        OS.emitInt32(FieldRelocInfo.TypeID);
+        OS.emitInt32(FieldRelocInfo.OffsetNameOff);
+        OS.emitInt32(FieldRelocInfo.RelocKind);
+      }
+    }
+  }
+}
+
+void BTFDebug::beginFunctionImpl(const MachineFunction *MF) {
+  auto *SP = MF->getFunction().getSubprogram();
+  auto *Unit = SP->getUnit();
+
+  if (Unit->getEmissionKind() == DICompileUnit::NoDebug) {
+    SkipInstruction = true;
+    return;
+  }
+  SkipInstruction = false;
+
+  // Collect MapDef types. Map definition needs to collect
+  // pointee types. Do it first. Otherwise, for the following
+  // case:
+  //    struct m { ...};
+  //    struct t {
+  //      struct m *key;
+  //    };
+  //    foo(struct t *arg);
+  //
+  //    struct mapdef {
+  //      ...
+  //      struct m *key;
+  //      ...
+  //    } __attribute__((section(".maps"))) hash_map;
+  //
+  // If subroutine foo is traversed first, a type chain
+  // "ptr->struct m(fwd)" will be created and later on
+  // when traversing mapdef, since "ptr->struct m" exists,
+  // the traversal of "struct m" will be omitted.
+  if (MapDefNotCollected) {
+    processGlobals(true);
+    MapDefNotCollected = false;
+  }
+
+  // Collect all types locally referenced in this function.
+  // Use RetainedNodes so we can collect all argument names
+  // even if the argument is not used.
+  std::unordered_map<uint32_t, StringRef> FuncArgNames;
+  for (const DINode *DN : SP->getRetainedNodes()) {
+    if (const auto *DV = dyn_cast<DILocalVariable>(DN)) {
+      // Collect function arguments for subprogram func type.
+      uint32_t Arg = DV->getArg();
+      if (Arg) {
+        visitTypeEntry(DV->getType());
+        FuncArgNames[Arg] = DV->getName();
+      }
+    }
+  }
+
+  // Construct subprogram func proto type.
+  uint32_t ProtoTypeId;
+  visitSubroutineType(SP->getType(), true, FuncArgNames, ProtoTypeId);
+
+  // Construct subprogram func type
+  uint8_t Scope = SP->isLocalToUnit() ? BTF::FUNC_STATIC : BTF::FUNC_GLOBAL;
+  auto FuncTypeEntry =
+      std::make_unique<BTFTypeFunc>(SP->getName(), ProtoTypeId, Scope);
+  uint32_t FuncTypeId = addType(std::move(FuncTypeEntry));
+
+  // Process argument annotations.
+  for (const DINode *DN : SP->getRetainedNodes()) {
+    if (const auto *DV = dyn_cast<DILocalVariable>(DN)) {
+      uint32_t Arg = DV->getArg();
+      if (Arg)
+        processDeclAnnotations(DV->getAnnotations(), FuncTypeId, Arg - 1);
+    }
+  }
+
+  processDeclAnnotations(SP->getAnnotations(), FuncTypeId, -1);
+
+  for (const auto &TypeEntry : TypeEntries)
+    TypeEntry->completeType(*this);
+
+  // Construct funcinfo and the first lineinfo for the function.
+  MCSymbol *FuncLabel = Asm->getFunctionBegin();
+  BTFFuncInfo FuncInfo;
+  FuncInfo.Label = FuncLabel;
+  FuncInfo.TypeId = FuncTypeId;
+  if (FuncLabel->isInSection()) {
+    MCSection &Section = FuncLabel->getSection();
+    const MCSectionELF *SectionELF = dyn_cast<MCSectionELF>(&Section);
+    assert(SectionELF && "Null section for Function Label");
+    SecNameOff = addString(SectionELF->getName());
+  } else {
+    SecNameOff = addString(".text");
+  }
+  FuncInfoTable[SecNameOff].push_back(FuncInfo);
+}
+
+void BTFDebug::endFunctionImpl(const MachineFunction *MF) {
+  SkipInstruction = false;
+  LineInfoGenerated = false;
+  SecNameOff = 0;
+}
+
+/// On-demand populate types as requested from abstract member
+/// accessing or preserve debuginfo type.
+unsigned BTFDebug::populateType(const DIType *Ty) {
+  unsigned Id;
+  visitTypeEntry(Ty, Id, false, false);
+  for (const auto &TypeEntry : TypeEntries)
+    TypeEntry->completeType(*this);
+  return Id;
+}
+
+/// Generate a struct member field relocation.
+void BTFDebug::generatePatchImmReloc(const MCSymbol *ORSym, uint32_t RootId,
+                                     const GlobalVariable *GVar, bool IsAma) {
+  BTFFieldReloc FieldReloc;
+  FieldReloc.Label = ORSym;
+  FieldReloc.TypeID = RootId;
+
+  StringRef AccessPattern = GVar->getName();
+  size_t FirstDollar = AccessPattern.find_first_of('$');
+  if (IsAma) {
+    size_t FirstColon = AccessPattern.find_first_of(':');
+    size_t SecondColon = AccessPattern.find_first_of(':', FirstColon + 1);
+    StringRef IndexPattern = AccessPattern.substr(FirstDollar + 1);
+    StringRef RelocKindStr = AccessPattern.substr(FirstColon + 1,
+        SecondColon - FirstColon);
+    StringRef PatchImmStr = AccessPattern.substr(SecondColon + 1,
+        FirstDollar - SecondColon);
+
+    FieldReloc.OffsetNameOff = addString(IndexPattern);
+    FieldReloc.RelocKind = std::stoull(std::string(RelocKindStr));
+    PatchImms[GVar] = std::make_pair(std::stoll(std::string(PatchImmStr)),
+                                     FieldReloc.RelocKind);
+  } else {
+    StringRef RelocStr = AccessPattern.substr(FirstDollar + 1);
+    FieldReloc.OffsetNameOff = addString("0");
+    FieldReloc.RelocKind = std::stoull(std::string(RelocStr));
+    PatchImms[GVar] = std::make_pair(RootId, FieldReloc.RelocKind);
+  }
+  FieldRelocTable[SecNameOff].push_back(FieldReloc);
+}
+
+void BTFDebug::processGlobalValue(const MachineOperand &MO) {
+  // check whether this is a candidate or not
+  if (MO.isGlobal()) {
+    const GlobalValue *GVal = MO.getGlobal();
+    auto *GVar = dyn_cast<GlobalVariable>(GVal);
+    if (!GVar) {
+      // Not a global variable. Maybe an extern function reference.
+      processFuncPrototypes(dyn_cast<Function>(GVal));
+      return;
+    }
+
+    if (!GVar->hasAttribute(SBFCoreSharedInfo::AmaAttr) &&
+        !GVar->hasAttribute(SBFCoreSharedInfo::TypeIdAttr))
+      return;
+
+    MCSymbol *ORSym = OS.getContext().createTempSymbol();
+    OS.emitLabel(ORSym);
+
+    MDNode *MDN = GVar->getMetadata(LLVMContext::MD_preserve_access_index);
+    uint32_t RootId = populateType(dyn_cast<DIType>(MDN));
+    generatePatchImmReloc(ORSym, RootId, GVar,
+                          GVar->hasAttribute(SBFCoreSharedInfo::AmaAttr));
+  }
+}
+
+void BTFDebug::beginInstruction(const MachineInstr *MI) {
+  DebugHandlerBase::beginInstruction(MI);
+
+  if (SkipInstruction || MI->isMetaInstruction() ||
+      MI->getFlag(MachineInstr::FrameSetup))
+    return;
+
+  if (MI->isInlineAsm()) {
+    // Count the number of register definitions to find the asm string.
+    unsigned NumDefs = 0;
+    for (; MI->getOperand(NumDefs).isReg() && MI->getOperand(NumDefs).isDef();
+         ++NumDefs)
+      ;
+
+    // Skip this inline asm instruction if the asmstr is empty.
+    const char *AsmStr = MI->getOperand(NumDefs).getSymbolName();
+    if (AsmStr[0] == 0)
+      return;
+  }
+
+  if (MI->getOpcode() == SBF::LD_imm64) {
+    // If the insn is "r2 = LD_imm64 @<an AmaAttr global>",
+    // add this insn into the .BTF.ext FieldReloc subsection.
+    // Relocation looks like:
+    //  . SecName:
+    //    . InstOffset
+    //    . TypeID
+    //    . OffSetNameOff
+    //    . RelocType
+    // Later, the insn is replaced with "r2 = <offset>"
+    // where "<offset>" equals to the offset based on current
+    // type definitions.
+    //
+    // If the insn is "r2 = LD_imm64 @<an TypeIdAttr global>",
+    // The LD_imm64 result will be replaced with a btf type id.
+    processGlobalValue(MI->getOperand(1));
+  } else if (MI->getOpcode() == SBF::CORE_MEM ||
+             MI->getOpcode() == SBF::CORE_ALU32_MEM ||
+             MI->getOpcode() == SBF::CORE_SHIFT) {
+    // relocation insn is a load, store or shift insn.
+    processGlobalValue(MI->getOperand(3));
+  } else if (MI->getOpcode() == SBF::JAL) {
+    // check extern function references
+    const MachineOperand &MO = MI->getOperand(0);
+    if (MO.isGlobal()) {
+      processFuncPrototypes(dyn_cast<Function>(MO.getGlobal()));
+    }
+  }
+
+  if (!CurMI) // no debug info
+    return;
+
+  // Skip this instruction if no DebugLoc or the DebugLoc
+  // is the same as the previous instruction.
+  const DebugLoc &DL = MI->getDebugLoc();
+  if (!DL || PrevInstLoc == DL) {
+    // This instruction will be skipped, no LineInfo has
+    // been generated, construct one based on function signature.
+    if (LineInfoGenerated == false) {
+      auto *S = MI->getMF()->getFunction().getSubprogram();
+      if (S) {
+        MCSymbol *FuncLabel = Asm->getFunctionBegin();
+        constructLineInfo(S, FuncLabel, S->getLine(), 0);
+        LineInfoGenerated = true;
+      }
+    }
+    return;
+  }
+
+  // Create a temporary label to remember the insn for lineinfo.
+  MCSymbol *LineSym = OS.getContext().createTempSymbol();
+  OS.emitLabel(LineSym);
+
+  // Construct the lineinfo.
+  auto SP = DL.get()->getScope()->getSubprogram();
+  constructLineInfo(SP, LineSym, DL.getLine(), DL.getCol());
+
+  LineInfoGenerated = true;
+  PrevInstLoc = DL;
+}
+
+void BTFDebug::processGlobals(bool ProcessingMapDef) {
+  // Collect all types referenced by globals.
+  const Module *M = MMI->getModule();
+  for (const GlobalVariable &Global : M->globals()) {
+    // Decide the section name.
+    StringRef SecName;
+    if (Global.hasSection()) {
+      SecName = Global.getSection();
+    } else if (Global.hasInitializer()) {
+      // data, bss, or readonly sections
+      if (Global.isConstant())
+        SecName = ".rodata";
+      else
+        SecName = Global.getInitializer()->isZeroValue() ? ".bss" : ".data";
+    }
+
+    if (ProcessingMapDef != SecName.startswith(".maps"))
+      continue;
+
+    // Create a .rodata datasec if the global variable is an initialized
+    // constant with private linkage and if it won't be in .rodata.str<#>
+    // and .rodata.cst<#> sections.
+    if (SecName == ".rodata" && Global.hasPrivateLinkage() &&
+        DataSecEntries.find(std::string(SecName)) == DataSecEntries.end()) {
+      SectionKind GVKind =
+          TargetLoweringObjectFile::getKindForGlobal(&Global, Asm->TM);
+      // skip .rodata.str<#> and .rodata.cst<#> sections
+      if (!GVKind.isMergeableCString() && !GVKind.isMergeableConst()) {
+        DataSecEntries[std::string(SecName)] =
+            std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
+      }
+    }
+
+    SmallVector<DIGlobalVariableExpression *, 1> GVs;
+    Global.getDebugInfo(GVs);
+
+    // No type information, mostly internal, skip it.
+    if (GVs.size() == 0)
+      continue;
+
+    uint32_t GVTypeId = 0;
+    DIGlobalVariable *DIGlobal = nullptr;
+    for (auto *GVE : GVs) {
+      DIGlobal = GVE->getVariable();
+      if (SecName.startswith(".maps"))
+        visitMapDefType(DIGlobal->getType(), GVTypeId);
+      else
+        visitTypeEntry(DIGlobal->getType(), GVTypeId, false, false);
+      break;
+    }
+
+    // Only support the following globals:
+    //  . static variables
+    //  . non-static weak or non-weak global variables
+    //  . weak or non-weak extern global variables
+    // Whether DataSec is readonly or not can be found from corresponding ELF
+    // section flags. Whether a BTF_KIND_VAR is a weak symbol or not
+    // can be found from the corresponding ELF symbol table.
+    auto Linkage = Global.getLinkage();
+    if (Linkage != GlobalValue::InternalLinkage &&
+        Linkage != GlobalValue::ExternalLinkage &&
+        Linkage != GlobalValue::WeakAnyLinkage &&
+        Linkage != GlobalValue::WeakODRLinkage &&
+        Linkage != GlobalValue::ExternalWeakLinkage)
+      continue;
+
+    uint32_t GVarInfo;
+    if (Linkage == GlobalValue::InternalLinkage) {
+      GVarInfo = BTF::VAR_STATIC;
+    } else if (Global.hasInitializer()) {
+      GVarInfo = BTF::VAR_GLOBAL_ALLOCATED;
+    } else {
+      GVarInfo = BTF::VAR_GLOBAL_EXTERNAL;
+    }
+
+    auto VarEntry =
+        std::make_unique<BTFKindVar>(Global.getName(), GVTypeId, GVarInfo);
+    uint32_t VarId = addType(std::move(VarEntry));
+
+    processDeclAnnotations(DIGlobal->getAnnotations(), VarId, -1);
+
+    // An empty SecName means an extern variable without section attribute.
+    if (SecName.empty())
+      continue;
+
+    // Find or create a DataSec
+    if (DataSecEntries.find(std::string(SecName)) == DataSecEntries.end()) {
+      DataSecEntries[std::string(SecName)] =
+          std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
+    }
+
+    // Calculate symbol size
+    const DataLayout &DL = Global.getParent()->getDataLayout();
+    uint32_t Size = DL.getTypeAllocSize(Global.getValueType());
+
+    DataSecEntries[std::string(SecName)]->addDataSecEntry(VarId,
+        Asm->getSymbol(&Global), Size);
+  }
+}
+
+/// Emit proper patchable instructions.
+bool BTFDebug::InstLower(const MachineInstr *MI, MCInst &OutMI) {
+  if (MI->getOpcode() == SBF::LD_imm64) {
+    const MachineOperand &MO = MI->getOperand(1);
+    if (MO.isGlobal()) {
+      const GlobalValue *GVal = MO.getGlobal();
+      auto *GVar = dyn_cast<GlobalVariable>(GVal);
+      if (GVar) {
+        // Emit "mov ri, <imm>"
+        int64_t Imm;
+        uint32_t Reloc;
+        if (GVar->hasAttribute(SBFCoreSharedInfo::AmaAttr) ||
+            GVar->hasAttribute(SBFCoreSharedInfo::TypeIdAttr)) {
+          Imm = PatchImms[GVar].first;
+          Reloc = PatchImms[GVar].second;
+        } else {
+          return false;
+        }
+
+        if (Reloc == SBFCoreSharedInfo::ENUM_VALUE_EXISTENCE ||
+            Reloc == SBFCoreSharedInfo::ENUM_VALUE ||
+            Reloc == SBFCoreSharedInfo::BTF_TYPE_ID_LOCAL ||
+            Reloc == SBFCoreSharedInfo::BTF_TYPE_ID_REMOTE)
+          OutMI.setOpcode(SBF::LD_imm64);
+        else
+          OutMI.setOpcode(SBF::MOV_ri);
+        OutMI.addOperand(MCOperand::createReg(MI->getOperand(0).getReg()));
+        OutMI.addOperand(MCOperand::createImm(Imm));
+        return true;
+      }
+    }
+  } else if (MI->getOpcode() == SBF::CORE_MEM ||
+             MI->getOpcode() == SBF::CORE_ALU32_MEM ||
+             MI->getOpcode() == SBF::CORE_SHIFT) {
+    const MachineOperand &MO = MI->getOperand(3);
+    if (MO.isGlobal()) {
+      const GlobalValue *GVal = MO.getGlobal();
+      auto *GVar = dyn_cast<GlobalVariable>(GVal);
+      if (GVar && GVar->hasAttribute(SBFCoreSharedInfo::AmaAttr)) {
+        uint32_t Imm = PatchImms[GVar].first;
+        OutMI.setOpcode(MI->getOperand(1).getImm());
+        if (MI->getOperand(0).isImm())
+          OutMI.addOperand(MCOperand::createImm(MI->getOperand(0).getImm()));
+        else
+          OutMI.addOperand(MCOperand::createReg(MI->getOperand(0).getReg()));
+        OutMI.addOperand(MCOperand::createReg(MI->getOperand(2).getReg()));
+        OutMI.addOperand(MCOperand::createImm(Imm));
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+void BTFDebug::processFuncPrototypes(const Function *F) {
+  if (!F)
+    return;
+
+  const DISubprogram *SP = F->getSubprogram();
+  if (!SP || SP->isDefinition())
+    return;
+
+  // Do not emit again if already emitted.
+  if (ProtoFunctions.find(F) != ProtoFunctions.end())
+    return;
+  ProtoFunctions.insert(F);
+
+  uint32_t ProtoTypeId;
+  const std::unordered_map<uint32_t, StringRef> FuncArgNames;
+  visitSubroutineType(SP->getType(), false, FuncArgNames, ProtoTypeId);
+
+  uint8_t Scope = BTF::FUNC_EXTERN;
+  auto FuncTypeEntry =
+      std::make_unique<BTFTypeFunc>(SP->getName(), ProtoTypeId, Scope);
+  uint32_t FuncId = addType(std::move(FuncTypeEntry));
+
+  processDeclAnnotations(SP->getAnnotations(), FuncId, -1);
+
+  if (F->hasSection()) {
+    StringRef SecName = F->getSection();
+
+    if (DataSecEntries.find(std::string(SecName)) == DataSecEntries.end()) {
+      DataSecEntries[std::string(SecName)] =
+          std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
+    }
+
+    // We really don't know func size, set it to 0.
+    DataSecEntries[std::string(SecName)]->addDataSecEntry(FuncId,
+        Asm->getSymbol(F), 0);
+  }
+}
+
+void BTFDebug::endModule() {
+  // Collect MapDef globals if not collected yet.
+  if (MapDefNotCollected) {
+    processGlobals(true);
+    MapDefNotCollected = false;
+  }
+
+  // Collect global types/variables except MapDef globals.
+  processGlobals(false);
+
+  for (auto &DataSec : DataSecEntries)
+    addType(std::move(DataSec.second));
+
+  // Fixups
+  for (auto &Fixup : FixupDerivedTypes) {
+    StringRef TypeName = Fixup.first;
+    bool IsUnion = Fixup.second.first;
+
+    // Search through struct types
+    uint32_t StructTypeId = 0;
+    for (const auto &StructType : StructTypes) {
+      if (StructType->getName() == TypeName) {
+        StructTypeId = StructType->getId();
+        break;
+      }
+    }
+
+    if (StructTypeId == 0) {
+      auto FwdTypeEntry = std::make_unique<BTFTypeFwd>(TypeName, IsUnion);
+      StructTypeId = addType(std::move(FwdTypeEntry));
+    }
+
+    for (auto &DType : Fixup.second.second) {
+      DType->setPointeeType(StructTypeId);
+    }
+  }
+
+  // Complete BTF type cross refereences.
+  for (const auto &TypeEntry : TypeEntries)
+    TypeEntry->completeType(*this);
+
+  // Emit BTF sections.
+  emitBTFSection();
+  emitBTFExtSection();
+}
diff --git a/llvm/lib/Target/SBF/BTFDebug.h b/llvm/lib/Target/SBF/BTFDebug.h
new file mode 100644
index 0000000000000..941e1bbae7f88
--- /dev/null
+++ b/llvm/lib/Target/SBF/BTFDebug.h
@@ -0,0 +1,409 @@
+//===- BTFDebug.h -----------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file contains support for writing BTF debug info.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_BTFDEBUG_H
+#define LLVM_LIB_TARGET_SBF_BTFDEBUG_H
+
+#include "llvm/ADT/StringMap.h"
+#include "llvm/CodeGen/DebugHandlerBase.h"
+#include <cstdint>
+#include <map>
+#include <set>
+#include <unordered_map>
+#include "BTF.h"
+
+namespace llvm {
+
+class AsmPrinter;
+class DIType;
+class GlobalVariable;
+class MachineFunction;
+class MachineInstr;
+class MachineOperand;
+class MCInst;
+class MCStreamer;
+class MCSymbol;
+
+namespace BTFX {
+
+class BTFDebug;
+
+/// The base class for BTF type generation.
+class BTFTypeBase {
+protected:
+  uint8_t Kind;
+  bool IsCompleted;
+  uint32_t Id;
+  struct BTF::CommonType BTFType;
+
+public:
+  BTFTypeBase() : IsCompleted(false) {}
+  virtual ~BTFTypeBase() = default;
+  void setId(uint32_t Id) { this->Id = Id; }
+  uint32_t getId() { return Id; }
+  uint32_t roundupToBytes(uint32_t NumBits) { return (NumBits + 7) >> 3; }
+  /// Get the size of this BTF type entry.
+  virtual uint32_t getSize() { return BTF::CommonTypeSize; }
+  /// Complete BTF type generation after all related DebugInfo types
+  /// have been visited so their BTF type id's are available
+  /// for cross referece.
+  virtual void completeType(BTFDebug &BDebug) {}
+  /// Emit types for this BTF type entry.
+  virtual void emitType(MCStreamer &OS);
+};
+
+/// Handle several derived types include pointer, const,
+/// volatile, typedef and restrict.
+class BTFTypeDerived : public BTFTypeBase {
+  const DIDerivedType *DTy;
+  bool NeedsFixup;
+  StringRef Name;
+
+public:
+  BTFTypeDerived(const DIDerivedType *Ty, unsigned Tag, bool NeedsFixup);
+  BTFTypeDerived(unsigned NextTypeId, unsigned Tag, StringRef Name);
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+  void setPointeeType(uint32_t PointeeType);
+};
+
+/// Handle struct or union forward declaration.
+class BTFTypeFwd : public BTFTypeBase {
+  StringRef Name;
+
+public:
+  BTFTypeFwd(StringRef Name, bool IsUnion);
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle int type.
+class BTFTypeInt : public BTFTypeBase {
+  StringRef Name;
+  uint32_t IntVal; ///< Encoding, offset, bits
+
+public:
+  BTFTypeInt(uint32_t Encoding, uint32_t SizeInBits, uint32_t OffsetInBits,
+             StringRef TypeName);
+  uint32_t getSize() override { return BTFTypeBase::getSize() + sizeof(uint32_t); }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle enumerate type.
+class BTFTypeEnum : public BTFTypeBase {
+  const DICompositeType *ETy;
+  std::vector<struct BTF::BTFEnum> EnumValues;
+
+public:
+  BTFTypeEnum(const DICompositeType *ETy, uint32_t NumValues);
+  uint32_t getSize() override {
+    return BTFTypeBase::getSize() + EnumValues.size() * BTF::BTFEnumSize;
+  }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle array type.
+class BTFTypeArray : public BTFTypeBase {
+  struct BTF::BTFArray ArrayInfo;
+
+public:
+  BTFTypeArray(uint32_t ElemTypeId, uint32_t NumElems);
+  uint32_t getSize() override { return BTFTypeBase::getSize() + BTF::BTFArraySize; }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle struct/union type.
+class BTFTypeStruct : public BTFTypeBase {
+  const DICompositeType *STy;
+  bool HasBitField;
+  std::vector<struct BTF::BTFMember> Members;
+
+public:
+  BTFTypeStruct(const DICompositeType *STy, bool IsStruct, bool HasBitField,
+                uint32_t NumMembers);
+  uint32_t getSize() override {
+    return BTFTypeBase::getSize() + Members.size() * BTF::BTFMemberSize;
+  }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+  std::string getName();
+};
+
+/// Handle function pointer.
+class BTFTypeFuncProto : public BTFTypeBase {
+  const DISubroutineType *STy;
+  std::unordered_map<uint32_t, StringRef> FuncArgNames;
+  std::vector<struct BTF::BTFParam> Parameters;
+
+public:
+  BTFTypeFuncProto(const DISubroutineType *STy, uint32_t NumParams,
+                   const std::unordered_map<uint32_t, StringRef> &FuncArgNames);
+  uint32_t getSize() override {
+    return BTFTypeBase::getSize() + Parameters.size() * BTF::BTFParamSize;
+  }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle subprogram
+class BTFTypeFunc : public BTFTypeBase {
+  StringRef Name;
+
+public:
+  BTFTypeFunc(StringRef FuncName, uint32_t ProtoTypeId, uint32_t Scope);
+  uint32_t getSize() override { return BTFTypeBase::getSize(); }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle variable instances
+class BTFKindVar : public BTFTypeBase {
+  StringRef Name;
+  uint32_t Info;
+
+public:
+  BTFKindVar(StringRef VarName, uint32_t TypeId, uint32_t VarInfo);
+  uint32_t getSize() override { return BTFTypeBase::getSize() + 4; }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle data sections
+class BTFKindDataSec : public BTFTypeBase {
+  AsmPrinter *Asm;
+  std::string Name;
+  std::vector<std::tuple<uint32_t, const MCSymbol *, uint32_t>> Vars;
+
+public:
+  BTFKindDataSec(AsmPrinter *AsmPrt, std::string SecName);
+  uint32_t getSize() override {
+    return BTFTypeBase::getSize() + BTF::BTFDataSecVarSize * Vars.size();
+  }
+  void addDataSecEntry(uint32_t Id, const MCSymbol *Sym, uint32_t Size) {
+    Vars.push_back(std::make_tuple(Id, Sym, Size));
+  }
+  std::string getName() { return Name; }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+/// Handle binary floating point type.
+class BTFTypeFloat : public BTFTypeBase {
+  StringRef Name;
+
+public:
+  BTFTypeFloat(uint32_t SizeInBits, StringRef TypeName);
+  void completeType(BTFDebug &BDebug) override;
+};
+
+/// Handle decl tags.
+class BTFTypeDeclTag : public BTFTypeBase {
+  uint32_t Info;
+  StringRef Tag;
+
+public:
+  BTFTypeDeclTag(uint32_t BaseTypeId, int ComponentId, StringRef Tag);
+  uint32_t getSize() override { return BTFTypeBase::getSize() + 4; }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
+class BTFTypeTypeTag : public BTFTypeBase {
+  const DIDerivedType *DTy;
+  StringRef Tag;
+
+public:
+  BTFTypeTypeTag(uint32_t NextTypeId, StringRef Tag);
+  BTFTypeTypeTag(const DIDerivedType *DTy, StringRef Tag);
+  void completeType(BTFDebug &BDebug) override;
+};
+
+/// String table.
+class BTFStringTable {
+  /// String table size in bytes.
+  uint32_t Size;
+  /// A mapping from string table offset to the index
+  /// of the Table. It is used to avoid putting
+  /// duplicated strings in the table.
+  std::map<uint32_t, uint32_t> OffsetToIdMap;
+  /// A vector of strings to represent the string table.
+  std::vector<std::string> Table;
+
+public:
+  BTFStringTable() : Size(0) {}
+  uint32_t getSize() { return Size; }
+  std::vector<std::string> &getTable() { return Table; }
+  /// Add a string to the string table and returns its offset
+  /// in the table.
+  uint32_t addString(StringRef S);
+};
+
+/// Represent one func and its type id.
+struct BTFFuncInfo {
+  const MCSymbol *Label; ///< Func MCSymbol
+  uint32_t TypeId;       ///< Type id referring to .BTF type section
+};
+
+/// Represent one line info.
+struct BTFLineInfo {
+  MCSymbol *Label;      ///< MCSymbol identifying insn for the lineinfo
+  uint32_t FileNameOff; ///< file name offset in the .BTF string table
+  uint32_t LineOff;     ///< line offset in the .BTF string table
+  uint32_t LineNum;     ///< the line number
+  uint32_t ColumnNum;   ///< the column number
+};
+
+/// Represent one field relocation.
+struct BTFFieldReloc {
+  const MCSymbol *Label;  ///< MCSymbol identifying insn for the reloc
+  uint32_t TypeID;        ///< Type ID
+  uint32_t OffsetNameOff; ///< The string to traverse types
+  uint32_t RelocKind;     ///< What to patch the instruction
+};
+
+/// Collect and emit BTF information.
+class BTFDebug : public DebugHandlerBase {
+  MCStreamer &OS;
+  bool SkipInstruction;
+  bool LineInfoGenerated;
+  uint32_t SecNameOff;
+  uint32_t ArrayIndexTypeId;
+  bool MapDefNotCollected;
+  BTFStringTable StringTable;
+  std::vector<std::unique_ptr<BTFTypeBase>> TypeEntries;
+  std::unordered_map<const DIType *, uint32_t> DIToIdMap;
+  std::map<uint32_t, std::vector<BTFFuncInfo>> FuncInfoTable;
+  std::map<uint32_t, std::vector<BTFLineInfo>> LineInfoTable;
+  std::map<uint32_t, std::vector<BTFFieldReloc>> FieldRelocTable;
+  StringMap<std::vector<std::string>> FileContent;
+  std::map<std::string, std::unique_ptr<BTFKindDataSec>> DataSecEntries;
+  std::vector<BTFTypeStruct *> StructTypes;
+  std::map<const GlobalVariable *, std::pair<int64_t, uint32_t>> PatchImms;
+  std::map<StringRef, std::pair<bool, std::vector<BTFTypeDerived *>>>
+      FixupDerivedTypes;
+  std::set<const Function *>ProtoFunctions;
+
+  /// Add types to TypeEntries.
+  /// @{
+  /// Add types to TypeEntries and DIToIdMap.
+  uint32_t addType(std::unique_ptr<BTFTypeBase> TypeEntry, const DIType *Ty);
+  /// Add types to TypeEntries only and return type id.
+  uint32_t addType(std::unique_ptr<BTFTypeBase> TypeEntry);
+  /// @}
+
+  /// IR type visiting functions.
+  /// @{
+  void visitTypeEntry(const DIType *Ty);
+  void visitTypeEntry(const DIType *Ty, uint32_t &TypeId, bool CheckPointer,
+                      bool SeenPointer);
+  void visitBasicType(const DIBasicType *BTy, uint32_t &TypeId);
+  void visitSubroutineType(
+      const DISubroutineType *STy, bool ForSubprog,
+      const std::unordered_map<uint32_t, StringRef> &FuncArgNames,
+      uint32_t &TypeId);
+  void visitFwdDeclType(const DICompositeType *CTy, bool IsUnion,
+                        uint32_t &TypeId);
+  void visitCompositeType(const DICompositeType *CTy, uint32_t &TypeId);
+  void visitStructType(const DICompositeType *STy, bool IsStruct,
+                       uint32_t &TypeId);
+  void visitArrayType(const DICompositeType *ATy, uint32_t &TypeId);
+  void visitEnumType(const DICompositeType *ETy, uint32_t &TypeId);
+  void visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
+                        bool CheckPointer, bool SeenPointer);
+  void visitMapDefType(const DIType *Ty, uint32_t &TypeId);
+  /// @}
+
+  /// Get the file content for the subprogram. Certain lines of the file
+  /// later may be put into string table and referenced by line info.
+  std::string populateFileContent(const DISubprogram *SP);
+
+  /// Construct a line info.
+  void constructLineInfo(const DISubprogram *SP, MCSymbol *Label, uint32_t Line,
+                         uint32_t Column);
+
+  /// Generate types and variables for globals.
+  void processGlobals(bool ProcessingMapDef);
+
+  /// Generate types for function prototypes.
+  void processFuncPrototypes(const Function *);
+
+  /// Generate types for decl annotations.
+  void processDeclAnnotations(DINodeArray Annotations, uint32_t BaseTypeId,
+                              int ComponentId);
+
+  /// Generate one field relocation record.
+  void generatePatchImmReloc(const MCSymbol *ORSym, uint32_t RootId,
+                             const GlobalVariable *, bool IsAma);
+
+  /// Populating unprocessed type on demand.
+  unsigned populateType(const DIType *Ty);
+
+  /// Process global variables referenced by relocation instructions
+  /// and extern function references.
+  void processGlobalValue(const MachineOperand &MO);
+
+  /// Emit common header of .BTF and .BTF.ext sections.
+  void emitCommonHeader();
+
+  /// Emit the .BTF section.
+  void emitBTFSection();
+
+  /// Emit the .BTF.ext section.
+  void emitBTFExtSection();
+
+protected:
+  /// Gather pre-function debug information.
+  void beginFunctionImpl(const MachineFunction *MF) override;
+
+  /// Post process after all instructions in this function are processed.
+  void endFunctionImpl(const MachineFunction *MF) override;
+
+public:
+  BTFDebug(AsmPrinter *AP);
+
+  ///
+  bool InstLower(const MachineInstr *MI, MCInst &OutMI);
+
+  /// Get the special array index type id.
+  uint32_t getArrayIndexTypeId() {
+    assert(ArrayIndexTypeId);
+    return ArrayIndexTypeId;
+  }
+
+  /// Add string to the string table.
+  size_t addString(StringRef S) { return StringTable.addString(S); }
+
+  /// Get the type id for a particular DIType.
+  uint32_t getTypeId(const DIType *Ty) {
+    assert(Ty && "Invalid null Type");
+    assert(DIToIdMap.find(Ty) != DIToIdMap.end() &&
+           "DIType not added in the BDIToIdMap");
+    return DIToIdMap[Ty];
+  }
+
+  void setSymbolSize(const MCSymbol *Symbol, uint64_t Size) override {}
+
+  /// Process beginning of an instruction.
+  void beginInstruction(const MachineInstr *MI) override;
+
+  /// Complete all the types and emit the BTF sections.
+  void endModule() override;
+};
+
+} // end namespace BTFX 
+} // end namespace llvm
+
+#endif
diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
new file mode 100644
index 0000000000000..cc8a9c7d1c0e9
--- /dev/null
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -0,0 +1,60 @@
+add_llvm_component_group(SBF)
+
+set(LLVM_TARGET_DEFINITIONS SBF.td)
+
+tablegen(LLVM SBFGenAsmMatcher.inc -gen-asm-matcher)
+tablegen(LLVM SBFGenAsmWriter.inc -gen-asm-writer)
+tablegen(LLVM SBFGenCallingConv.inc -gen-callingconv)
+tablegen(LLVM SBFGenDAGISel.inc -gen-dag-isel)
+tablegen(LLVM SBFGenDisassemblerTables.inc -gen-disassembler)
+tablegen(LLVM SBFGenInstrInfo.inc -gen-instr-info)
+tablegen(LLVM SBFGenMCCodeEmitter.inc -gen-emitter)
+tablegen(LLVM SBFGenRegisterInfo.inc -gen-register-info)
+tablegen(LLVM SBFGenSubtargetInfo.inc -gen-subtarget)
+
+add_public_tablegen_target(SBFCommonTableGen)
+
+add_llvm_target(SBFCodeGen
+  SBFAbstractMemberAccess.cpp
+  SBFAdjustOpt.cpp
+  SBFAsmPrinter.cpp
+  SBFCheckAndAdjustIR.cpp
+  SBFFrameLowering.cpp
+  SBFInstrInfo.cpp
+  SBFIRPeephole.cpp
+  SBFISelDAGToDAG.cpp
+  SBFISelLowering.cpp
+  SBFMCInstLower.cpp
+  SBFPreserveDIType.cpp
+  SBFRegisterInfo.cpp
+  SBFSelectionDAGInfo.cpp
+  SBFSubtarget.cpp
+  SBFTargetMachine.cpp
+  SBFMIPeephole.cpp
+  SBFMIChecking.cpp
+  SBFMISimplifyPatchable.cpp
+  BTFDebug.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  SBFDesc
+  SBFInfo
+  IPO
+  Scalar
+  SelectionDAG
+  Support
+  Target
+  TransformUtils
+
+  ADD_TO_COMPONENT
+  SBF
+  )
+
+add_subdirectory(AsmParser)
+add_subdirectory(Disassembler)
+add_subdirectory(MCTargetDesc)
+add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt b/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt
new file mode 100644
index 0000000000000..fb2764455d02d
--- /dev/null
+++ b/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_llvm_component_library(LLVMSBFDisassembler
+  SBFDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  SBFInfo
+  Support
+
+  ADD_TO_COMPONENT
+  SBF
+)
+
diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
new file mode 100644
index 0000000000000..13f2ad814bbd8
--- /dev/null
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -0,0 +1,219 @@
+//===- SBFDisassembler.cpp - Disassembler for SBF ---------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file is part of the SBF Disassembler.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "TargetInfo/SBFTargetInfo.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
+#include "llvm/MC/MCFixedLenDisassembler.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/MathExtras.h"
+#include <cstdint>
+
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-disassembler"
+
+typedef MCDisassembler::DecodeStatus DecodeStatus;
+
+namespace {
+
+/// A disassembler class for SBF.
+class SBFDisassembler : public MCDisassembler {
+public:
+  enum SBF_CLASS {
+    SBF_LD = 0x0,
+    SBF_LDX = 0x1,
+    SBF_ST = 0x2,
+    SBF_STX = 0x3,
+    SBF_ALU = 0x4,
+    SBF_JMP = 0x5,
+    SBF_JMP32 = 0x6,
+    SBF_ALU64 = 0x7
+  };
+
+  enum SBF_SIZE {
+    SBF_W = 0x0,
+    SBF_H = 0x1,
+    SBF_B = 0x2,
+    SBF_DW = 0x3
+  };
+
+  enum SBF_MODE {
+    SBF_IMM = 0x0,
+    SBF_ABS = 0x1,
+    SBF_IND = 0x2,
+    SBF_MEM = 0x3,
+    SBF_LEN = 0x4,
+    SBF_MSH = 0x5,
+    SBF_ATOMIC = 0x6
+  };
+
+  SBFDisassembler(const MCSubtargetInfo &STI, MCContext &Ctx)
+      : MCDisassembler(STI, Ctx) {}
+  ~SBFDisassembler() override = default;
+
+  DecodeStatus getInstruction(MCInst &Instr, uint64_t &Size,
+                              ArrayRef<uint8_t> Bytes, uint64_t Address,
+                              raw_ostream &CStream) const override;
+
+  uint8_t getInstClass(uint64_t Inst) const { return (Inst >> 56) & 0x7; };
+  uint8_t getInstSize(uint64_t Inst) const { return (Inst >> 59) & 0x3; };
+  uint8_t getInstMode(uint64_t Inst) const { return (Inst >> 61) & 0x7; };
+};
+
+} // end anonymous namespace
+
+static MCDisassembler *createSBFDisassembler(const Target &T,
+                                             const MCSubtargetInfo &STI,
+                                             MCContext &Ctx) {
+  return new SBFDisassembler(STI, Ctx);
+}
+
+
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFDisassembler() {
+  // Register the disassembler.
+  TargetRegistry::RegisterMCDisassembler(getTheSBFXTarget(),
+                                         createSBFDisassembler);
+}
+
+static const unsigned GPRDecoderTable[] = {
+    SBF::R0,  SBF::R1,  SBF::R2,  SBF::R3,  SBF::R4,  SBF::R5,
+    SBF::R6,  SBF::R7,  SBF::R8,  SBF::R9,  SBF::R10, SBF::R11};
+
+static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, unsigned RegNo,
+                                           uint64_t /*Address*/,
+                                           const void * /*Decoder*/) {
+  if (RegNo > 11)
+    return MCDisassembler::Fail;
+
+  unsigned Reg = GPRDecoderTable[RegNo];
+  Inst.addOperand(MCOperand::createReg(Reg));
+  return MCDisassembler::Success;
+}
+
+static const unsigned GPR32DecoderTable[] = {
+    SBF::W0,  SBF::W1,  SBF::W2,  SBF::W3,  SBF::W4,  SBF::W5,
+    SBF::W6,  SBF::W7,  SBF::W8,  SBF::W9,  SBF::W10, SBF::W11};
+
+static DecodeStatus DecodeGPR32RegisterClass(MCInst &Inst, unsigned RegNo,
+                                             uint64_t /*Address*/,
+                                             const void * /*Decoder*/) {
+  if (RegNo > 11)
+    return MCDisassembler::Fail;
+
+  unsigned Reg = GPR32DecoderTable[RegNo];
+  Inst.addOperand(MCOperand::createReg(Reg));
+  return MCDisassembler::Success;
+}
+
+static DecodeStatus decodeMemoryOpValue(MCInst &Inst, unsigned Insn,
+                                        uint64_t Address, const void *Decoder) {
+  unsigned Register = (Insn >> 16) & 0xf;
+  if (Register > 11)
+    return MCDisassembler::Fail;
+
+  Inst.addOperand(MCOperand::createReg(GPRDecoderTable[Register]));
+  unsigned Offset = (Insn & 0xffff);
+  Inst.addOperand(MCOperand::createImm(SignExtend32<16>(Offset)));
+
+  return MCDisassembler::Success;
+}
+
+#include "SBFGenDisassemblerTables.inc"
+static DecodeStatus readInstruction64(ArrayRef<uint8_t> Bytes, uint64_t Address,
+                                      uint64_t &Size, uint64_t &Insn,
+                                      bool IsLittleEndian) {
+  uint64_t Lo, Hi;
+
+  if (Bytes.size() < 8) {
+    Size = 0;
+    return MCDisassembler::Fail;
+  }
+
+  Size = 8;
+  if (IsLittleEndian) {
+    Hi = (Bytes[0] << 24) | (Bytes[1] << 16) | (Bytes[2] << 0) | (Bytes[3] << 8);
+    Lo = (Bytes[4] << 0) | (Bytes[5] << 8) | (Bytes[6] << 16) | (Bytes[7] << 24);
+  } else {
+    Hi = (Bytes[0] << 24) | ((Bytes[1] & 0x0F) << 20) | ((Bytes[1] & 0xF0) << 12) |
+         (Bytes[2] << 8) | (Bytes[3] << 0);
+    Lo = (Bytes[4] << 24) | (Bytes[5] << 16) | (Bytes[6] << 8) | (Bytes[7] << 0);
+  }
+  Insn = Make_64(Hi, Lo);
+
+  return MCDisassembler::Success;
+}
+
+DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
+                                             ArrayRef<uint8_t> Bytes,
+                                             uint64_t Address,
+                                             raw_ostream &CStream) const {
+  bool IsLittleEndian = getContext().getAsmInfo()->isLittleEndian();
+  uint64_t Insn, Hi;
+  DecodeStatus Result;
+
+  Result = readInstruction64(Bytes, Address, Size, Insn, IsLittleEndian);
+  if (Result == MCDisassembler::Fail) return MCDisassembler::Fail;
+
+  uint8_t InstClass = getInstClass(Insn);
+  uint8_t InstMode = getInstMode(Insn);
+  if ((InstClass == SBF_LDX || InstClass == SBF_STX) &&
+      getInstSize(Insn) != SBF_DW &&
+      (InstMode == SBF_MEM || InstMode == SBF_ATOMIC) &&
+      STI.getFeatureBits()[SBF::ALU32])
+    Result = decodeInstruction(DecoderTableSBFALU3264, Instr, Insn, Address,
+                               this, STI);
+  else
+    Result = decodeInstruction(DecoderTableSBF64, Instr, Insn, Address, this,
+                               STI);
+
+  if (Result == MCDisassembler::Fail) return MCDisassembler::Fail;
+
+  switch (Instr.getOpcode()) {
+  case SBF::LD_imm64:
+  case SBF::LD_pseudo: {
+    if (Bytes.size() < 16) {
+      Size = 0;
+      return MCDisassembler::Fail;
+    }
+    Size = 16;
+    if (IsLittleEndian)
+      Hi = (Bytes[12] << 0) | (Bytes[13] << 8) | (Bytes[14] << 16) | (Bytes[15] << 24);
+    else
+      Hi = (Bytes[12] << 24) | (Bytes[13] << 16) | (Bytes[14] << 8) | (Bytes[15] << 0);
+    auto& Op = Instr.getOperand(1);
+    Op.setImm(Make_64(Hi, Op.getImm()));
+    break;
+  }
+  case SBF::LD_ABS_B:
+  case SBF::LD_ABS_H:
+  case SBF::LD_ABS_W:
+  case SBF::LD_IND_B:
+  case SBF::LD_IND_H:
+  case SBF::LD_IND_W: {
+    auto Op = Instr.getOperand(0);
+    Instr.clear();
+    Instr.addOperand(MCOperand::createReg(SBF::R6));
+    Instr.addOperand(Op);
+    break;
+  }
+  }
+
+  return Result;
+}
+
+typedef DecodeStatus (*DecodeFunc)(MCInst &MI, unsigned insn, uint64_t Address,
+                                   const void *Decoder);
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
new file mode 100644
index 0000000000000..23c8c21c548ee
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_llvm_component_library(LLVMSBFDesc
+  SBFMCTargetDesc.cpp
+  SBFAsmBackend.cpp
+  SBFInstPrinter.cpp
+  SBFMCCodeEmitter.cpp
+  SBFELFObjectWriter.cpp
+
+  LINK_COMPONENTS
+  MC
+  SBFInfo
+  Support
+
+  ADD_TO_COMPONENT
+  SBF
+  )
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
new file mode 100644
index 0000000000000..67e553265cba6
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -0,0 +1,120 @@
+//===-- SBFAsmBackend.cpp - SBF Assembler Backend -------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/MC/MCAsmBackend.h"
+#include "llvm/MC/MCAssembler.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCFixup.h"
+#include "llvm/MC/MCObjectWriter.h"
+#include "llvm/Support/EndianStream.h"
+#include <cassert>
+#include <cstdint>
+
+using namespace llvm;
+
+namespace {
+
+class SBFAsmBackend : public MCAsmBackend {
+public:
+  SBFAsmBackend(support::endianness Endian, const MCSubtargetInfo &STI)
+      : MCAsmBackend(Endian),
+        isSolana(STI.hasFeature(SBF::FeatureSolana) ||
+                 STI.getTargetTriple().getArch() == Triple::sbf),
+        relocAbs64(STI.hasFeature(SBF::FeatureRelocAbs64)) {}
+  ~SBFAsmBackend() override = default;
+
+  void applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
+                  const MCValue &Target, MutableArrayRef<char> Data,
+                  uint64_t Value, bool IsResolved,
+                  const MCSubtargetInfo *STI) const override;
+
+  std::unique_ptr<MCObjectTargetWriter>
+  createObjectTargetWriter() const override;
+
+  // No instruction requires relaxation
+  bool fixupNeedsRelaxation(const MCFixup &Fixup, uint64_t Value,
+                            const MCRelaxableFragment *DF,
+                            const MCAsmLayout &Layout) const override {
+    return false;
+  }
+
+  unsigned getNumFixupKinds() const override { return 1; }
+
+  bool writeNopData(raw_ostream &OS, uint64_t Count,
+                    const MCSubtargetInfo *STI) const override;
+private:
+  bool isSolana;
+  bool relocAbs64;
+};
+
+} // end anonymous namespace
+
+bool SBFAsmBackend::writeNopData(raw_ostream &OS, uint64_t Count,
+                                 const MCSubtargetInfo *STI) const {
+  if ((Count % 8) != 0)
+    return false;
+
+  for (uint64_t i = 0; i < Count; i += 8)
+    support::endian::write<uint64_t>(OS, 0x15000000, Endian);
+
+  return true;
+}
+
+void SBFAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
+                               const MCValue &Target,
+                               MutableArrayRef<char> Data, uint64_t Value,
+                               bool IsResolved,
+                               const MCSubtargetInfo *STI) const {
+  if (Fixup.getKind() == FK_SecRel_8) {
+    // The Value is 0 for global variables, and the in-section offset
+    // for static variables. Write to the immediate field of the inst.
+    assert(Value <= UINT32_MAX);
+    support::endian::write<uint32_t>(&Data[Fixup.getOffset() + 4],
+                                     static_cast<uint32_t>(Value),
+                                     Endian);
+  } else if (Fixup.getKind() == FK_Data_4) {
+    support::endian::write<uint32_t>(&Data[Fixup.getOffset()], Value, Endian);
+  } else if (Fixup.getKind() == FK_Data_8) {
+    support::endian::write<uint64_t>(&Data[Fixup.getOffset()], Value, Endian);
+  } else if (Fixup.getKind() == FK_PCRel_4) {
+    Value = (uint32_t)((Value - 8) / 8);
+    if (Endian == support::little) {
+      Data[Fixup.getOffset() + 1] = 0x10;
+      support::endian::write32le(&Data[Fixup.getOffset() + 4], Value);
+    } else {
+      Data[Fixup.getOffset() + 1] = 0x1;
+      support::endian::write32be(&Data[Fixup.getOffset() + 4], Value);
+    }
+  } else {
+    assert(Fixup.getKind() == FK_PCRel_2);
+    Value = (uint16_t)((Value - 8) / 8);
+    support::endian::write<uint16_t>(&Data[Fixup.getOffset() + 2], Value,
+                                     Endian);
+  }
+}
+
+std::unique_ptr<MCObjectTargetWriter>
+SBFAsmBackend::createObjectTargetWriter() const {
+  return createSBFELFObjectWriter(0, isSolana, relocAbs64);
+}
+
+MCAsmBackend *llvm::createSBFAsmBackend(const Target &T,
+                                        const MCSubtargetInfo &STI,
+                                        const MCRegisterInfo &MRI,
+                                        const MCTargetOptions &) {
+  return new SBFAsmBackend(support::little, STI);
+}
+
+MCAsmBackend *llvm::createSBFbeAsmBackend(const Target &T,
+                                          const MCSubtargetInfo &STI,
+                                          const MCRegisterInfo &MRI,
+                                          const MCTargetOptions &) {
+  return new SBFAsmBackend(support::big, STI);
+}
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
new file mode 100644
index 0000000000000..cbd7e3abe592a
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
@@ -0,0 +1,109 @@
+//===-- SBFELFObjectWriter.cpp - SBF ELF Writer ---------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "llvm/BinaryFormat/ELF.h"
+#include "llvm/MC/MCELFObjectWriter.h"
+#include "llvm/MC/MCFixup.h"
+#include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCValue.h"
+#include "llvm/Support/ErrorHandling.h"
+#include <cstdint>
+
+using namespace llvm;
+
+namespace {
+
+class SBFELFObjectWriter : public MCELFObjectTargetWriter {
+public:
+  SBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool relocAbs64);
+  ~SBFELFObjectWriter() override = default;
+
+protected:
+  unsigned getRelocType(MCContext &Ctx, const MCValue &Target,
+                        const MCFixup &Fixup, bool IsPCRel) const override;
+
+  bool needsRelocateWithSymbol(const MCSymbol &Sym,
+                               unsigned Type) const override;
+private:
+  bool isSolana;
+  bool relocAbs64;
+};
+
+} // end anonymous namespace
+
+// Avoid section relocations because the SBF backend can only handle
+// section relocations with values (offset into the section containing
+// the symbol being relocated).  Forcing a relocation with a symbol
+// will result in the symbol's index being used in the .o file instead.
+bool SBFELFObjectWriter::needsRelocateWithSymbol(const MCSymbol &Sym,
+                                                 unsigned Type) const {
+  return isSolana;
+}
+
+SBFELFObjectWriter::SBFELFObjectWriter(uint8_t OSABI, bool isSolana,
+                                       bool relocAbs64)
+    : MCELFObjectTargetWriter(/*Is64Bit*/ true, OSABI, ELF::EM_SBF,
+                              /*HasRelocationAddend*/ false),
+      isSolana(isSolana), relocAbs64(relocAbs64) {}
+
+unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
+                                          const MCFixup &Fixup,
+                                          bool IsPCRel) const {
+  // determine the type of the relocation
+  switch (Fixup.getKind()) {
+  default:
+    llvm_unreachable("invalid fixup kind!");
+  case FK_SecRel_8:
+    // LD_imm64 instruction.
+    return ELF::R_SBF_64_64;
+  case FK_PCRel_4:
+    // CALL instruction.
+    return ELF::R_SBF_64_32;
+  case FK_Data_8:
+    return (isSolana && !relocAbs64) ? ELF::R_SBF_64_64 : ELF::R_SBF_64_ABS64;
+  case FK_Data_4:
+    if (const MCSymbolRefExpr *A = Target.getSymA()) {
+      const MCSymbol &Sym = A->getSymbol();
+
+      if (Sym.isDefined()) {
+        MCSection &Section = Sym.getSection();
+        const MCSectionELF *SectionELF = dyn_cast<MCSectionELF>(&Section);
+        assert(SectionELF && "Null section for reloc symbol");
+
+        unsigned Flags = SectionELF->getFlags();
+
+        if (Sym.isTemporary()) {
+          // .BTF.ext generates FK_Data_4 relocations for
+          // insn offset by creating temporary labels.
+          // The reloc symbol should be in text section.
+          // Use a different relocation to instruct ExecutionEngine
+          // RuntimeDyld not to do relocation for it, yet still to
+          // allow lld to do proper adjustment when merging sections.
+          if ((Flags & ELF::SHF_ALLOC) && (Flags & ELF::SHF_EXECINSTR))
+            return ELF::R_SBF_64_NODYLD32;
+        } else {
+          // .BTF generates FK_Data_4 relocations for variable
+          // offset in DataSec kind.
+          // The reloc symbol should be in data section.
+          if ((Flags & ELF::SHF_ALLOC) && (Flags & ELF::SHF_WRITE))
+            return ELF::R_SBF_64_NODYLD32;
+        }
+        // .debug_* sections
+	if (!(Flags & ELF::SHF_ALLOC))
+       	  return ELF::R_SBF_64_ABS32;
+      }
+    }
+    return isSolana ? ELF::R_SBF_64_32 : ELF::R_SBF_64_ABS32;
+  }
+}
+
+std::unique_ptr<MCObjectTargetWriter>
+llvm::createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64) {
+  return std::make_unique<SBFELFObjectWriter>(OSABI, isSolana, useRelocAbs64);
+}
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
new file mode 100644
index 0000000000000..c158bc3101290
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
@@ -0,0 +1,108 @@
+//===-- SBFInstPrinter.cpp - Convert SBF MCInst to asm syntax -------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This class prints an SBF MCInst to a .s file.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFInstPrinter.h"
+#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCExpr.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCSymbol.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/FormattedStream.h"
+using namespace llvm;
+
+#define DEBUG_TYPE "asm-printer"
+
+// Include the auto-generated portion of the assembly writer.
+#include "SBFGenAsmWriter.inc"
+
+void SBFInstPrinter::printInst(const MCInst *MI, uint64_t Address,
+                               StringRef Annot, const MCSubtargetInfo &STI,
+                               raw_ostream &O) {
+  printInstruction(MI, Address, O);
+  printAnnotation(O, Annot);
+}
+
+static void printExpr(const MCExpr *Expr, raw_ostream &O) {
+#ifndef NDEBUG
+  const MCSymbolRefExpr *SRE;
+
+  if (const MCBinaryExpr *BE = dyn_cast<MCBinaryExpr>(Expr))
+    SRE = dyn_cast<MCSymbolRefExpr>(BE->getLHS());
+  else
+    SRE = dyn_cast<MCSymbolRefExpr>(Expr);
+  assert(SRE && "Unexpected MCExpr type.");
+
+  MCSymbolRefExpr::VariantKind Kind = SRE->getKind();
+
+  assert(Kind == MCSymbolRefExpr::VK_None);
+#endif
+  O << *Expr;
+}
+
+void SBFInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
+                                  raw_ostream &O, const char *Modifier) {
+  assert((Modifier == nullptr || Modifier[0] == 0) && "No modifiers supported");
+  const MCOperand &Op = MI->getOperand(OpNo);
+  if (Op.isReg()) {
+    O << getRegisterName(Op.getReg());
+  } else if (Op.isImm()) {
+    O << formatImm((int32_t)Op.getImm());
+  } else {
+    assert(Op.isExpr() && "Expected an expression");
+    printExpr(Op.getExpr(), O);
+  }
+}
+
+void SBFInstPrinter::printMemOperand(const MCInst *MI, int OpNo, raw_ostream &O,
+                                     const char *Modifier) {
+  const MCOperand &RegOp = MI->getOperand(OpNo);
+  const MCOperand &OffsetOp = MI->getOperand(OpNo + 1);
+
+  // register
+  assert(RegOp.isReg() && "Register operand not a register");
+  O << getRegisterName(RegOp.getReg());
+
+  // offset
+  if (OffsetOp.isImm()) {
+    auto Imm = OffsetOp.getImm();
+    if (Imm >= 0)
+      O << " + " << formatImm(Imm);
+    else
+      O << " - " << formatImm(-Imm);
+  } else {
+    assert(0 && "Expected an immediate");
+  }
+}
+
+void SBFInstPrinter::printImm64Operand(const MCInst *MI, unsigned OpNo,
+                                       raw_ostream &O) {
+  const MCOperand &Op = MI->getOperand(OpNo);
+  if (Op.isImm())
+    O << formatImm(Op.getImm());
+  else if (Op.isExpr())
+    printExpr(Op.getExpr(), O);
+  else
+    O << Op;
+}
+
+void SBFInstPrinter::printBrTargetOperand(const MCInst *MI, unsigned OpNo,
+                                       raw_ostream &O) {
+  const MCOperand &Op = MI->getOperand(OpNo);
+  if (Op.isImm()) {
+    int16_t Imm = Op.getImm();
+    O << ((Imm >= 0) ? "+" : "") << formatImm(Imm);
+  } else if (Op.isExpr()) {
+    printExpr(Op.getExpr(), O);
+  } else {
+    O << Op;
+  }
+}
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
new file mode 100644
index 0000000000000..1f1e069e62d94
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
@@ -0,0 +1,41 @@
+//===-- SBFInstPrinter.h - Convert SBF MCInst to asm syntax -------*- C++ -*--//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This class prints a SBF MCInst to a .s file.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFINSTPRINTER_H
+#define LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFINSTPRINTER_H
+
+#include "llvm/MC/MCInstPrinter.h"
+
+namespace llvm {
+class SBFInstPrinter : public MCInstPrinter {
+public:
+  SBFInstPrinter(const MCAsmInfo &MAI, const MCInstrInfo &MII,
+                 const MCRegisterInfo &MRI)
+      : MCInstPrinter(MAI, MII, MRI) {}
+
+  void printInst(const MCInst *MI, uint64_t Address, StringRef Annot,
+                 const MCSubtargetInfo &STI, raw_ostream &O) override;
+  void printOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O,
+                    const char *Modifier = nullptr);
+  void printMemOperand(const MCInst *MI, int OpNo, raw_ostream &O,
+                       const char *Modifier = nullptr);
+  void printImm64Operand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
+  void printBrTargetOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
+
+  // Autogenerated by tblgen.
+  std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
+  void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
+  static const char *getRegisterName(unsigned RegNo);
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
new file mode 100644
index 0000000000000..08261d3aea67e
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
@@ -0,0 +1,58 @@
+//===-- SBFMCAsmInfo.h - SBF asm properties -------------------*- C++ -*--====//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the declaration of the SBFMCAsmInfo class.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCASMINFO_H
+#define LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCASMINFO_H
+
+#include "llvm/ADT/Triple.h"
+#include "llvm/MC/MCAsmInfo.h"
+
+namespace llvm {
+
+class SBFMCAsmInfo : public MCAsmInfo {
+public:
+  explicit SBFMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) {
+    if (TT.getArch() == Triple::bpfeb)
+      IsLittleEndian = false;
+
+    PrivateGlobalPrefix = ".L";
+    WeakRefDirective = "\t.weak\t";
+
+    UsesELFSectionDirectiveForBSS = true;
+    HasSingleParameterDotFile = true;
+    HasDotTypeDotSizeDirective = true;
+
+    SupportsDebugInformation = true;
+    ExceptionsType = ExceptionHandling::DwarfCFI;
+    MinInstAlignment = 8;
+
+    // the default is 4 and it only affects dwarf elf output
+    // so if not set correctly, the dwarf data will be
+    // messed up in random places by 4 bytes. .debug_line
+    // section will be parsable, but with odd offsets and
+    // line numbers, etc.
+    CodePointerSize = 8;
+
+    UseIntegratedAssembler = false;
+  }
+
+  void setDwarfUsesRelocationsAcrossSections(bool enable) {
+    DwarfUsesRelocationsAcrossSections = enable;
+  }
+
+  void setSupportsDebugInformation(bool enable) {
+    SupportsDebugInformation = enable;
+  }
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
new file mode 100644
index 0000000000000..2b7fe22684b25
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
@@ -0,0 +1,180 @@
+//===-- SBFMCCodeEmitter.cpp - Convert SBF code to machine code -----------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the SBFMCCodeEmitter class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/MC/MCCodeEmitter.h"
+#include "llvm/MC/MCExpr.h"
+#include "llvm/MC/MCFixup.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCInstrInfo.h"
+#include "llvm/MC/MCRegisterInfo.h"
+#include "llvm/MC/MCSubtargetInfo.h"
+#include "llvm/Support/Endian.h"
+#include "llvm/Support/EndianStream.h"
+#include <cassert>
+#include <cstdint>
+
+using namespace llvm;
+
+#define DEBUG_TYPE "mccodeemitter"
+
+namespace {
+
+class SBFMCCodeEmitter : public MCCodeEmitter {
+  const MCInstrInfo &MCII;
+  const MCRegisterInfo &MRI;
+  bool IsLittleEndian;
+
+public:
+  SBFMCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri,
+                   bool IsLittleEndian)
+      : MCII(mcii), MRI(mri), IsLittleEndian(IsLittleEndian) {}
+  SBFMCCodeEmitter(const SBFMCCodeEmitter &) = delete;
+  void operator=(const SBFMCCodeEmitter &) = delete;
+  ~SBFMCCodeEmitter() override = default;
+
+  // getBinaryCodeForInstr - TableGen'erated function for getting the
+  // binary encoding for an instruction.
+  uint64_t getBinaryCodeForInstr(const MCInst &MI,
+                                 SmallVectorImpl<MCFixup> &Fixups,
+                                 const MCSubtargetInfo &STI) const;
+
+  // getMachineOpValue - Return binary encoding of operand. If the machin
+  // operand requires relocation, record the relocation and return zero.
+  unsigned getMachineOpValue(const MCInst &MI, const MCOperand &MO,
+                             SmallVectorImpl<MCFixup> &Fixups,
+                             const MCSubtargetInfo &STI) const;
+
+  uint64_t getMemoryOpValue(const MCInst &MI, unsigned Op,
+                            SmallVectorImpl<MCFixup> &Fixups,
+                            const MCSubtargetInfo &STI) const;
+
+  void encodeInstruction(const MCInst &MI, raw_ostream &OS,
+                         SmallVectorImpl<MCFixup> &Fixups,
+                         const MCSubtargetInfo &STI) const override;
+
+private:
+  FeatureBitset computeAvailableFeatures(const FeatureBitset &FB) const;
+  void
+  verifyInstructionPredicates(const MCInst &MI,
+                              const FeatureBitset &AvailableFeatures) const;
+};
+
+} // end anonymous namespace
+
+MCCodeEmitter *llvm::createSBFMCCodeEmitter(const MCInstrInfo &MCII,
+                                            const MCRegisterInfo &MRI,
+                                            MCContext &Ctx) {
+  return new SBFMCCodeEmitter(MCII, MRI, true);
+}
+
+MCCodeEmitter *llvm::createSBFbeMCCodeEmitter(const MCInstrInfo &MCII,
+                                              const MCRegisterInfo &MRI,
+                                              MCContext &Ctx) {
+  return new SBFMCCodeEmitter(MCII, MRI, false);
+}
+
+unsigned SBFMCCodeEmitter::getMachineOpValue(const MCInst &MI,
+                                             const MCOperand &MO,
+                                             SmallVectorImpl<MCFixup> &Fixups,
+                                             const MCSubtargetInfo &STI) const {
+  if (MO.isReg())
+    return MRI.getEncodingValue(MO.getReg());
+  if (MO.isImm())
+    return static_cast<unsigned>(MO.getImm());
+
+  assert(MO.isExpr());
+
+  const MCExpr *Expr = MO.getExpr();
+
+  assert(Expr->getKind() == MCExpr::SymbolRef);
+
+  if (MI.getOpcode() == SBF::JAL)
+    // func call name
+    Fixups.push_back(MCFixup::create(0, Expr, FK_PCRel_4));
+  else if (MI.getOpcode() == SBF::LD_imm64)
+    Fixups.push_back(MCFixup::create(0, Expr, FK_SecRel_8));
+  else
+    // bb label
+    Fixups.push_back(MCFixup::create(0, Expr, FK_PCRel_2));
+
+  return 0;
+}
+
+static uint8_t SwapBits(uint8_t Val)
+{
+  return (Val & 0x0F) << 4 | (Val & 0xF0) >> 4;
+}
+
+void SBFMCCodeEmitter::encodeInstruction(const MCInst &MI, raw_ostream &OS,
+                                         SmallVectorImpl<MCFixup> &Fixups,
+                                         const MCSubtargetInfo &STI) const {
+  verifyInstructionPredicates(MI,
+                              computeAvailableFeatures(STI.getFeatureBits()));
+
+  unsigned Opcode = MI.getOpcode();
+  support::endian::Writer OSE(OS,
+                              IsLittleEndian ? support::little : support::big);
+
+  if (Opcode == SBF::LD_imm64 || Opcode == SBF::LD_pseudo) {
+    uint64_t Value = getBinaryCodeForInstr(MI, Fixups, STI);
+    OS << char(Value >> 56);
+    if (IsLittleEndian)
+      OS << char((Value >> 48) & 0xff);
+    else
+      OS << char(SwapBits((Value >> 48) & 0xff));
+    OSE.write<uint16_t>(0);
+    OSE.write<uint32_t>(Value & 0xffffFFFF);
+
+    const MCOperand &MO = MI.getOperand(1);
+    uint64_t Imm = MO.isImm() ? MO.getImm() : 0;
+    OSE.write<uint8_t>(0);
+    OSE.write<uint8_t>(0);
+    OSE.write<uint16_t>(0);
+    OSE.write<uint32_t>(Imm >> 32);
+  } else {
+    // Get instruction encoding and emit it
+    uint64_t Value = getBinaryCodeForInstr(MI, Fixups, STI);
+    OS << char(Value >> 56);
+    if (IsLittleEndian)
+      OS << char((Value >> 48) & 0xff);
+    else
+      OS << char(SwapBits((Value >> 48) & 0xff));
+    OSE.write<uint16_t>((Value >> 32) & 0xffff);
+    OSE.write<uint32_t>(Value & 0xffffFFFF);
+  }
+}
+
+// Encode SBF Memory Operand
+uint64_t SBFMCCodeEmitter::getMemoryOpValue(const MCInst &MI, unsigned Op,
+                                            SmallVectorImpl<MCFixup> &Fixups,
+                                            const MCSubtargetInfo &STI) const {
+  // For CMPXCHG instructions, output is implicitly in R0/W0,
+  // so memory operand starts from operand 0.
+  int MemOpStartIndex = 1, Opcode = MI.getOpcode();
+  if (Opcode == SBF::CMPXCHGW32 || Opcode == SBF::CMPXCHGD)
+    MemOpStartIndex = 0;
+
+  uint64_t Encoding;
+  const MCOperand Op1 = MI.getOperand(MemOpStartIndex);
+  assert(Op1.isReg() && "First operand is not register.");
+  Encoding = MRI.getEncodingValue(Op1.getReg());
+  Encoding <<= 16;
+  MCOperand Op2 = MI.getOperand(MemOpStartIndex + 1);
+  assert(Op2.isImm() && "Second operand is not immediate.");
+  Encoding |= Op2.getImm() & 0xffff;
+  return Encoding;
+}
+
+#define ENABLE_INSTR_PREDICATE_VERIFIER
+#include "SBFGenMCCodeEmitter.inc"
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
new file mode 100644
index 0000000000000..923d764efe5aa
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -0,0 +1,148 @@
+//===-- SBFMCTargetDesc.cpp - SBF Target Descriptions ---------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides SBF specific target descriptions.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "MCTargetDesc/SBFInstPrinter.h"
+#include "MCTargetDesc/SBFMCAsmInfo.h"
+#include "TargetInfo/SBFTargetInfo.h"
+#include "llvm/BinaryFormat/ELF.h"
+#include "llvm/MC/MCAsmBackend.h"
+#include "llvm/MC/MCCodeEmitter.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCELFStreamer.h"
+#include "llvm/MC/MCInstrAnalysis.h"
+#include "llvm/MC/MCInstrInfo.h"
+#include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCRegisterInfo.h"
+#include "llvm/MC/MCSubtargetInfo.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/Host.h"
+
+#define GET_INSTRINFO_MC_DESC
+#include "SBFGenInstrInfo.inc"
+
+#define GET_SUBTARGETINFO_MC_DESC
+#include "SBFGenSubtargetInfo.inc"
+
+#define GET_REGINFO_MC_DESC
+#include "SBFGenRegisterInfo.inc"
+
+using namespace llvm;
+
+static MCInstrInfo *createSBFMCInstrInfo() {
+  MCInstrInfo *X = new MCInstrInfo();
+  InitSBFMCInstrInfo(X);
+  return X;
+}
+
+static MCRegisterInfo *createSBFMCRegisterInfo(const Triple &TT) {
+  MCRegisterInfo *X = new MCRegisterInfo();
+  InitSBFMCRegisterInfo(X, SBF::R11 /* RAReg doesn't exist */);
+  return X;
+}
+
+static MCSubtargetInfo *createSBFMCSubtargetInfo(const Triple &TT,
+                                                 StringRef CPU, StringRef FS) {
+  return createSBFMCSubtargetInfoImpl(TT, CPU, /*TuneCPU*/ CPU, FS);
+}
+
+static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
+                                       std::unique_ptr<MCAsmBackend> &&MAB,
+                                       std::unique_ptr<MCObjectWriter> &&OW,
+                                       std::unique_ptr<MCCodeEmitter> &&Emitter,
+                                       bool RelaxAll) {
+  MCELFStreamer *S =
+      new MCELFStreamer(Ctx, std::move(MAB), std::move(OW), std::move(Emitter));
+  MCAssembler &A = S->getAssembler();
+  if (RelaxAll)
+    A.setRelaxAll(true);
+
+  const MCSubtargetInfo *STI = Ctx.getSubtargetInfo();
+  if (STI->getCPU() == "sbfv2") {
+    A.setELFHeaderEFlags(llvm::ELF::EF_SBF_V2);
+  }
+
+  return S;
+}
+
+static MCInstPrinter *createSBFMCInstPrinter(const Triple &T,
+                                             unsigned SyntaxVariant,
+                                             const MCAsmInfo &MAI,
+                                             const MCInstrInfo &MII,
+                                             const MCRegisterInfo &MRI) {
+  if (SyntaxVariant == 0)
+    return new SBFInstPrinter(MAI, MII, MRI);
+  return nullptr;
+}
+
+namespace {
+
+class SBFMCInstrAnalysis : public MCInstrAnalysis {
+public:
+  explicit SBFMCInstrAnalysis(const MCInstrInfo *Info)
+      : MCInstrAnalysis(Info) {}
+
+  bool evaluateBranch(const MCInst &Inst, uint64_t Addr, uint64_t Size,
+                      uint64_t &Target) const override {
+    // The target is the 3rd operand of cond inst and the 1st of uncond inst.
+    int16_t Imm;
+    if (isConditionalBranch(Inst)) {
+      Imm = Inst.getOperand(2).getImm();
+    } else if (isUnconditionalBranch(Inst))
+      Imm = Inst.getOperand(0).getImm();
+    else
+      return false;
+
+    Target = Addr + Size + Imm * Size;
+    return true;
+  }
+};
+
+} // end anonymous namespace
+
+static MCInstrAnalysis *createSBFInstrAnalysis(const MCInstrInfo *Info) {
+  return new SBFMCInstrAnalysis(Info);
+}
+
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTargetMC() {
+  for (Target *T : {&getTheSBFXTarget()}) {
+    // Register the MC asm info.
+    RegisterMCAsmInfo<SBFMCAsmInfo> X(*T);
+
+    // Register the MC instruction info.
+    TargetRegistry::RegisterMCInstrInfo(*T, createSBFMCInstrInfo);
+
+    // Register the MC register info.
+    TargetRegistry::RegisterMCRegInfo(*T, createSBFMCRegisterInfo);
+
+    // Register the MC subtarget info.
+    TargetRegistry::RegisterMCSubtargetInfo(*T,
+                                            createSBFMCSubtargetInfo);
+
+    // Register the object streamer
+    TargetRegistry::RegisterELFStreamer(*T, createSBFMCStreamer);
+
+    // Register the MCInstPrinter.
+    TargetRegistry::RegisterMCInstPrinter(*T, createSBFMCInstPrinter);
+
+    // Register the MC instruction analyzer.
+    TargetRegistry::RegisterMCInstrAnalysis(*T, createSBFInstrAnalysis);
+  }
+
+  // Register the MC code emitter
+  TargetRegistry::RegisterMCCodeEmitter(getTheSBFXTarget(),
+                                        createSBFMCCodeEmitter);
+
+  // Register the ASM Backend
+  TargetRegistry::RegisterMCAsmBackend(getTheSBFXTarget(),
+                                       createSBFAsmBackend);
+}
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
new file mode 100644
index 0000000000000..aa2460ee6523f
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
@@ -0,0 +1,64 @@
+//===-- SBFMCTargetDesc.h - SBF Target Descriptions -------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides SBF specific target descriptions.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCTARGETDESC_H
+#define LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCTARGETDESC_H
+
+#include "llvm/Config/config.h"
+#include "llvm/Support/DataTypes.h"
+
+#include <memory>
+
+namespace llvm {
+class MCAsmBackend;
+class MCCodeEmitter;
+class MCContext;
+class MCInstrInfo;
+class MCObjectTargetWriter;
+class MCRegisterInfo;
+class MCSubtargetInfo;
+class MCTargetOptions;
+class Target;
+
+MCCodeEmitter *createSBFMCCodeEmitter(const MCInstrInfo &MCII,
+                                      const MCRegisterInfo &MRI,
+                                      MCContext &Ctx);
+MCCodeEmitter *createSBFbeMCCodeEmitter(const MCInstrInfo &MCII,
+                                        const MCRegisterInfo &MRI,
+                                        MCContext &Ctx);
+
+MCAsmBackend *createSBFAsmBackend(const Target &T, const MCSubtargetInfo &STI,
+                                  const MCRegisterInfo &MRI,
+                                  const MCTargetOptions &Options);
+MCAsmBackend *createSBFbeAsmBackend(const Target &T, const MCSubtargetInfo &STI,
+                                    const MCRegisterInfo &MRI,
+                                    const MCTargetOptions &Options);
+
+std::unique_ptr<MCObjectTargetWriter>
+createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64);
+} // namespace llvm
+
+// Defines symbolic names for SBF registers.  This defines a mapping from
+// register name to register number.
+//
+#define GET_REGINFO_ENUM
+#include "SBFGenRegisterInfo.inc"
+
+// Defines symbolic names for the SBF instructions.
+//
+#define GET_INSTRINFO_ENUM
+#include "SBFGenInstrInfo.inc"
+
+#define GET_SUBTARGETINFO_ENUM
+#include "SBFGenSubtargetInfo.inc"
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
new file mode 100644
index 0000000000000..e4e9cd28a72bd
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -0,0 +1,75 @@
+//===-- SBF.h - Top-level interface for SBF representation ------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBF_H
+#define LLVM_LIB_TARGET_SBF_SBF_H
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/Target/TargetMachine.h"
+
+namespace llvm {
+class SBFTargetMachine;
+
+ModulePass *createSBFAdjustOpt();
+ModulePass *createSBFCheckAndAdjustIR();
+
+FunctionPass *createSBFAbstractMemberAccess(SBFTargetMachine *TM);
+FunctionPass *createSBFPreserveDIType();
+FunctionPass *createSBFIRPeephole();
+FunctionPass *createSBFISelDag(SBFTargetMachine &TM);
+FunctionPass *createSBFMISimplifyPatchablePass();
+FunctionPass *createSBFMIPeepholePass();
+FunctionPass *createSBFMIPeepholeTruncElimPass();
+FunctionPass *createSBFMIPreEmitPeepholePass();
+FunctionPass *createSBFMIPreEmitCheckingPass();
+
+void initializeSBFAdjustOptPass(PassRegistry&);
+void initializeSBFCheckAndAdjustIRPass(PassRegistry&);
+
+void initializeSBFAbstractMemberAccessLegacyPassPass(PassRegistry &);
+void initializeSBFPreserveDITypePass(PassRegistry&);
+void initializeSBFIRPeepholePass(PassRegistry&);
+void initializeSBFMISimplifyPatchablePass(PassRegistry&);
+void initializeSBFMIPeepholePass(PassRegistry&);
+void initializeSBFMIPeepholeTruncElimPass(PassRegistry&);
+void initializeSBFMIPreEmitPeepholePass(PassRegistry&);
+void initializeSBFMIPreEmitCheckingPass(PassRegistry&);
+
+class SBFAbstractMemberAccessPass
+    : public PassInfoMixin<SBFAbstractMemberAccessPass> {
+  SBFTargetMachine *TM;
+
+public:
+  SBFAbstractMemberAccessPass(SBFTargetMachine *TM) : TM(TM) {}
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+
+  static bool isRequired() { return true; }
+};
+
+class SBFPreserveDITypePass : public PassInfoMixin<SBFPreserveDITypePass> {
+public:
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+
+  static bool isRequired() { return true; }
+};
+
+class SBFIRPeepholePass : public PassInfoMixin<SBFIRPeepholePass> {
+public:
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+
+  static bool isRequired() { return true; }
+};
+
+class SBFAdjustOptPass : public PassInfoMixin<SBFAdjustOptPass> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+} // namespace llvm
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
new file mode 100644
index 0000000000000..4f0a45d0e6e2e
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -0,0 +1,72 @@
+//===-- SBF.td - Describe the SBF Target Machine -----------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+include "llvm/Target/Target.td"
+
+include "SBFRegisterInfo.td"
+include "SBFCallingConv.td"
+include "SBFInstrInfo.td"
+
+def SBFInstrInfo : InstrInfo;
+
+def DummyFeature : SubtargetFeature<"dummy", "isDummyMode",
+                                    "true", "unused feature">;
+
+def ALU32 : SubtargetFeature<"alu32", "HasAlu32", "true",
+                             "Enable ALU32 instructions">;
+
+def DwarfRIS: SubtargetFeature<"dwarfris", "UseDwarfRIS", "true",
+                               "Disable MCAsmInfo DwarfUsesRelocationsAcrossSections">;
+
+def FeatureSolana : SubtargetFeature<"solana", "IsSolana", "true",
+                                     "Enable Solana extensions">;
+
+def FeatureDynamicFrames : SubtargetFeature<"dynamic-frames", "HasDynamicFrames", "true",
+                                            "Enable dynamic frames">;
+
+def FeatureSdiv : SubtargetFeature<"sdiv", "HasSdiv", "true",
+                                   "Enable native SBF_SDIV support">;
+
+def FeatureRelocAbs64 : SubtargetFeature<"reloc-abs64", "UseRelocAbs64", "true",
+                                   "Fix 64bit data relocations">;
+
+def FeatureStaticSyscalls : SubtargetFeature<"static-syscalls", "HasStaticSyscalls", "true",
+                                   "Marker feature used for conditional compilation">;
+
+class Proc<string Name, list<SubtargetFeature> Features>
+ : Processor<Name, NoItineraries, Features>;
+
+def : Proc<"generic", []>;
+def : Proc<"v1", []>;
+def : Proc<"v2", []>;
+def : Proc<"v3", []>;
+def : Proc<"probe", []>;
+def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls]>;
+
+def SBFInstPrinter : AsmWriter {
+  string AsmWriterClassName  = "InstPrinter";
+  bit isMCAsmWriter = 1;
+}
+
+def SBFAsmParser : AsmParser {
+  bit HasMnemonicFirst = 0;
+}
+
+def SBFAsmParserVariant : AsmParserVariant {
+  int Variant = 0;
+  string Name = "SBF";
+  string BreakCharacters = ".";
+  string TokenizingCharacters = "#()[]=:.<>!+*/";
+}
+
+def SBF : Target {
+  let InstructionSet = SBFInstrInfo;
+  let AssemblyWriters = [SBFInstPrinter];
+  let AssemblyParsers = [SBFAsmParser];
+  let AssemblyParserVariants = [SBFAsmParserVariant];
+}
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
new file mode 100644
index 0000000000000..3293f506dcc52
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -0,0 +1,1125 @@
+//===------ SBFAbstractMemberAccess.cpp - Abstracting Member Accesses -----===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This pass abstracted struct/union member accesses in order to support
+// compile-once run-everywhere (CO-RE). The CO-RE intends to compile the program
+// which can run on different kernels. In particular, if bpf program tries to
+// access a particular kernel data structure member, the details of the
+// intermediate member access will be remembered so bpf loader can do
+// necessary adjustment right before program loading.
+//
+// For example,
+//
+//   struct s {
+//     int a;
+//     int b;
+//   };
+//   struct t {
+//     struct s c;
+//     int d;
+//   };
+//   struct t e;
+//
+// For the member access e.c.b, the compiler will generate code
+//   &e + 4
+//
+// The compile-once run-everywhere instead generates the following code
+//   r = 4
+//   &e + r
+// The "4" in "r = 4" can be changed based on a particular kernel version.
+// For example, on a particular kernel version, if struct s is changed to
+//
+//   struct s {
+//     int new_field;
+//     int a;
+//     int b;
+//   }
+//
+// By repeating the member access on the host, the bpf loader can
+// adjust "r = 4" as "r = 8".
+//
+// This feature relies on the following three intrinsic calls:
+//   addr = preserve_array_access_index(base, dimension, index)
+//   addr = preserve_union_access_index(base, di_index)
+//          !llvm.preserve.access.index <union_ditype>
+//   addr = preserve_struct_access_index(base, gep_index, di_index)
+//          !llvm.preserve.access.index <struct_ditype>
+//
+// Bitfield member access needs special attention. User cannot take the
+// address of a bitfield acceess. To facilitate kernel verifier
+// for easy bitfield code optimization, a new clang intrinsic is introduced:
+//   uint32_t __builtin_preserve_field_info(member_access, info_kind)
+// In IR, a chain with two (or more) intrinsic calls will be generated:
+//   ...
+//   addr = preserve_struct_access_index(base, 1, 1) !struct s
+//   uint32_t result = bpf_preserve_field_info(addr, info_kind)
+//
+// Suppose the info_kind is FIELD_SIGNEDNESS,
+// The above two IR intrinsics will be replaced with
+// a relocatable insn:
+//   signness = /* signness of member_access */
+// and signness can be changed by bpf loader based on the
+// types on the host.
+//
+// User can also test whether a field exists or not with
+//   uint32_t result = bpf_preserve_field_info(member_access, FIELD_EXISTENCE)
+// The field will be always available (result = 1) during initial
+// compilation, but bpf loader can patch with the correct value
+// on the target host where the member_access may or may not be available
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFCORE.h"
+#include "SBFTargetMachine.h"
+#include "llvm/IR/DebugInfoMetadata.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicsBPF.h"  // TODO: jle.
+#include "llvm/IR/Module.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/User.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Pass.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+#include <stack>
+
+#define DEBUG_TYPE "sbf-abstract-member-access"
+
+namespace llvm {
+constexpr StringRef SBFCoreSharedInfo::AmaAttr;
+uint32_t SBFCoreSharedInfo::SeqNum;
+
+Instruction *SBFCoreSharedInfo::insertPassThrough(Module *M, BasicBlock *BB,
+                                                  Instruction *Input,
+                                                  Instruction *Before) {
+  Function *Fn = Intrinsic::getDeclaration(
+      M, Intrinsic::bpf_passthrough, {Input->getType(), Input->getType()});
+  Constant *SeqNumVal = ConstantInt::get(Type::getInt32Ty(BB->getContext()),
+                                         SBFCoreSharedInfo::SeqNum++);
+
+  auto *NewInst = CallInst::Create(Fn, {SeqNumVal, Input});
+  BB->getInstList().insert(Before->getIterator(), NewInst);
+  return NewInst;
+}
+} // namespace llvm
+
+using namespace llvm;
+
+namespace {
+class SBFAbstractMemberAccess final {
+public:
+  SBFAbstractMemberAccess(SBFTargetMachine *TM) : TM(TM) {}
+
+  bool run(Function &F);
+
+  struct CallInfo {
+    uint32_t Kind;
+    uint32_t AccessIndex;
+    Align RecordAlignment;
+    MDNode *Metadata;
+    Value *Base;
+  };
+  typedef std::stack<std::pair<CallInst *, CallInfo>> CallInfoStack;
+
+private:
+  enum : uint32_t {
+    SBFPreserveArrayAI = 1,
+    SBFPreserveUnionAI = 2,
+    SBFPreserveStructAI = 3,
+    SBFPreserveFieldInfoAI = 4,
+  };
+
+  TargetMachine *TM;
+  const DataLayout *DL = nullptr;
+  Module *M = nullptr;
+
+  static std::map<std::string, GlobalVariable *> GEPGlobals;
+  // A map to link preserve_*_access_index instrinsic calls.
+  std::map<CallInst *, std::pair<CallInst *, CallInfo>> AIChain;
+  // A map to hold all the base preserve_*_access_index instrinsic calls.
+  // The base call is not an input of any other preserve_*
+  // intrinsics.
+  std::map<CallInst *, CallInfo> BaseAICalls;
+
+  bool doTransformation(Function &F);
+
+  void traceAICall(CallInst *Call, CallInfo &ParentInfo);
+  void traceBitCast(BitCastInst *BitCast, CallInst *Parent,
+                    CallInfo &ParentInfo);
+  void traceGEP(GetElementPtrInst *GEP, CallInst *Parent,
+                CallInfo &ParentInfo);
+  void collectAICallChains(Function &F);
+
+  bool IsPreserveDIAccessIndexCall(const CallInst *Call, CallInfo &Cinfo);
+  bool IsValidAIChain(const MDNode *ParentMeta, uint32_t ParentAI,
+                      const MDNode *ChildMeta);
+  bool removePreserveAccessIndexIntrinsic(Function &F);
+  void replaceWithGEP(std::vector<CallInst *> &CallList,
+                      uint32_t NumOfZerosIndex, uint32_t DIIndex);
+  bool HasPreserveFieldInfoCall(CallInfoStack &CallStack);
+  void GetStorageBitRange(DIDerivedType *MemberTy, Align RecordAlignment,
+                          uint32_t &StartBitOffset, uint32_t &EndBitOffset);
+  uint32_t GetFieldInfo(uint32_t InfoKind, DICompositeType *CTy,
+                        uint32_t AccessIndex, uint32_t PatchImm,
+                        Align RecordAlignment);
+
+  Value *computeBaseAndAccessKey(CallInst *Call, CallInfo &CInfo,
+                                 std::string &AccessKey, MDNode *&BaseMeta);
+  MDNode *computeAccessKey(CallInst *Call, CallInfo &CInfo,
+                           std::string &AccessKey, bool &IsInt32Ret);
+  uint64_t getConstant(const Value *IndexValue);
+  bool transformGEPChain(CallInst *Call, CallInfo &CInfo);
+};
+
+std::map<std::string, GlobalVariable *> SBFAbstractMemberAccess::GEPGlobals;
+
+class SBFAbstractMemberAccessLegacyPass final : public FunctionPass {
+  SBFTargetMachine *TM;
+
+  bool runOnFunction(Function &F) override {
+    return SBFAbstractMemberAccess(TM).run(F);
+  }
+
+public:
+  static char ID;
+
+  // Add optional SBFTargetMachine parameter so that SBF backend can add the
+  // phase with target machine to find out the endianness. The default
+  // constructor (without parameters) is used by the pass manager for managing
+  // purposes.
+  SBFAbstractMemberAccessLegacyPass(SBFTargetMachine *TM = nullptr)
+      : FunctionPass(ID), TM(TM) {}
+};
+
+} // End anonymous namespace
+
+char SBFAbstractMemberAccessLegacyPass::ID = 0;
+INITIALIZE_PASS(SBFAbstractMemberAccessLegacyPass, DEBUG_TYPE,
+                "SBF Abstract Member Access", false, false)
+
+FunctionPass *llvm::createSBFAbstractMemberAccess(SBFTargetMachine *TM) {
+  return new SBFAbstractMemberAccessLegacyPass(TM);
+}
+
+bool SBFAbstractMemberAccess::run(Function &F) {
+  LLVM_DEBUG(dbgs() << "********** Abstract Member Accesses **********\n");
+
+  M = F.getParent();
+  if (!M)
+    return false;
+
+  // Bail out if no debug info.
+  if (M->debug_compile_units().empty())
+    return false;
+
+  DL = &M->getDataLayout();
+  return doTransformation(F);
+}
+
+static bool SkipDIDerivedTag(unsigned Tag, bool skipTypedef) {
+  if (Tag != dwarf::DW_TAG_typedef && Tag != dwarf::DW_TAG_const_type &&
+      Tag != dwarf::DW_TAG_volatile_type &&
+      Tag != dwarf::DW_TAG_restrict_type &&
+      Tag != dwarf::DW_TAG_member)
+    return false;
+  if (Tag == dwarf::DW_TAG_typedef && !skipTypedef)
+    return false;
+  return true;
+}
+
+static DIType * stripQualifiers(DIType *Ty, bool skipTypedef = true) {
+  while (auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
+    if (!SkipDIDerivedTag(DTy->getTag(), skipTypedef))
+      break;
+    Ty = DTy->getBaseType();
+  }
+  return Ty;
+}
+
+static const DIType * stripQualifiers(const DIType *Ty) {
+  while (auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
+    if (!SkipDIDerivedTag(DTy->getTag(), true))
+      break;
+    Ty = DTy->getBaseType();
+  }
+  return Ty;
+}
+
+static uint32_t calcArraySize(const DICompositeType *CTy, uint32_t StartDim) {
+  DINodeArray Elements = CTy->getElements();
+  uint32_t DimSize = 1;
+  for (uint32_t I = StartDim; I < Elements.size(); ++I) {
+    if (auto *Element = dyn_cast_or_null<DINode>(Elements[I]))
+      if (Element->getTag() == dwarf::DW_TAG_subrange_type) {
+        const DISubrange *SR = cast<DISubrange>(Element);
+        auto *CI = SR->getCount().dyn_cast<ConstantInt *>();
+        DimSize *= CI->getSExtValue();
+      }
+  }
+
+  return DimSize;
+}
+
+static Type *getBaseElementType(const CallInst *Call) {
+  // Element type is stored in an elementtype() attribute on the first param.
+  return Call->getAttributes().getParamElementType(0);
+}
+
+/// Check whether a call is a preserve_*_access_index intrinsic call or not.
+bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
+                                                          CallInfo &CInfo) {
+  if (!Call)
+    return false;
+
+  const auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
+  if (!GV)
+    return false;
+  if (GV->getName().startswith("llvm.preserve.array.access.index")) {
+    CInfo.Kind = SBFPreserveArrayAI;
+    CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
+    if (!CInfo.Metadata)
+      report_fatal_error("Missing metadata for llvm.preserve.array.access.index intrinsic");
+    CInfo.AccessIndex = getConstant(Call->getArgOperand(2));
+    CInfo.Base = Call->getArgOperand(0);
+    CInfo.RecordAlignment = DL->getABITypeAlign(getBaseElementType(Call));
+    return true;
+  }
+  if (GV->getName().startswith("llvm.preserve.union.access.index")) {
+    CInfo.Kind = SBFPreserveUnionAI;
+    CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
+    if (!CInfo.Metadata)
+      report_fatal_error("Missing metadata for llvm.preserve.union.access.index intrinsic");
+    CInfo.AccessIndex = getConstant(Call->getArgOperand(1));
+    CInfo.Base = Call->getArgOperand(0);
+    CInfo.RecordAlignment =
+        DL->getABITypeAlign(CInfo.Base->getType()->getPointerElementType());
+    return true;
+  }
+  if (GV->getName().startswith("llvm.preserve.struct.access.index")) {
+    CInfo.Kind = SBFPreserveStructAI;
+    CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
+    if (!CInfo.Metadata)
+      report_fatal_error("Missing metadata for llvm.preserve.struct.access.index intrinsic");
+    CInfo.AccessIndex = getConstant(Call->getArgOperand(2));
+    CInfo.Base = Call->getArgOperand(0);
+    CInfo.RecordAlignment = DL->getABITypeAlign(getBaseElementType(Call));
+    return true;
+  }
+  if (GV->getName().startswith("llvm.bpf.preserve.field.info")) {
+    CInfo.Kind = SBFPreserveFieldInfoAI;
+    CInfo.Metadata = nullptr;
+    // Check validity of info_kind as clang did not check this.
+    uint64_t InfoKind = getConstant(Call->getArgOperand(1));
+    if (InfoKind >= SBFCoreSharedInfo::MAX_FIELD_RELOC_KIND)
+      report_fatal_error("Incorrect info_kind for llvm.bpf.preserve.field.info intrinsic");
+    CInfo.AccessIndex = InfoKind;
+    return true;
+  }
+  if (GV->getName().startswith("llvm.bpf.preserve.type.info")) {
+    CInfo.Kind = SBFPreserveFieldInfoAI;
+    CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
+    if (!CInfo.Metadata)
+      report_fatal_error("Missing metadata for llvm.preserve.type.info intrinsic");
+    uint64_t Flag = getConstant(Call->getArgOperand(1));
+    if (Flag >= SBFCoreSharedInfo::MAX_PRESERVE_TYPE_INFO_FLAG)
+      report_fatal_error("Incorrect flag for llvm.bpf.preserve.type.info intrinsic");
+    if (Flag == SBFCoreSharedInfo::PRESERVE_TYPE_INFO_EXISTENCE)
+      CInfo.AccessIndex = SBFCoreSharedInfo::TYPE_EXISTENCE;
+    else
+      CInfo.AccessIndex = SBFCoreSharedInfo::TYPE_SIZE;
+    return true;
+  }
+  if (GV->getName().startswith("llvm.bpf.preserve.enum.value")) {
+    CInfo.Kind = SBFPreserveFieldInfoAI;
+    CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
+    if (!CInfo.Metadata)
+      report_fatal_error("Missing metadata for llvm.preserve.enum.value intrinsic");
+    uint64_t Flag = getConstant(Call->getArgOperand(2));
+    if (Flag >= SBFCoreSharedInfo::MAX_PRESERVE_ENUM_VALUE_FLAG)
+      report_fatal_error("Incorrect flag for llvm.bpf.preserve.enum.value intrinsic");
+    if (Flag == SBFCoreSharedInfo::PRESERVE_ENUM_VALUE_EXISTENCE)
+      CInfo.AccessIndex = SBFCoreSharedInfo::ENUM_VALUE_EXISTENCE;
+    else
+      CInfo.AccessIndex = SBFCoreSharedInfo::ENUM_VALUE;
+    return true;
+  }
+
+  return false;
+}
+
+void SBFAbstractMemberAccess::replaceWithGEP(std::vector<CallInst *> &CallList,
+                                             uint32_t DimensionIndex,
+                                             uint32_t GEPIndex) {
+  for (auto Call : CallList) {
+    uint32_t Dimension = 1;
+    if (DimensionIndex > 0)
+      Dimension = getConstant(Call->getArgOperand(DimensionIndex));
+
+    Constant *Zero =
+        ConstantInt::get(Type::getInt32Ty(Call->getParent()->getContext()), 0);
+    SmallVector<Value *, 4> IdxList;
+    for (unsigned I = 0; I < Dimension; ++I)
+      IdxList.push_back(Zero);
+    IdxList.push_back(Call->getArgOperand(GEPIndex));
+
+    auto *GEP = GetElementPtrInst::CreateInBounds(
+        getBaseElementType(Call), Call->getArgOperand(0), IdxList, "", Call);
+    Call->replaceAllUsesWith(GEP);
+    Call->eraseFromParent();
+  }
+}
+
+bool SBFAbstractMemberAccess::removePreserveAccessIndexIntrinsic(Function &F) {
+  std::vector<CallInst *> PreserveArrayIndexCalls;
+  std::vector<CallInst *> PreserveUnionIndexCalls;
+  std::vector<CallInst *> PreserveStructIndexCalls;
+  bool Found = false;
+
+  for (auto &BB : F)
+    for (auto &I : BB) {
+      auto *Call = dyn_cast<CallInst>(&I);
+      CallInfo CInfo;
+      if (!IsPreserveDIAccessIndexCall(Call, CInfo))
+        continue;
+
+      Found = true;
+      if (CInfo.Kind == SBFPreserveArrayAI)
+        PreserveArrayIndexCalls.push_back(Call);
+      else if (CInfo.Kind == SBFPreserveUnionAI)
+        PreserveUnionIndexCalls.push_back(Call);
+      else
+        PreserveStructIndexCalls.push_back(Call);
+    }
+
+  // do the following transformation:
+  // . addr = preserve_array_access_index(base, dimension, index)
+  //   is transformed to
+  //     addr = GEP(base, dimenion's zero's, index)
+  // . addr = preserve_union_access_index(base, di_index)
+  //   is transformed to
+  //     addr = base, i.e., all usages of "addr" are replaced by "base".
+  // . addr = preserve_struct_access_index(base, gep_index, di_index)
+  //   is transformed to
+  //     addr = GEP(base, 0, gep_index)
+  replaceWithGEP(PreserveArrayIndexCalls, 1, 2);
+  replaceWithGEP(PreserveStructIndexCalls, 0, 1);
+  for (auto Call : PreserveUnionIndexCalls) {
+    Call->replaceAllUsesWith(Call->getArgOperand(0));
+    Call->eraseFromParent();
+  }
+
+  return Found;
+}
+
+/// Check whether the access index chain is valid. We check
+/// here because there may be type casts between two
+/// access indexes. We want to ensure memory access still valid.
+bool SBFAbstractMemberAccess::IsValidAIChain(const MDNode *ParentType,
+                                             uint32_t ParentAI,
+                                             const MDNode *ChildType) {
+  if (!ChildType)
+    return true; // preserve_field_info, no type comparison needed.
+
+  const DIType *PType = stripQualifiers(cast<DIType>(ParentType));
+  const DIType *CType = stripQualifiers(cast<DIType>(ChildType));
+
+  // Child is a derived/pointer type, which is due to type casting.
+  // Pointer type cannot be in the middle of chain.
+  if (isa<DIDerivedType>(CType))
+    return false;
+
+  // Parent is a pointer type.
+  if (const auto *PtrTy = dyn_cast<DIDerivedType>(PType)) {
+    if (PtrTy->getTag() != dwarf::DW_TAG_pointer_type)
+      return false;
+    return stripQualifiers(PtrTy->getBaseType()) == CType;
+  }
+
+  // Otherwise, struct/union/array types
+  const auto *PTy = dyn_cast<DICompositeType>(PType);
+  const auto *CTy = dyn_cast<DICompositeType>(CType);
+  assert(PTy && CTy && "ParentType or ChildType is null or not composite");
+
+  uint32_t PTyTag = PTy->getTag();
+  assert(PTyTag == dwarf::DW_TAG_array_type ||
+         PTyTag == dwarf::DW_TAG_structure_type ||
+         PTyTag == dwarf::DW_TAG_union_type);
+
+  uint32_t CTyTag = CTy->getTag();
+  assert(CTyTag == dwarf::DW_TAG_array_type ||
+         CTyTag == dwarf::DW_TAG_structure_type ||
+         CTyTag == dwarf::DW_TAG_union_type);
+
+  // Multi dimensional arrays, base element should be the same
+  if (PTyTag == dwarf::DW_TAG_array_type && PTyTag == CTyTag)
+    return PTy->getBaseType() == CTy->getBaseType();
+
+  DIType *Ty;
+  if (PTyTag == dwarf::DW_TAG_array_type)
+    Ty = PTy->getBaseType();
+  else
+    Ty = dyn_cast<DIType>(PTy->getElements()[ParentAI]);
+
+  return dyn_cast<DICompositeType>(stripQualifiers(Ty)) == CTy;
+}
+
+void SBFAbstractMemberAccess::traceAICall(CallInst *Call,
+                                          CallInfo &ParentInfo) {
+  for (User *U : Call->users()) {
+    Instruction *Inst = dyn_cast<Instruction>(U);
+    if (!Inst)
+      continue;
+
+    if (auto *BI = dyn_cast<BitCastInst>(Inst)) {
+      traceBitCast(BI, Call, ParentInfo);
+    } else if (auto *CI = dyn_cast<CallInst>(Inst)) {
+      CallInfo ChildInfo;
+
+      if (IsPreserveDIAccessIndexCall(CI, ChildInfo) &&
+          IsValidAIChain(ParentInfo.Metadata, ParentInfo.AccessIndex,
+                         ChildInfo.Metadata)) {
+        AIChain[CI] = std::make_pair(Call, ParentInfo);
+        traceAICall(CI, ChildInfo);
+      } else {
+        BaseAICalls[Call] = ParentInfo;
+      }
+    } else if (auto *GI = dyn_cast<GetElementPtrInst>(Inst)) {
+      if (GI->hasAllZeroIndices())
+        traceGEP(GI, Call, ParentInfo);
+      else
+        BaseAICalls[Call] = ParentInfo;
+    } else {
+      BaseAICalls[Call] = ParentInfo;
+    }
+  }
+}
+
+void SBFAbstractMemberAccess::traceBitCast(BitCastInst *BitCast,
+                                           CallInst *Parent,
+                                           CallInfo &ParentInfo) {
+  for (User *U : BitCast->users()) {
+    Instruction *Inst = dyn_cast<Instruction>(U);
+    if (!Inst)
+      continue;
+
+    if (auto *BI = dyn_cast<BitCastInst>(Inst)) {
+      traceBitCast(BI, Parent, ParentInfo);
+    } else if (auto *CI = dyn_cast<CallInst>(Inst)) {
+      CallInfo ChildInfo;
+      if (IsPreserveDIAccessIndexCall(CI, ChildInfo) &&
+          IsValidAIChain(ParentInfo.Metadata, ParentInfo.AccessIndex,
+                         ChildInfo.Metadata)) {
+        AIChain[CI] = std::make_pair(Parent, ParentInfo);
+        traceAICall(CI, ChildInfo);
+      } else {
+        BaseAICalls[Parent] = ParentInfo;
+      }
+    } else if (auto *GI = dyn_cast<GetElementPtrInst>(Inst)) {
+      if (GI->hasAllZeroIndices())
+        traceGEP(GI, Parent, ParentInfo);
+      else
+        BaseAICalls[Parent] = ParentInfo;
+    } else {
+      BaseAICalls[Parent] = ParentInfo;
+    }
+  }
+}
+
+void SBFAbstractMemberAccess::traceGEP(GetElementPtrInst *GEP, CallInst *Parent,
+                                       CallInfo &ParentInfo) {
+  for (User *U : GEP->users()) {
+    Instruction *Inst = dyn_cast<Instruction>(U);
+    if (!Inst)
+      continue;
+
+    if (auto *BI = dyn_cast<BitCastInst>(Inst)) {
+      traceBitCast(BI, Parent, ParentInfo);
+    } else if (auto *CI = dyn_cast<CallInst>(Inst)) {
+      CallInfo ChildInfo;
+      if (IsPreserveDIAccessIndexCall(CI, ChildInfo) &&
+          IsValidAIChain(ParentInfo.Metadata, ParentInfo.AccessIndex,
+                         ChildInfo.Metadata)) {
+        AIChain[CI] = std::make_pair(Parent, ParentInfo);
+        traceAICall(CI, ChildInfo);
+      } else {
+        BaseAICalls[Parent] = ParentInfo;
+      }
+    } else if (auto *GI = dyn_cast<GetElementPtrInst>(Inst)) {
+      if (GI->hasAllZeroIndices())
+        traceGEP(GI, Parent, ParentInfo);
+      else
+        BaseAICalls[Parent] = ParentInfo;
+    } else {
+      BaseAICalls[Parent] = ParentInfo;
+    }
+  }
+}
+
+void SBFAbstractMemberAccess::collectAICallChains(Function &F) {
+  AIChain.clear();
+  BaseAICalls.clear();
+
+  for (auto &BB : F)
+    for (auto &I : BB) {
+      CallInfo CInfo;
+      auto *Call = dyn_cast<CallInst>(&I);
+      if (!IsPreserveDIAccessIndexCall(Call, CInfo) ||
+          AIChain.find(Call) != AIChain.end())
+        continue;
+
+      traceAICall(Call, CInfo);
+    }
+}
+
+uint64_t SBFAbstractMemberAccess::getConstant(const Value *IndexValue) {
+  const ConstantInt *CV = dyn_cast<ConstantInt>(IndexValue);
+  assert(CV);
+  return CV->getValue().getZExtValue();
+}
+
+/// Get the start and the end of storage offset for \p MemberTy.
+void SBFAbstractMemberAccess::GetStorageBitRange(DIDerivedType *MemberTy,
+                                                 Align RecordAlignment,
+                                                 uint32_t &StartBitOffset,
+                                                 uint32_t &EndBitOffset) {
+  uint32_t MemberBitSize = MemberTy->getSizeInBits();
+  uint32_t MemberBitOffset = MemberTy->getOffsetInBits();
+  uint32_t AlignBits = RecordAlignment.value() * 8;
+  if (RecordAlignment > 8 || MemberBitSize > AlignBits)
+    report_fatal_error("Unsupported field expression for llvm.bpf.preserve.field.info, "
+                       "requiring too big alignment");
+
+  StartBitOffset = MemberBitOffset & ~(AlignBits - 1);
+  if ((StartBitOffset + AlignBits) < (MemberBitOffset + MemberBitSize))
+    report_fatal_error("Unsupported field expression for llvm.bpf.preserve.field.info, "
+                       "cross alignment boundary");
+  EndBitOffset = StartBitOffset + AlignBits;
+}
+
+uint32_t SBFAbstractMemberAccess::GetFieldInfo(uint32_t InfoKind,
+                                               DICompositeType *CTy,
+                                               uint32_t AccessIndex,
+                                               uint32_t PatchImm,
+                                               Align RecordAlignment) {
+  if (InfoKind == SBFCoreSharedInfo::FIELD_EXISTENCE)
+      return 1;
+
+  uint32_t Tag = CTy->getTag();
+  if (InfoKind == SBFCoreSharedInfo::FIELD_BYTE_OFFSET) {
+    if (Tag == dwarf::DW_TAG_array_type) {
+      auto *EltTy = stripQualifiers(CTy->getBaseType());
+      PatchImm += AccessIndex * calcArraySize(CTy, 1) *
+                  (EltTy->getSizeInBits() >> 3);
+    } else if (Tag == dwarf::DW_TAG_structure_type) {
+      auto *MemberTy = cast<DIDerivedType>(CTy->getElements()[AccessIndex]);
+      if (!MemberTy->isBitField()) {
+        PatchImm += MemberTy->getOffsetInBits() >> 3;
+      } else {
+        unsigned SBitOffset, NextSBitOffset;
+        GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset,
+                           NextSBitOffset);
+        PatchImm += SBitOffset >> 3;
+      }
+    }
+    return PatchImm;
+  }
+
+  if (InfoKind == SBFCoreSharedInfo::FIELD_BYTE_SIZE) {
+    if (Tag == dwarf::DW_TAG_array_type) {
+      auto *EltTy = stripQualifiers(CTy->getBaseType());
+      return calcArraySize(CTy, 1) * (EltTy->getSizeInBits() >> 3);
+    } else {
+      auto *MemberTy = cast<DIDerivedType>(CTy->getElements()[AccessIndex]);
+      uint32_t SizeInBits = MemberTy->getSizeInBits();
+      if (!MemberTy->isBitField())
+        return SizeInBits >> 3;
+
+      unsigned SBitOffset, NextSBitOffset;
+      GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset, NextSBitOffset);
+      SizeInBits = NextSBitOffset - SBitOffset;
+      if (SizeInBits & (SizeInBits - 1))
+        report_fatal_error("Unsupported field expression for llvm.bpf.preserve.field.info");
+      return SizeInBits >> 3;
+    }
+  }
+
+  if (InfoKind == SBFCoreSharedInfo::FIELD_SIGNEDNESS) {
+    const DIType *BaseTy;
+    if (Tag == dwarf::DW_TAG_array_type) {
+      // Signedness only checked when final array elements are accessed.
+      if (CTy->getElements().size() != 1)
+        report_fatal_error("Invalid array expression for llvm.bpf.preserve.field.info");
+      BaseTy = stripQualifiers(CTy->getBaseType());
+    } else {
+      auto *MemberTy = cast<DIDerivedType>(CTy->getElements()[AccessIndex]);
+      BaseTy = stripQualifiers(MemberTy->getBaseType());
+    }
+
+    // Only basic types and enum types have signedness.
+    const auto *BTy = dyn_cast<DIBasicType>(BaseTy);
+    while (!BTy) {
+      const auto *CompTy = dyn_cast<DICompositeType>(BaseTy);
+      // Report an error if the field expression does not have signedness.
+      if (!CompTy || CompTy->getTag() != dwarf::DW_TAG_enumeration_type)
+        report_fatal_error("Invalid field expression for llvm.bpf.preserve.field.info");
+      BaseTy = stripQualifiers(CompTy->getBaseType());
+      BTy = dyn_cast<DIBasicType>(BaseTy);
+    }
+    uint32_t Encoding = BTy->getEncoding();
+    return (Encoding == dwarf::DW_ATE_signed || Encoding == dwarf::DW_ATE_signed_char);
+  }
+
+  if (InfoKind == SBFCoreSharedInfo::FIELD_LSHIFT_U64) {
+    // The value is loaded into a value with FIELD_BYTE_SIZE size,
+    // and then zero or sign extended to U64.
+    // FIELD_LSHIFT_U64 and FIELD_RSHIFT_U64 are operations
+    // to extract the original value.
+    const Triple &Triple = TM->getTargetTriple();
+    DIDerivedType *MemberTy = nullptr;
+    bool IsBitField = false;
+    uint32_t SizeInBits;
+
+    if (Tag == dwarf::DW_TAG_array_type) {
+      auto *EltTy = stripQualifiers(CTy->getBaseType());
+      SizeInBits = calcArraySize(CTy, 1) * EltTy->getSizeInBits();
+    } else {
+      MemberTy = cast<DIDerivedType>(CTy->getElements()[AccessIndex]);
+      SizeInBits = MemberTy->getSizeInBits();
+      IsBitField = MemberTy->isBitField();
+    }
+
+    if (!IsBitField) {
+      if (SizeInBits > 64)
+        report_fatal_error("too big field size for llvm.bpf.preserve.field.info");
+      return 64 - SizeInBits;
+    }
+
+    unsigned SBitOffset, NextSBitOffset;
+    GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset, NextSBitOffset);
+    if (NextSBitOffset - SBitOffset > 64)
+      report_fatal_error("too big field size for llvm.bpf.preserve.field.info");
+
+    unsigned OffsetInBits = MemberTy->getOffsetInBits();
+    if (Triple.getArch() == Triple::bpfel || Triple.getArch() == Triple::sbf)
+      return SBitOffset + 64 - OffsetInBits - SizeInBits;
+    else
+      return OffsetInBits + 64 - NextSBitOffset;
+  }
+
+  if (InfoKind == SBFCoreSharedInfo::FIELD_RSHIFT_U64) {
+    DIDerivedType *MemberTy = nullptr;
+    bool IsBitField = false;
+    uint32_t SizeInBits;
+    if (Tag == dwarf::DW_TAG_array_type) {
+      auto *EltTy = stripQualifiers(CTy->getBaseType());
+      SizeInBits = calcArraySize(CTy, 1) * EltTy->getSizeInBits();
+    } else {
+      MemberTy = cast<DIDerivedType>(CTy->getElements()[AccessIndex]);
+      SizeInBits = MemberTy->getSizeInBits();
+      IsBitField = MemberTy->isBitField();
+    }
+
+    if (!IsBitField) {
+      if (SizeInBits > 64)
+        report_fatal_error("too big field size for llvm.bpf.preserve.field.info");
+      return 64 - SizeInBits;
+    }
+
+    unsigned SBitOffset, NextSBitOffset;
+    GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset, NextSBitOffset);
+    if (NextSBitOffset - SBitOffset > 64)
+      report_fatal_error("too big field size for llvm.bpf.preserve.field.info");
+
+    return 64 - SizeInBits;
+  }
+
+  llvm_unreachable("Unknown llvm.bpf.preserve.field.info info kind");
+}
+
+bool SBFAbstractMemberAccess::HasPreserveFieldInfoCall(CallInfoStack &CallStack) {
+  // This is called in error return path, no need to maintain CallStack.
+  while (CallStack.size()) {
+    auto StackElem = CallStack.top();
+    if (StackElem.second.Kind == SBFPreserveFieldInfoAI)
+      return true;
+    CallStack.pop();
+  }
+  return false;
+}
+
+/// Compute the base of the whole preserve_* intrinsics chains, i.e., the base
+/// pointer of the first preserve_*_access_index call, and construct the access
+/// string, which will be the name of a global variable.
+Value *SBFAbstractMemberAccess::computeBaseAndAccessKey(CallInst *Call,
+                                                        CallInfo &CInfo,
+                                                        std::string &AccessKey,
+                                                        MDNode *&TypeMeta) {
+  Value *Base = nullptr;
+  std::string TypeName;
+  CallInfoStack CallStack;
+
+  // Put the access chain into a stack with the top as the head of the chain.
+  while (Call) {
+    CallStack.push(std::make_pair(Call, CInfo));
+    CInfo = AIChain[Call].second;
+    Call = AIChain[Call].first;
+  }
+
+  // The access offset from the base of the head of chain is also
+  // calculated here as all debuginfo types are available.
+
+  // Get type name and calculate the first index.
+  // We only want to get type name from typedef, structure or union.
+  // If user wants a relocation like
+  //    int *p; ... __builtin_preserve_access_index(&p[4]) ...
+  // or
+  //    int a[10][20]; ... __builtin_preserve_access_index(&a[2][3]) ...
+  // we will skip them.
+  uint32_t FirstIndex = 0;
+  uint32_t PatchImm = 0; // AccessOffset or the requested field info
+  uint32_t InfoKind = SBFCoreSharedInfo::FIELD_BYTE_OFFSET;
+  while (CallStack.size()) {
+    auto StackElem = CallStack.top();
+    Call = StackElem.first;
+    CInfo = StackElem.second;
+
+    if (!Base)
+      Base = CInfo.Base;
+
+    DIType *PossibleTypeDef = stripQualifiers(cast<DIType>(CInfo.Metadata),
+                                              false);
+    DIType *Ty = stripQualifiers(PossibleTypeDef);
+    if (CInfo.Kind == SBFPreserveUnionAI ||
+        CInfo.Kind == SBFPreserveStructAI) {
+      // struct or union type. If the typedef is in the metadata, always
+      // use the typedef.
+      TypeName = std::string(PossibleTypeDef->getName());
+      TypeMeta = PossibleTypeDef;
+      PatchImm += FirstIndex * (Ty->getSizeInBits() >> 3);
+      break;
+    }
+
+    assert(CInfo.Kind == SBFPreserveArrayAI);
+
+    // Array entries will always be consumed for accumulative initial index.
+    CallStack.pop();
+
+    // SBFPreserveArrayAI
+    uint64_t AccessIndex = CInfo.AccessIndex;
+
+    DIType *BaseTy = nullptr;
+    bool CheckElemType = false;
+    if (const auto *CTy = dyn_cast<DICompositeType>(Ty)) {
+      // array type
+      assert(CTy->getTag() == dwarf::DW_TAG_array_type);
+
+
+      FirstIndex += AccessIndex * calcArraySize(CTy, 1);
+      BaseTy = stripQualifiers(CTy->getBaseType());
+      CheckElemType = CTy->getElements().size() == 1;
+    } else {
+      // pointer type
+      auto *DTy = cast<DIDerivedType>(Ty);
+      assert(DTy->getTag() == dwarf::DW_TAG_pointer_type);
+
+      BaseTy = stripQualifiers(DTy->getBaseType());
+      CTy = dyn_cast<DICompositeType>(BaseTy);
+      if (!CTy) {
+        CheckElemType = true;
+      } else if (CTy->getTag() != dwarf::DW_TAG_array_type) {
+        FirstIndex += AccessIndex;
+        CheckElemType = true;
+      } else {
+        FirstIndex += AccessIndex * calcArraySize(CTy, 0);
+      }
+    }
+
+    if (CheckElemType) {
+      auto *CTy = dyn_cast<DICompositeType>(BaseTy);
+      if (!CTy) {
+        if (HasPreserveFieldInfoCall(CallStack))
+          report_fatal_error("Invalid field access for llvm.preserve.field.info intrinsic");
+        return nullptr;
+      }
+
+      unsigned CTag = CTy->getTag();
+      if (CTag == dwarf::DW_TAG_structure_type || CTag == dwarf::DW_TAG_union_type) {
+        TypeName = std::string(CTy->getName());
+      } else {
+        if (HasPreserveFieldInfoCall(CallStack))
+          report_fatal_error("Invalid field access for llvm.preserve.field.info intrinsic");
+        return nullptr;
+      }
+      TypeMeta = CTy;
+      PatchImm += FirstIndex * (CTy->getSizeInBits() >> 3);
+      break;
+    }
+  }
+  assert(TypeName.size());
+  AccessKey += std::to_string(FirstIndex);
+
+  // Traverse the rest of access chain to complete offset calculation
+  // and access key construction.
+  while (CallStack.size()) {
+    auto StackElem = CallStack.top();
+    CInfo = StackElem.second;
+    CallStack.pop();
+
+    if (CInfo.Kind == SBFPreserveFieldInfoAI) {
+      InfoKind = CInfo.AccessIndex;
+      if (InfoKind == SBFCoreSharedInfo::FIELD_EXISTENCE)
+        PatchImm = 1;
+      break;
+    }
+
+    // If the next Call (the top of the stack) is a SBFPreserveFieldInfoAI,
+    // the action will be extracting field info.
+    if (CallStack.size()) {
+      auto StackElem2 = CallStack.top();
+      CallInfo CInfo2 = StackElem2.second;
+      if (CInfo2.Kind == SBFPreserveFieldInfoAI) {
+        InfoKind = CInfo2.AccessIndex;
+        assert(CallStack.size() == 1);
+      }
+    }
+
+    // Access Index
+    uint64_t AccessIndex = CInfo.AccessIndex;
+    AccessKey += ":" + std::to_string(AccessIndex);
+
+    MDNode *MDN = CInfo.Metadata;
+    // At this stage, it cannot be pointer type.
+    auto *CTy = cast<DICompositeType>(stripQualifiers(cast<DIType>(MDN)));
+    PatchImm = GetFieldInfo(InfoKind, CTy, AccessIndex, PatchImm,
+                            CInfo.RecordAlignment);
+  }
+
+  // Access key is the
+  //   "llvm." + type name + ":" + reloc type + ":" + patched imm + "$" +
+  //   access string,
+  // uniquely identifying one relocation.
+  // The prefix "llvm." indicates this is a temporary global, which should
+  // not be emitted to ELF file.
+  AccessKey = "llvm." + TypeName + ":" + std::to_string(InfoKind) + ":" +
+              std::to_string(PatchImm) + "$" + AccessKey;
+
+  return Base;
+}
+
+MDNode *SBFAbstractMemberAccess::computeAccessKey(CallInst *Call,
+                                                  CallInfo &CInfo,
+                                                  std::string &AccessKey,
+                                                  bool &IsInt32Ret) {
+  DIType *Ty = stripQualifiers(cast<DIType>(CInfo.Metadata), false);
+  assert(!Ty->getName().empty());
+
+  int64_t PatchImm;
+  std::string AccessStr("0");
+  if (CInfo.AccessIndex == SBFCoreSharedInfo::TYPE_EXISTENCE) {
+    PatchImm = 1;
+  } else if (CInfo.AccessIndex == SBFCoreSharedInfo::TYPE_SIZE) {
+    // typedef debuginfo type has size 0, get the eventual base type.
+    DIType *BaseTy = stripQualifiers(Ty, true);
+    PatchImm = BaseTy->getSizeInBits() / 8;
+  } else {
+    // ENUM_VALUE_EXISTENCE and ENUM_VALUE
+    IsInt32Ret = false;
+
+    const auto *CE = cast<ConstantExpr>(Call->getArgOperand(1));
+    const GlobalVariable *GV = cast<GlobalVariable>(CE->getOperand(0));
+    assert(GV->hasInitializer());
+    const ConstantDataArray *DA = cast<ConstantDataArray>(GV->getInitializer());
+    assert(DA->isString());
+    StringRef ValueStr = DA->getAsString();
+
+    // ValueStr format: <EnumeratorStr>:<Value>
+    size_t Separator = ValueStr.find_first_of(':');
+    StringRef EnumeratorStr = ValueStr.substr(0, Separator);
+
+    // Find enumerator index in the debuginfo
+    DIType *BaseTy = stripQualifiers(Ty, true);
+    const auto *CTy = cast<DICompositeType>(BaseTy);
+    assert(CTy->getTag() == dwarf::DW_TAG_enumeration_type);
+    int EnumIndex = 0;
+    for (const auto Element : CTy->getElements()) {
+      const auto *Enum = cast<DIEnumerator>(Element);
+      if (Enum->getName() == EnumeratorStr) {
+        AccessStr = std::to_string(EnumIndex);
+        break;
+      }
+      EnumIndex++;
+    }
+
+    if (CInfo.AccessIndex == SBFCoreSharedInfo::ENUM_VALUE) {
+      StringRef EValueStr = ValueStr.substr(Separator + 1);
+      PatchImm = std::stoll(std::string(EValueStr));
+    } else {
+      PatchImm = 1;
+    }
+  }
+
+  AccessKey = "llvm." + Ty->getName().str() + ":" +
+              std::to_string(CInfo.AccessIndex) + std::string(":") +
+              std::to_string(PatchImm) + std::string("$") + AccessStr;
+
+  return Ty;
+}
+
+/// Call/Kind is the base preserve_*_access_index() call. Attempts to do
+/// transformation to a chain of relocable GEPs.
+bool SBFAbstractMemberAccess::transformGEPChain(CallInst *Call,
+                                                CallInfo &CInfo) {
+  std::string AccessKey;
+  MDNode *TypeMeta;
+  Value *Base = nullptr;
+  bool IsInt32Ret;
+
+  IsInt32Ret = CInfo.Kind == SBFPreserveFieldInfoAI;
+  if (CInfo.Kind == SBFPreserveFieldInfoAI && CInfo.Metadata) {
+    TypeMeta = computeAccessKey(Call, CInfo, AccessKey, IsInt32Ret);
+  } else {
+    Base = computeBaseAndAccessKey(Call, CInfo, AccessKey, TypeMeta);
+    if (!Base)
+      return false;
+  }
+
+  BasicBlock *BB = Call->getParent();
+  GlobalVariable *GV;
+
+  if (GEPGlobals.find(AccessKey) == GEPGlobals.end()) {
+    IntegerType *VarType;
+    if (IsInt32Ret)
+      VarType = Type::getInt32Ty(BB->getContext()); // 32bit return value
+    else
+      VarType = Type::getInt64Ty(BB->getContext()); // 64bit ptr or enum value
+
+    GV = new GlobalVariable(*M, VarType, false, GlobalVariable::ExternalLinkage,
+                            nullptr, AccessKey);
+    GV->addAttribute(SBFCoreSharedInfo::AmaAttr);
+    GV->setMetadata(LLVMContext::MD_preserve_access_index, TypeMeta);
+    GEPGlobals[AccessKey] = GV;
+  } else {
+    GV = GEPGlobals[AccessKey];
+  }
+
+  if (CInfo.Kind == SBFPreserveFieldInfoAI) {
+    // Load the global variable which represents the returned field info.
+    LoadInst *LDInst;
+    if (IsInt32Ret)
+      LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "", Call);
+    else
+      LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+
+    Instruction *PassThroughInst =
+        SBFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
+    Call->replaceAllUsesWith(PassThroughInst);
+    Call->eraseFromParent();
+    return true;
+  }
+
+  // For any original GEP Call and Base %2 like
+  //   %4 = bitcast %struct.net_device** %dev1 to i64*
+  // it is transformed to:
+  //   %6 = load llvm.sk_buff:0:50$0:0:0:2:0
+  //   %7 = bitcast %struct.sk_buff* %2 to i8*
+  //   %8 = getelementptr i8, i8* %7, %6
+  //   %9 = bitcast i8* %8 to i64*
+  //   using %9 instead of %4
+  // The original Call inst is removed.
+
+  // Load the global variable.
+  auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+
+  // Generate a BitCast
+  auto *BCInst = new BitCastInst(Base, Type::getInt8PtrTy(BB->getContext()));
+  BB->getInstList().insert(Call->getIterator(), BCInst);
+
+  // Generate a GetElementPtr
+  auto *GEP = GetElementPtrInst::Create(Type::getInt8Ty(BB->getContext()),
+                                        BCInst, LDInst);
+  BB->getInstList().insert(Call->getIterator(), GEP);
+
+  // Generate a BitCast
+  auto *BCInst2 = new BitCastInst(GEP, Call->getType());
+  BB->getInstList().insert(Call->getIterator(), BCInst2);
+
+  // For the following code,
+  //    Block0:
+  //      ...
+  //      if (...) goto Block1 else ...
+  //    Block1:
+  //      %6 = load llvm.sk_buff:0:50$0:0:0:2:0
+  //      %7 = bitcast %struct.sk_buff* %2 to i8*
+  //      %8 = getelementptr i8, i8* %7, %6
+  //      ...
+  //      goto CommonExit
+  //    Block2:
+  //      ...
+  //      if (...) goto Block3 else ...
+  //    Block3:
+  //      %6 = load llvm.bpf_map:0:40$0:0:0:2:0
+  //      %7 = bitcast %struct.sk_buff* %2 to i8*
+  //      %8 = getelementptr i8, i8* %7, %6
+  //      ...
+  //      goto CommonExit
+  //    CommonExit
+  // SimplifyCFG may generate:
+  //    Block0:
+  //      ...
+  //      if (...) goto Block_Common else ...
+  //     Block2:
+  //       ...
+  //      if (...) goto Block_Common else ...
+  //    Block_Common:
+  //      PHI = [llvm.sk_buff:0:50$0:0:0:2:0, llvm.bpf_map:0:40$0:0:0:2:0]
+  //      %6 = load PHI
+  //      %7 = bitcast %struct.sk_buff* %2 to i8*
+  //      %8 = getelementptr i8, i8* %7, %6
+  //      ...
+  //      goto CommonExit
+  //  For the above code, we cannot perform proper relocation since
+  //  "load PHI" has two possible relocations.
+  //
+  // To prevent above tail merging, we use __builtin_bpf_passthrough()
+  // where one of its parameters is a seq_num. Since two
+  // __builtin_bpf_passthrough() funcs will always have different seq_num,
+  // tail merging cannot happen. The __builtin_bpf_passthrough() will be
+  // removed in the beginning of Target IR passes.
+  //
+  // This approach is also used in other places when global var
+  // representing a relocation is used.
+  Instruction *PassThroughInst =
+      SBFCoreSharedInfo::insertPassThrough(M, BB, BCInst2, Call);
+  Call->replaceAllUsesWith(PassThroughInst);
+  Call->eraseFromParent();
+
+  return true;
+}
+
+bool SBFAbstractMemberAccess::doTransformation(Function &F) {
+  bool Transformed = false;
+
+  // Collect PreserveDIAccessIndex Intrinsic call chains.
+  // The call chains will be used to generate the access
+  // patterns similar to GEP.
+  collectAICallChains(F);
+
+  for (auto &C : BaseAICalls)
+    Transformed = transformGEPChain(C.first, C.second) || Transformed;
+
+  return removePreserveAccessIndexIntrinsic(F) || Transformed;
+}
+
+PreservedAnalyses
+SBFAbstractMemberAccessPass::run(Function &F, FunctionAnalysisManager &AM) {
+  return SBFAbstractMemberAccess(TM).run(F) ? PreservedAnalyses::none()
+                                            : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
new file mode 100644
index 0000000000000..dd13f7af8c052
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -0,0 +1,387 @@
+//===---------------- SBFAdjustOpt.cpp - Adjust Optimization --------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Adjust optimization to make the code more kernel verifier friendly.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFCORE.h"
+#include "SBFTargetMachine.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicsBPF.h" // TODO: jle.
+#include "llvm/IR/Module.h"
+#include "llvm/IR/PatternMatch.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/User.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Pass.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+
+#define DEBUG_TYPE "sbf-adjust-opt"
+
+using namespace llvm;
+using namespace llvm::PatternMatch;
+
+static cl::opt<bool>
+    DisableSBFserializeICMP("sbf-disable-serialize-icmp", cl::Hidden,
+                            cl::desc("SBF: Disable Serializing ICMP insns."),
+                            cl::init(false));
+
+static cl::opt<bool> DisableSBFavoidSpeculation(
+    "sbf-disable-avoid-speculation", cl::Hidden,
+    cl::desc("SBF: Disable Avoiding Speculative Code Motion."),
+    cl::init(false));
+
+namespace {
+
+class SBFAdjustOpt final : public ModulePass {
+public:
+  static char ID;
+
+  SBFAdjustOpt() : ModulePass(ID) {}
+  bool runOnModule(Module &M) override;
+};
+
+class SBFAdjustOptImpl {
+  struct PassThroughInfo {
+    Instruction *Input;
+    Instruction *UsedInst;
+    uint32_t OpIdx;
+    PassThroughInfo(Instruction *I, Instruction *U, uint32_t Idx)
+        : Input(I), UsedInst(U), OpIdx(Idx) {}
+  };
+
+public:
+  SBFAdjustOptImpl(Module *M) : M(M) {}
+
+  bool run();
+
+private:
+  Module *M;
+  SmallVector<PassThroughInfo, 16> PassThroughs;
+
+  bool adjustICmpToBuiltin();
+  void adjustBasicBlock(BasicBlock &BB);
+  bool serializeICMPCrossBB(BasicBlock &BB);
+  void adjustInst(Instruction &I);
+  bool serializeICMPInBB(Instruction &I);
+  bool avoidSpeculation(Instruction &I);
+  bool insertPassThrough();
+};
+
+} // End anonymous namespace
+
+char SBFAdjustOpt::ID = 0;
+INITIALIZE_PASS(SBFAdjustOpt, "sbf-adjust-opt", "SBF Adjust Optimization",
+                false, false)
+
+ModulePass *llvm::createSBFAdjustOpt() { return new SBFAdjustOpt(); }
+
+bool SBFAdjustOpt::runOnModule(Module &M) { return SBFAdjustOptImpl(&M).run(); }
+
+bool SBFAdjustOptImpl::run() {
+  bool Changed = adjustICmpToBuiltin();
+
+  for (Function &F : *M)
+    for (auto &BB : F) {
+      adjustBasicBlock(BB);
+      for (auto &I : BB)
+        adjustInst(I);
+    }
+  return insertPassThrough() || Changed;
+}
+
+// Commit acabad9ff6bf ("[InstCombine] try to canonicalize icmp with
+// trunc op into mask and cmp") added a transformation to
+// convert "(conv)a < power_2_const" to "a & <const>" in certain
+// cases and bpf kernel verifier has to handle the resulted code
+// conservatively and this may reject otherwise legitimate program.
+// Here, we change related icmp code to a builtin which will
+// be restored to original icmp code later to prevent that
+// InstCombine transformatin.
+bool SBFAdjustOptImpl::adjustICmpToBuiltin() {
+  bool Changed = false;
+  ICmpInst *ToBeDeleted = nullptr;
+  for (Function &F : *M)
+    for (auto &BB : F)
+      for (auto &I : BB) {
+        if (ToBeDeleted) {
+          ToBeDeleted->eraseFromParent();
+          ToBeDeleted = nullptr;
+        }
+
+        auto *Icmp = dyn_cast<ICmpInst>(&I);
+        if (!Icmp)
+          continue;
+
+        Value *Op0 = Icmp->getOperand(0);
+        if (!isa<TruncInst>(Op0))
+          continue;
+
+        auto ConstOp1 = dyn_cast<ConstantInt>(Icmp->getOperand(1));
+        if (!ConstOp1)
+          continue;
+
+        auto ConstOp1Val = ConstOp1->getValue().getZExtValue();
+        auto Op = Icmp->getPredicate();
+        if (Op == ICmpInst::ICMP_ULT || Op == ICmpInst::ICMP_UGE) {
+          if ((ConstOp1Val - 1) & ConstOp1Val)
+            continue;
+        } else if (Op == ICmpInst::ICMP_ULE || Op == ICmpInst::ICMP_UGT) {
+          if (ConstOp1Val & (ConstOp1Val + 1))
+            continue;
+        } else {
+          continue;
+        }
+
+        Constant *Opcode =
+            ConstantInt::get(Type::getInt32Ty(BB.getContext()), Op);
+        Function *Fn = Intrinsic::getDeclaration(
+            M, Intrinsic::bpf_compare, {Op0->getType(), ConstOp1->getType()});
+        auto *NewInst = CallInst::Create(Fn, {Opcode, Op0, ConstOp1});
+        BB.getInstList().insert(I.getIterator(), NewInst);
+        Icmp->replaceAllUsesWith(NewInst);
+        Changed = true;
+        ToBeDeleted = Icmp;
+      }
+
+  return Changed;
+}
+
+bool SBFAdjustOptImpl::insertPassThrough() {
+  for (auto &Info : PassThroughs) {
+    auto *CI = SBFCoreSharedInfo::insertPassThrough(
+        M, Info.UsedInst->getParent(), Info.Input, Info.UsedInst);
+    Info.UsedInst->setOperand(Info.OpIdx, CI);
+  }
+
+  return !PassThroughs.empty();
+}
+
+// To avoid combining conditionals in the same basic block by
+// instrcombine optimization.
+bool SBFAdjustOptImpl::serializeICMPInBB(Instruction &I) {
+  // For:
+  //   comp1 = icmp <opcode> ...;
+  //   comp2 = icmp <opcode> ...;
+  //   ... or comp1 comp2 ...
+  // changed to:
+  //   comp1 = icmp <opcode> ...;
+  //   comp2 = icmp <opcode> ...;
+  //   new_comp1 = __builtin_bpf_passthrough(seq_num, comp1)
+  //   ... or new_comp1 comp2 ...
+  Value *Op0, *Op1;
+  // Use LogicalOr (accept `or i1` as well as `select i1 Op0, true, Op1`)
+  if (!match(&I, m_LogicalOr(m_Value(Op0), m_Value(Op1))))
+    return false;
+  auto *Icmp1 = dyn_cast<ICmpInst>(Op0);
+  if (!Icmp1)
+    return false;
+  auto *Icmp2 = dyn_cast<ICmpInst>(Op1);
+  if (!Icmp2)
+    return false;
+
+  Value *Icmp1Op0 = Icmp1->getOperand(0);
+  Value *Icmp2Op0 = Icmp2->getOperand(0);
+  if (Icmp1Op0 != Icmp2Op0)
+    return false;
+
+  // Now we got two icmp instructions which feed into
+  // an "or" instruction.
+  PassThroughInfo Info(Icmp1, &I, 0);
+  PassThroughs.push_back(Info);
+  return true;
+}
+
+// To avoid combining conditionals in the same basic block by
+// instrcombine optimization.
+bool SBFAdjustOptImpl::serializeICMPCrossBB(BasicBlock &BB) {
+  // For:
+  //   B1:
+  //     comp1 = icmp <opcode> ...;
+  //     if (comp1) goto B2 else B3;
+  //   B2:
+  //     comp2 = icmp <opcode> ...;
+  //     if (comp2) goto B4 else B5;
+  //   B4:
+  //     ...
+  // changed to:
+  //   B1:
+  //     comp1 = icmp <opcode> ...;
+  //     comp1 = __builtin_bpf_passthrough(seq_num, comp1);
+  //     if (comp1) goto B2 else B3;
+  //   B2:
+  //     comp2 = icmp <opcode> ...;
+  //     if (comp2) goto B4 else B5;
+  //   B4:
+  //     ...
+
+  // Check basic predecessors, if two of them (say B1, B2) are using
+  // icmp instructions to generate conditions and one is the predesessor
+  // of another (e.g., B1 is the predecessor of B2). Add a passthrough
+  // barrier after icmp inst of block B1.
+  BasicBlock *B2 = BB.getSinglePredecessor();
+  if (!B2)
+    return false;
+
+  BasicBlock *B1 = B2->getSinglePredecessor();
+  if (!B1)
+    return false;
+
+  Instruction *TI = B2->getTerminator();
+  auto *BI = dyn_cast<BranchInst>(TI);
+  if (!BI || !BI->isConditional())
+    return false;
+  auto *Cond = dyn_cast<ICmpInst>(BI->getCondition());
+  if (!Cond || B2->getFirstNonPHI() != Cond)
+    return false;
+  Value *B2Op0 = Cond->getOperand(0);
+  auto Cond2Op = Cond->getPredicate();
+
+  TI = B1->getTerminator();
+  BI = dyn_cast<BranchInst>(TI);
+  if (!BI || !BI->isConditional())
+    return false;
+  Cond = dyn_cast<ICmpInst>(BI->getCondition());
+  if (!Cond)
+    return false;
+  Value *B1Op0 = Cond->getOperand(0);
+  auto Cond1Op = Cond->getPredicate();
+
+  if (B1Op0 != B2Op0)
+    return false;
+
+  if (Cond1Op == ICmpInst::ICMP_SGT || Cond1Op == ICmpInst::ICMP_SGE) {
+    if (Cond2Op != ICmpInst::ICMP_SLT && Cond1Op != ICmpInst::ICMP_SLE)
+      return false;
+  } else if (Cond1Op == ICmpInst::ICMP_SLT || Cond1Op == ICmpInst::ICMP_SLE) {
+    if (Cond2Op != ICmpInst::ICMP_SGT && Cond1Op != ICmpInst::ICMP_SGE)
+      return false;
+  } else {
+    return false;
+  }
+
+  PassThroughInfo Info(Cond, BI, 0);
+  PassThroughs.push_back(Info);
+
+  return true;
+}
+
+// To avoid speculative hoisting certain computations out of
+// a basic block.
+bool SBFAdjustOptImpl::avoidSpeculation(Instruction &I) {
+  if (auto *LdInst = dyn_cast<LoadInst>(&I)) {
+    if (auto *GV = dyn_cast<GlobalVariable>(LdInst->getOperand(0))) {
+      if (GV->hasAttribute(SBFCoreSharedInfo::AmaAttr) ||
+          GV->hasAttribute(SBFCoreSharedInfo::TypeIdAttr))
+        return false;
+    }
+  }
+
+  if (!isa<LoadInst>(&I) && !isa<CallInst>(&I))
+    return false;
+
+  // For:
+  //   B1:
+  //     var = ...
+  //     ...
+  //     /* icmp may not be in the same block as var = ... */
+  //     comp1 = icmp <opcode> var, <const>;
+  //     if (comp1) goto B2 else B3;
+  //   B2:
+  //     ... var ...
+  // change to:
+  //   B1:
+  //     var = ...
+  //     ...
+  //     /* icmp may not be in the same block as var = ... */
+  //     comp1 = icmp <opcode> var, <const>;
+  //     if (comp1) goto B2 else B3;
+  //   B2:
+  //     var = __builtin_bpf_passthrough(seq_num, var);
+  //     ... var ...
+  bool isCandidate = false;
+  SmallVector<PassThroughInfo, 4> Candidates;
+  for (User *U : I.users()) {
+    Instruction *Inst = dyn_cast<Instruction>(U);
+    if (!Inst)
+      continue;
+
+    // May cover a little bit more than the
+    // above pattern.
+    if (auto *Icmp1 = dyn_cast<ICmpInst>(Inst)) {
+      Value *Icmp1Op1 = Icmp1->getOperand(1);
+      if (!isa<Constant>(Icmp1Op1))
+        return false;
+      isCandidate = true;
+      continue;
+    }
+
+    // Ignore the use in the same basic block as the definition.
+    if (Inst->getParent() == I.getParent())
+      continue;
+
+    // use in a different basic block, If there is a call or
+    // load/store insn before this instruction in this basic
+    // block. Most likely it cannot be hoisted out. Skip it.
+    for (auto &I2 : *Inst->getParent()) {
+      if (isa<CallInst>(&I2))
+        return false;
+      if (isa<LoadInst>(&I2) || isa<StoreInst>(&I2))
+        return false;
+      if (&I2 == Inst)
+        break;
+    }
+
+    // It should be used in a GEP or a simple arithmetic like
+    // ZEXT/SEXT which is used for GEP.
+    if (Inst->getOpcode() == Instruction::ZExt ||
+        Inst->getOpcode() == Instruction::SExt) {
+      PassThroughInfo Info(&I, Inst, 0);
+      Candidates.push_back(Info);
+    } else if (auto *GI = dyn_cast<GetElementPtrInst>(Inst)) {
+      // traverse GEP inst to find Use operand index
+      unsigned i, e;
+      for (i = 1, e = GI->getNumOperands(); i != e; ++i) {
+        Value *V = GI->getOperand(i);
+        if (V == &I)
+          break;
+      }
+      if (i == e)
+        continue;
+
+      PassThroughInfo Info(&I, GI, i);
+      Candidates.push_back(Info);
+    }
+  }
+
+  if (!isCandidate || Candidates.empty())
+    return false;
+
+  llvm::append_range(PassThroughs, Candidates);
+  return true;
+}
+
+void SBFAdjustOptImpl::adjustBasicBlock(BasicBlock &BB) {
+  if (!DisableSBFserializeICMP && serializeICMPCrossBB(BB))
+    return;
+}
+
+void SBFAdjustOptImpl::adjustInst(Instruction &I) {
+  if (!DisableSBFserializeICMP && serializeICMPInBB(I))
+    return;
+  if (!DisableSBFavoidSpeculation && avoidSpeculation(I))
+    return;
+}
+
+PreservedAnalyses SBFAdjustOptPass::run(Module &M, ModuleAnalysisManager &AM) {
+  return SBFAdjustOptImpl(&M).run() ? PreservedAnalyses::none()
+                                    : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
new file mode 100644
index 0000000000000..d9d58753fab27
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -0,0 +1,156 @@
+//===-- SBFAsmPrinter.cpp - SBF LLVM assembly writer ----------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains a printer that converts from our internal representation
+// of machine-dependent LLVM code to the SBF assembly language.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFInstrInfo.h"
+#include "SBFMCInstLower.h"
+#include "SBFTargetMachine.h"
+#include "BTFDebug.h"
+#include "MCTargetDesc/SBFInstPrinter.h"
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "TargetInfo/SBFTargetInfo.h"
+#include "llvm/CodeGen/AsmPrinter.h"
+#include "llvm/CodeGen/MachineConstantPool.h"
+#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCStreamer.h"
+#include "llvm/MC/MCSymbol.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/raw_ostream.h"
+using namespace llvm;
+
+#define DEBUG_TYPE "asm-printer"
+
+namespace {
+class SBFAsmPrinter : public AsmPrinter {
+public:
+  explicit SBFAsmPrinter(TargetMachine &TM,
+                         std::unique_ptr<MCStreamer> Streamer)
+      : AsmPrinter(TM, std::move(Streamer)), BTF(nullptr) {}
+
+  StringRef getPassName() const override { return "SBF Assembly Printer"; }
+  bool doInitialization(Module &M) override;
+  void printOperand(const MachineInstr *MI, int OpNum, raw_ostream &O);
+  bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
+                       const char *ExtraCode, raw_ostream &O) override;
+  bool PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNum,
+                             const char *ExtraCode, raw_ostream &O) override;
+
+  void emitInstruction(const MachineInstr *MI) override;
+
+private:
+  BTFX::BTFDebug *BTF;
+};
+} // namespace
+
+bool SBFAsmPrinter::doInitialization(Module &M) {
+  AsmPrinter::doInitialization(M);
+
+  // Only emit BTF when debuginfo available.
+  // Unsupported for Solana: https://github.com/solana-labs/llvm-project/issues/37
+  if (MAI->doesSupportDebugInformation() && !M.debug_compile_units().empty() &&
+      !TM.getMCSubtargetInfo()->hasFeature(SBF::FeatureSolana) && TM.getTargetTriple().getArch() != Triple::sbf) {
+    BTF = new BTFX::BTFDebug(this);
+    Handlers.push_back(HandlerInfo(std::unique_ptr<BTFX::BTFDebug>(BTF), "emit",
+                                   "Debug Info Emission", "BTF",
+                                   "BTF Emission"));
+  }
+
+  return false;
+}
+
+void SBFAsmPrinter::printOperand(const MachineInstr *MI, int OpNum,
+                                 raw_ostream &O) {
+  const MachineOperand &MO = MI->getOperand(OpNum);
+
+  switch (MO.getType()) {
+  case MachineOperand::MO_Register:
+    O << SBFInstPrinter::getRegisterName(MO.getReg());
+    break;
+
+  case MachineOperand::MO_Immediate:
+    O << MO.getImm();
+    break;
+
+  case MachineOperand::MO_MachineBasicBlock:
+    O << *MO.getMBB()->getSymbol();
+    break;
+
+  case MachineOperand::MO_GlobalAddress:
+    O << *getSymbol(MO.getGlobal());
+    break;
+
+  case MachineOperand::MO_BlockAddress: {
+    MCSymbol *BA = GetBlockAddressSymbol(MO.getBlockAddress());
+    O << BA->getName();
+    break;
+  }
+
+  case MachineOperand::MO_ExternalSymbol:
+    O << *GetExternalSymbolSymbol(MO.getSymbolName());
+    break;
+
+  case MachineOperand::MO_JumpTableIndex:
+  case MachineOperand::MO_ConstantPoolIndex:
+  default:
+    llvm_unreachable("<unknown operand type>");
+  }
+}
+
+bool SBFAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
+                                    const char *ExtraCode, raw_ostream &O) {
+  if (ExtraCode && ExtraCode[0])
+    return AsmPrinter::PrintAsmOperand(MI, OpNo, ExtraCode, O);
+
+  printOperand(MI, OpNo, O);
+  return false;
+}
+
+bool SBFAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
+                                          unsigned OpNum, const char *ExtraCode,
+                                          raw_ostream &O) {
+  assert(OpNum + 1 < MI->getNumOperands() && "Insufficient operands");
+  const MachineOperand &BaseMO = MI->getOperand(OpNum);
+  const MachineOperand &OffsetMO = MI->getOperand(OpNum + 1);
+  assert(BaseMO.isReg() && "Unexpected base pointer for inline asm memory operand.");
+  assert(OffsetMO.isImm() && "Unexpected offset for inline asm memory operand.");
+  int Offset = OffsetMO.getImm();
+
+  if (ExtraCode)
+    return true; // Unknown modifier.
+
+  if (Offset < 0)
+    O << "(" << SBFInstPrinter::getRegisterName(BaseMO.getReg()) << " - " << -Offset << ")";
+  else
+    O << "(" << SBFInstPrinter::getRegisterName(BaseMO.getReg()) << " + " << Offset << ")";
+
+  return false;
+}
+
+void SBFAsmPrinter::emitInstruction(const MachineInstr *MI) {
+  MCInst TmpInst;
+
+  if (!BTF || !BTF->InstLower(MI, TmpInst)) {
+    SBFMCInstLower MCInstLowering(OutContext, *this);
+    MCInstLowering.Lower(MI, TmpInst);
+  }
+  EmitToStreamer(*OutStreamer, TmpInst);
+}
+
+// Force static initialization.
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFAsmPrinter() {
+  RegisterAsmPrinter<SBFAsmPrinter> XX(getTheSBFXTarget());
+}
diff --git a/llvm/lib/Target/SBF/SBFCORE.h b/llvm/lib/Target/SBF/SBFCORE.h
new file mode 100644
index 0000000000000..a73789a4bc353
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFCORE.h
@@ -0,0 +1,76 @@
+//===- SBFCORE.h - Common info for Compile-Once Run-EveryWhere  -*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFCORE_H
+#define LLVM_LIB_TARGET_SBF_SBFCORE_H
+
+#include "llvm/ADT/StringRef.h"
+
+namespace llvm {
+
+class BasicBlock;
+class Instruction;
+class Module;
+
+class SBFCoreSharedInfo {
+public:
+  enum PatchableRelocKind : uint32_t {
+    FIELD_BYTE_OFFSET = 0,
+    FIELD_BYTE_SIZE,
+    FIELD_EXISTENCE,
+    FIELD_SIGNEDNESS,
+    FIELD_LSHIFT_U64,
+    FIELD_RSHIFT_U64,
+    BTF_TYPE_ID_LOCAL,
+    BTF_TYPE_ID_REMOTE,
+    TYPE_EXISTENCE,
+    TYPE_SIZE,
+    ENUM_VALUE_EXISTENCE,
+    ENUM_VALUE,
+
+    MAX_FIELD_RELOC_KIND,
+  };
+
+  enum BTFTypeIdFlag : uint32_t {
+    BTF_TYPE_ID_LOCAL_RELOC = 0,
+    BTF_TYPE_ID_REMOTE_RELOC,
+
+    MAX_BTF_TYPE_ID_FLAG,
+  };
+
+  enum PreserveTypeInfo : uint32_t {
+    PRESERVE_TYPE_INFO_EXISTENCE = 0,
+    PRESERVE_TYPE_INFO_SIZE,
+
+    MAX_PRESERVE_TYPE_INFO_FLAG,
+  };
+
+  enum PreserveEnumValue : uint32_t {
+    PRESERVE_ENUM_VALUE_EXISTENCE = 0,
+    PRESERVE_ENUM_VALUE,
+
+    MAX_PRESERVE_ENUM_VALUE_FLAG,
+  };
+
+  /// The attribute attached to globals representing a field access
+  static constexpr StringRef AmaAttr = "btf_ama";
+  /// The attribute attached to globals representing a type id
+  static constexpr StringRef TypeIdAttr = "btf_type_id";
+
+  /// llvm.bpf.passthrough builtin seq number
+  static uint32_t SeqNum;
+
+  /// Insert a bpf passthrough builtin function.
+  static Instruction *insertPassThrough(Module *M, BasicBlock *BB,
+                                        Instruction *Input,
+                                        Instruction *Before);
+};
+
+} // namespace llvm
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFCallingConv.td b/llvm/lib/Target/SBF/SBFCallingConv.td
new file mode 100644
index 0000000000000..877c8bdb92c82
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFCallingConv.td
@@ -0,0 +1,68 @@
+//===-- SBFCallingConv.td - Calling Conventions SBF --------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This describes the calling conventions for the SBF architecture.
+//
+//===----------------------------------------------------------------------===//
+
+// SBF 64-bit C return-value convention.
+def RetCC_SBF64 : CallingConv<[CCIfType<[i64], CCAssignToReg<[R0]>>]>;
+
+// SBF 64-bit C Calling convention.
+def CC_SBF64 : CallingConv<[
+  // Promote i8/i16/i32 args to i64
+  CCIfType<[ i8, i16, i32 ], CCPromoteToType<i64>>,
+
+  // All arguments get passed in integer registers if there is space.
+  CCIfType<[i64], CCAssignToReg<[ R1, R2, R3, R4, R5 ]>>,
+
+  // Could be assigned to the stack in 8-byte aligned units, but unsupported
+  CCAssignToStack<8, 8>
+]>;
+
+def CC_SBF64_X : CallingConv<[
+  CCIfType<[ i8, i16, i32 ], CCPromoteToType<i64>>,
+
+  // Skip R5 register, reserved for passing frame pointer.
+  CCIfType<[i64], CCAssignToReg<[R1, R2, R3, R4]>>,
+
+  CCAssignToStack<8, 8>
+]>;
+
+// Return-value convention when -mattr=+alu32 enabled
+def RetCC_SBF32 : CallingConv<[
+  CCIfType<[i32], CCAssignToRegWithShadow<[W0], [R0]>>,
+  CCIfType<[i64], CCAssignToRegWithShadow<[R0], [W0]>>
+]>;
+
+// Calling convention when -mattr=+alu32 enabled
+def CC_SBF32 : CallingConv<[
+  // Promote i8/i16/i32 args to i64
+  CCIfType<[i32], CCAssignToRegWithShadow<[W1, W2, W3, W4, W5],
+                                          [R1, R2, R3, R4, R5]>>,
+
+  // All arguments get passed in integer registers if there is space.
+  CCIfType<[i64], CCAssignToRegWithShadow<[R1, R2, R3, R4, R5],
+                                          [W1, W2, W3, W4, W5]>>,
+
+  // Could be assigned to the stack in 8-byte aligned units, but unsupported
+  CCAssignToStack<8, 8>
+]>;
+
+def CC_SBF32_X : CallingConv<[
+  // Skip R5 register, reserved for passing frame pointer.
+  CCIfType<[i32], CCAssignToRegWithShadow<[W1, W2, W3, W4],
+                                          [R1, R2, R3, R4]>>,
+
+  CCIfType<[i64], CCAssignToRegWithShadow<[R1, R2, R3, R4],
+                                          [W1, W2, W3, W4]>>,
+
+  CCAssignToStack<8, 8>
+]>;
+
+def CSR : CalleeSavedRegs<(add R6, R7, R8, R9, R10)>;
diff --git a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
new file mode 100644
index 0000000000000..50dce7a2e21b2
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
@@ -0,0 +1,173 @@
+//===------------ SBFCheckAndAdjustIR.cpp - Check and Adjust IR -----------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Check IR and adjust IR for verifier friendly codes.
+// The following are done for IR checking:
+//   - no relocation globals in PHI node.
+// The following are done for IR adjustment:
+//   - remove __builtin_bpf_passthrough builtins. Target independent IR
+//     optimizations are done and those builtins can be removed.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFCORE.h"
+#include "SBFTargetMachine.h"
+#include "llvm/IR/DebugInfoMetadata.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/User.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Pass.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+
+#define DEBUG_TYPE "sbf-check-and-opt-ir"
+
+using namespace llvm;
+
+namespace {
+
+class SBFCheckAndAdjustIR final : public ModulePass {
+  bool runOnModule(Module &F) override;
+
+public:
+  static char ID;
+  SBFCheckAndAdjustIR() : ModulePass(ID) {}
+
+private:
+  void checkIR(Module &M);
+  bool adjustIR(Module &M);
+  bool removePassThroughBuiltin(Module &M);
+  bool removeCompareBuiltin(Module &M);
+};
+} // End anonymous namespace
+
+char SBFCheckAndAdjustIR::ID = 0;
+INITIALIZE_PASS(SBFCheckAndAdjustIR, DEBUG_TYPE, "SBF Check And Adjust IR",
+                false, false)
+
+ModulePass *llvm::createSBFCheckAndAdjustIR() {
+  return new SBFCheckAndAdjustIR();
+}
+
+void SBFCheckAndAdjustIR::checkIR(Module &M) {
+  // Ensure relocation global won't appear in PHI node
+  // This may happen if the compiler generated the following code:
+  //   B1:
+  //      g1 = @llvm.skb_buff:0:1...
+  //      ...
+  //      goto B_COMMON
+  //   B2:
+  //      g2 = @llvm.skb_buff:0:2...
+  //      ...
+  //      goto B_COMMON
+  //   B_COMMON:
+  //      g = PHI(g1, g2)
+  //      x = load g
+  //      ...
+  // If anything likes the above "g = PHI(g1, g2)", issue a fatal error.
+  for (Function &F : M)
+    for (auto &BB : F)
+      for (auto &I : BB) {
+        PHINode *PN = dyn_cast<PHINode>(&I);
+        if (!PN || PN->use_empty())
+          continue;
+        for (int i = 0, e = PN->getNumIncomingValues(); i < e; ++i) {
+          auto *GV = dyn_cast<GlobalVariable>(PN->getIncomingValue(i));
+          if (!GV)
+            continue;
+          if (GV->hasAttribute(SBFCoreSharedInfo::AmaAttr) ||
+              GV->hasAttribute(SBFCoreSharedInfo::TypeIdAttr))
+            report_fatal_error("relocation global in PHI node");
+        }
+      }
+}
+
+bool SBFCheckAndAdjustIR::removePassThroughBuiltin(Module &M) {
+  // Remove __builtin_bpf_passthrough()'s which are used to prevent
+  // certain IR optimizations. Now major IR optimizations are done,
+  // remove them.
+  bool Changed = false;
+  CallInst *ToBeDeleted = nullptr;
+  for (Function &F : M)
+    for (auto &BB : F)
+      for (auto &I : BB) {
+        if (ToBeDeleted) {
+          ToBeDeleted->eraseFromParent();
+          ToBeDeleted = nullptr;
+        }
+
+        auto *Call = dyn_cast<CallInst>(&I);
+        if (!Call)
+          continue;
+        auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
+        if (!GV)
+          continue;
+        if (!GV->getName().startswith("llvm.bpf.passthrough"))
+          continue;
+        Changed = true;
+        Value *Arg = Call->getArgOperand(1);
+        Call->replaceAllUsesWith(Arg);
+        ToBeDeleted = Call;
+      }
+  return Changed;
+}
+
+bool SBFCheckAndAdjustIR::removeCompareBuiltin(Module &M) {
+  // Remove __builtin_bpf_compare()'s which are used to prevent
+  // certain IR optimizations. Now major IR optimizations are done,
+  // remove them.
+  bool Changed = false;
+  CallInst *ToBeDeleted = nullptr;
+  for (Function &F : M)
+    for (auto &BB : F)
+      for (auto &I : BB) {
+        if (ToBeDeleted) {
+          ToBeDeleted->eraseFromParent();
+          ToBeDeleted = nullptr;
+        }
+
+        auto *Call = dyn_cast<CallInst>(&I);
+        if (!Call)
+          continue;
+        auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
+        if (!GV)
+          continue;
+        if (!GV->getName().startswith("llvm.bpf.compare"))
+          continue;
+
+        Changed = true;
+        Value *Arg0 = Call->getArgOperand(0);
+        Value *Arg1 = Call->getArgOperand(1);
+        Value *Arg2 = Call->getArgOperand(2);
+
+        auto OpVal = cast<ConstantInt>(Arg0)->getValue().getZExtValue();
+        CmpInst::Predicate Opcode = (CmpInst::Predicate)OpVal;
+
+        auto *ICmp = new ICmpInst(Opcode, Arg1, Arg2);
+        BB.getInstList().insert(Call->getIterator(), ICmp);
+
+        Call->replaceAllUsesWith(ICmp);
+        ToBeDeleted = Call;
+      }
+  return Changed;
+}
+
+bool SBFCheckAndAdjustIR::adjustIR(Module &M) {
+  bool Changed = removePassThroughBuiltin(M);
+  Changed = removeCompareBuiltin(M) || Changed;
+  return Changed;
+}
+
+bool SBFCheckAndAdjustIR::runOnModule(Module &M) {
+  checkIR(M);
+  return adjustIR(M);
+}
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.cpp b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
new file mode 100644
index 0000000000000..f893e7f073e18
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
@@ -0,0 +1,70 @@
+//===-- SBFFrameLowering.cpp - SBF Frame Information ----------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the SBF implementation of TargetFrameLowering class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFFrameLowering.h"
+#include "SBFInstrInfo.h"
+#include "SBFSubtarget.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+
+using namespace llvm;
+
+namespace {
+
+void adjustStackPointer(MachineFunction &MF, MachineBasicBlock &MBB,
+                        MachineBasicBlock::iterator &MBBI,
+                        unsigned int Opcode) {
+  MachineFrameInfo &MFI = MF.getFrameInfo();
+  int NumBytes = (int)MFI.getStackSize();
+  if (NumBytes) {
+    DebugLoc Dl;
+    const SBFInstrInfo &TII =
+        *static_cast<const SBFInstrInfo *>(MF.getSubtarget().getInstrInfo());
+    BuildMI(MBB, MBBI, Dl, TII.get(Opcode), SBF::R11)
+        .addReg(SBF::R11)
+        .addImm(NumBytes);
+  }
+}
+
+} // namespace
+
+bool SBFFrameLowering::hasFP(const MachineFunction &MF) const { return true; }
+
+void SBFFrameLowering::emitPrologue(MachineFunction &MF,
+                                    MachineBasicBlock &MBB) const {
+  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
+    return;
+  }
+  MachineBasicBlock::iterator MBBI = MBB.begin();
+  adjustStackPointer(MF, MBB, MBBI, SBF::SUB_ri);
+}
+
+void SBFFrameLowering::emitEpilogue(MachineFunction &MF,
+                                    MachineBasicBlock &MBB) const {
+  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
+    return;
+  }
+  MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr();
+  adjustStackPointer(MF, MBB, MBBI, SBF::ADD_ri);
+}
+
+void SBFFrameLowering::determineCalleeSaves(MachineFunction &MF,
+                                            BitVector &SavedRegs,
+                                            RegScavenger *RS) const {
+  TargetFrameLowering::determineCalleeSaves(MF, SavedRegs, RS);
+  SavedRegs.reset(SBF::R6);
+  SavedRegs.reset(SBF::R7);
+  SavedRegs.reset(SBF::R8);
+  SavedRegs.reset(SBF::R9);
+}
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.h b/llvm/lib/Target/SBF/SBFFrameLowering.h
new file mode 100644
index 0000000000000..6c4c5aff96eb8
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.h
@@ -0,0 +1,40 @@
+//===-- SBFFrameLowering.h - Define frame lowering for SBF -----*- C++ -*--===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This class implements SBF-specific bits of TargetFrameLowering class.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFFRAMELOWERING_H
+#define LLVM_LIB_TARGET_SBF_SBFFRAMELOWERING_H
+
+#include "llvm/CodeGen/TargetFrameLowering.h"
+
+namespace llvm {
+class SBFSubtarget;
+
+class SBFFrameLowering : public TargetFrameLowering {
+public:
+  explicit SBFFrameLowering(const SBFSubtarget &sti)
+      : TargetFrameLowering(TargetFrameLowering::StackGrowsDown, Align(8), 0) {}
+
+  void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
+  void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
+
+  bool hasFP(const MachineFunction &MF) const override;
+  void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,
+                            RegScavenger *RS) const override;
+
+  MachineBasicBlock::iterator
+  eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
+                                MachineBasicBlock::iterator MI) const override {
+    return MBB.erase(MI);
+  }
+};
+}
+#endif
diff --git a/llvm/lib/Target/SBF/SBFIRPeephole.cpp b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
new file mode 100644
index 0000000000000..3b15c5c13e344
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
@@ -0,0 +1,118 @@
+//===------------ SBFIRPeephole.cpp - IR Peephole Transformation ----------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// IR level peephole optimization, specifically removing @llvm.stacksave() and
+// @llvm.stackrestore().
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/User.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Pass.h"
+
+#define DEBUG_TYPE "sbf-ir-peephole"
+
+using namespace llvm;
+
+namespace {
+
+static bool SBFIRPeepholeImpl(Function &F) {
+  LLVM_DEBUG(dbgs() << "******** SBF IR Peephole ********\n");
+
+  bool Changed = false;
+  Instruction *ToErase = nullptr;
+  for (auto &BB : F) {
+    for (auto &I : BB) {
+      // The following code pattern is handled:
+      //     %3 = call i8* @llvm.stacksave()
+      //     store i8* %3, i8** %saved_stack, align 8
+      //     ...
+      //     %4 = load i8*, i8** %saved_stack, align 8
+      //     call void @llvm.stackrestore(i8* %4)
+      //     ...
+      // The goal is to remove the above four instructions,
+      // so we won't have instructions with r11 (stack pointer)
+      // if eventually there is no variable length stack allocation.
+      // InstrCombine also tries to remove the above instructions,
+      // if it is proven safe (constant alloca etc.), but depending
+      // on code pattern, it may still miss some.
+      //
+      // With unconditionally removing these instructions, if alloca is
+      // constant, we are okay then. Otherwise, SelectionDag will complain
+      // since SBF does not support dynamic allocation yet.
+      if (ToErase) {
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      if (auto *Call = dyn_cast<CallInst>(&I)) {
+        if (auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand())) {
+          if (!GV->getName().equals("llvm.stacksave"))
+            continue;
+          if (!Call->hasOneUser())
+            continue;
+          auto *Inst = cast<Instruction>(*Call->user_begin());
+          LLVM_DEBUG(dbgs() << "Remove:"; I.dump());
+          LLVM_DEBUG(dbgs() << "Remove:"; Inst->dump(); dbgs() << '\n');
+          Changed = true;
+          Inst->eraseFromParent();
+          ToErase = &I;
+        }
+        continue;
+      }
+
+      if (auto *LD = dyn_cast<LoadInst>(&I)) {
+        if (!LD->hasOneUser())
+          continue;
+        auto *Call = dyn_cast<CallInst>(*LD->user_begin());
+        if (!Call)
+          continue;
+        auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
+        if (!GV)
+          continue;
+        if (!GV->getName().equals("llvm.stackrestore"))
+          continue;
+        LLVM_DEBUG(dbgs() << "Remove:"; I.dump());
+        LLVM_DEBUG(dbgs() << "Remove:"; Call->dump(); dbgs() << '\n');
+        Changed = true;
+        Call->eraseFromParent();
+        ToErase = &I;
+      }
+    }
+  }
+
+  return Changed;
+}
+
+class SBFIRPeephole final : public FunctionPass {
+  bool runOnFunction(Function &F) override;
+
+public:
+  static char ID;
+  SBFIRPeephole() : FunctionPass(ID) {}
+};
+} // End anonymous namespace
+
+char SBFIRPeephole::ID = 0;
+INITIALIZE_PASS(SBFIRPeephole, DEBUG_TYPE, "SBF IR Peephole", false, false)
+
+FunctionPass *llvm::createSBFIRPeephole() { return new SBFIRPeephole(); }
+
+bool SBFIRPeephole::runOnFunction(Function &F) { return SBFIRPeepholeImpl(F); }
+
+PreservedAnalyses SBFIRPeepholePass::run(Function &F,
+                                         FunctionAnalysisManager &AM) {
+  return SBFIRPeepholeImpl(F) ? PreservedAnalyses::none()
+                              : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
new file mode 100644
index 0000000000000..a03e62b8aab97
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -0,0 +1,542 @@
+//===-- SBFISelDAGToDAG.cpp - A dag to dag inst selector for SBF ----------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines a DAG pattern matching instruction selector for SBF,
+// converting from a legalized dag to a SBF dag.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFRegisterInfo.h"
+#include "SBFSubtarget.h"
+#include "SBFTargetMachine.h"
+#include "llvm/CodeGen/FunctionLoweringInfo.h"
+#include "llvm/CodeGen/MachineConstantPool.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/CodeGen/SelectionDAGISel.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/IntrinsicsBPF.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/Endian.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Target/TargetMachine.h"
+
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-isel"
+
+// Instruction Selector Implementation
+namespace {
+
+class SBFDAGToDAGISel : public SelectionDAGISel {
+
+  /// Subtarget - Keep a pointer to the SBFSubtarget around so that we can
+  /// make the right decision when generating code for different subtargets.
+  const SBFSubtarget *Subtarget;
+
+public:
+  explicit SBFDAGToDAGISel(SBFTargetMachine &TM)
+      : SelectionDAGISel(TM), Subtarget(nullptr) {}
+
+  StringRef getPassName() const override {
+    return "SBF DAG->DAG Pattern Instruction Selection";
+  }
+
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    // Reset the subtarget each time through.
+    Subtarget = &MF.getSubtarget<SBFSubtarget>();
+    return SelectionDAGISel::runOnMachineFunction(MF);
+  }
+
+  void PreprocessISelDAG() override;
+
+  bool SelectInlineAsmMemoryOperand(const SDValue &Op, unsigned ConstraintCode,
+                                    std::vector<SDValue> &OutOps) override;
+
+
+private:
+// Include the pieces autogenerated from the target description.
+#include "SBFGenDAGISel.inc"
+
+  void Select(SDNode *N) override;
+
+  // Complex Pattern for address selection.
+  bool SelectAddr(SDValue Addr, SDValue &Base, SDValue &Offset);
+  bool SelectFIAddr(SDValue Addr, SDValue &Base, SDValue &Offset);
+
+  // Node preprocessing cases
+  void PreprocessLoad(SDNode *Node, SelectionDAG::allnodes_iterator &I);
+  void PreprocessCopyToReg(SDNode *Node);
+  void PreprocessTrunc(SDNode *Node, SelectionDAG::allnodes_iterator &I);
+
+  // Find constants from a constant structure
+  typedef std::vector<unsigned char> val_vec_type;
+  bool fillGenericConstant(const DataLayout &DL, const Constant *CV,
+                           val_vec_type &Vals, uint64_t Offset);
+  bool fillConstantDataArray(const DataLayout &DL, const ConstantDataArray *CDA,
+                             val_vec_type &Vals, int Offset);
+  bool fillConstantArray(const DataLayout &DL, const ConstantArray *CA,
+                         val_vec_type &Vals, int Offset);
+  bool fillConstantStruct(const DataLayout &DL, const ConstantStruct *CS,
+                          val_vec_type &Vals, int Offset);
+  bool getConstantFieldValue(const GlobalAddressSDNode *Node, uint64_t Offset,
+                             uint64_t Size, unsigned char *ByteSeq);
+  // Mapping from ConstantStruct global value to corresponding byte-list values
+  std::map<const void *, val_vec_type> cs_vals_;
+};
+} // namespace
+
+// ComplexPattern used on SBF Load/Store instructions
+bool SBFDAGToDAGISel::SelectAddr(SDValue Addr, SDValue &Base, SDValue &Offset) {
+  // if Address is FI, get the TargetFrameIndex.
+  SDLoc DL(Addr);
+  if (auto *FIN = dyn_cast<FrameIndexSDNode>(Addr)) {
+    Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i64);
+    Offset = CurDAG->getTargetConstant(0, DL, MVT::i64);
+    return true;
+  }
+
+  if (Addr.getOpcode() == ISD::TargetExternalSymbol ||
+      Addr.getOpcode() == ISD::TargetGlobalAddress)
+    return false;
+
+  // Addresses of the form Addr+const or Addr|const
+  if (CurDAG->isBaseWithConstantOffset(Addr)) {
+    auto *CN = cast<ConstantSDNode>(Addr.getOperand(1));
+    if (isInt<16>(CN->getSExtValue())) {
+      // If the first operand is a FI, get the TargetFI Node
+      if (auto *FIN = dyn_cast<FrameIndexSDNode>(Addr.getOperand(0)))
+        Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i64);
+      else
+        Base = Addr.getOperand(0);
+
+      Offset = CurDAG->getTargetConstant(CN->getSExtValue(), DL, MVT::i64);
+      return true;
+    }
+  }
+
+  Base = Addr;
+  Offset = CurDAG->getTargetConstant(0, DL, MVT::i64);
+  return true;
+}
+
+// ComplexPattern used on SBF FI instruction
+bool SBFDAGToDAGISel::SelectFIAddr(SDValue Addr, SDValue &Base,
+                                   SDValue &Offset) {
+  SDLoc DL(Addr);
+
+  if (!CurDAG->isBaseWithConstantOffset(Addr))
+    return false;
+
+  // Addresses of the form Addr+const or Addr|const
+  auto *CN = cast<ConstantSDNode>(Addr.getOperand(1));
+  if (isInt<16>(CN->getSExtValue())) {
+    // If the first operand is a FI, get the TargetFI Node
+    if (auto *FIN = dyn_cast<FrameIndexSDNode>(Addr.getOperand(0)))
+      Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i64);
+    else
+      return false;
+
+    Offset = CurDAG->getTargetConstant(CN->getSExtValue(), DL, MVT::i64);
+    return true;
+  }
+
+  return false;
+}
+
+bool SBFDAGToDAGISel::SelectInlineAsmMemoryOperand(
+    const SDValue &Op, unsigned ConstraintCode, std::vector<SDValue> &OutOps) {
+  SDValue Op0, Op1;
+  switch (ConstraintCode) {
+  default:
+    return true;
+  case InlineAsm::Constraint_m: // memory
+    if (!SelectAddr(Op, Op0, Op1))
+      return true;
+    break;
+  }
+
+  SDLoc DL(Op);
+  SDValue AluOp = CurDAG->getTargetConstant(ISD::ADD, DL, MVT::i32);;
+  OutOps.push_back(Op0);
+  OutOps.push_back(Op1);
+  OutOps.push_back(AluOp);
+  return false;
+}
+
+void SBFDAGToDAGISel::Select(SDNode *Node) {
+  unsigned Opcode = Node->getOpcode();
+
+  // If we have a custom node, we already have selected!
+  if (Node->isMachineOpcode()) {
+    LLVM_DEBUG(dbgs() << "== "; Node->dump(CurDAG); dbgs() << '\n');
+    return;
+  }
+
+  // tablegen selection should be handled here.
+  switch (Opcode) {
+  default:
+    break;
+
+  case ISD::SDIV: {
+    if (!Subtarget->isSolana()) {
+      DebugLoc Empty;
+      const DebugLoc &DL = Node->getDebugLoc();
+      if (DL != Empty)
+        errs() << "Error at line " << DL.getLine() << ": ";
+      else
+        errs() << "Error: ";
+      errs() << "Unsupport signed division for DAG: ";
+      Node->print(errs(), CurDAG);
+      errs() << "\nPlease convert to unsigned div/mod.\n";
+    }
+    break;
+  }
+  case ISD::INTRINSIC_W_CHAIN: {
+    unsigned IntNo = cast<ConstantSDNode>(Node->getOperand(1))->getZExtValue();
+    switch (IntNo) {
+    case Intrinsic::bpf_load_byte:
+    case Intrinsic::bpf_load_half:
+    case Intrinsic::bpf_load_word: {
+      SDLoc DL(Node);
+      SDValue Chain = Node->getOperand(0);
+      SDValue N1 = Node->getOperand(1);
+      SDValue Skb = Node->getOperand(2);
+      SDValue N3 = Node->getOperand(3);
+
+      SDValue R6Reg = CurDAG->getRegister(SBF::R6, MVT::i64);
+      Chain = CurDAG->getCopyToReg(Chain, DL, R6Reg, Skb, SDValue());
+      Node = CurDAG->UpdateNodeOperands(Node, Chain, N1, R6Reg, N3);
+      break;
+    }
+    }
+    break;
+  }
+
+  case ISD::FrameIndex: {
+    int FI = cast<FrameIndexSDNode>(Node)->getIndex();
+    EVT VT = Node->getValueType(0);
+    SDValue TFI = CurDAG->getTargetFrameIndex(FI, VT);
+    unsigned Opc = SBF::MOV_rr;
+    if (Node->hasOneUse()) {
+      CurDAG->SelectNodeTo(Node, Opc, VT, TFI);
+      return;
+    }
+    ReplaceNode(Node, CurDAG->getMachineNode(Opc, SDLoc(Node), VT, TFI));
+    return;
+  }
+  }
+
+  // Select the default instruction
+  SelectCode(Node);
+}
+
+void SBFDAGToDAGISel::PreprocessLoad(SDNode *Node,
+                                     SelectionDAG::allnodes_iterator &I) {
+  union {
+    uint8_t c[8];
+    uint16_t s;
+    uint32_t i;
+    uint64_t d;
+  } new_val; // hold up the constant values replacing loads.
+  bool to_replace = false;
+  SDLoc DL(Node);
+  const LoadSDNode *LD = cast<LoadSDNode>(Node);
+  uint64_t size = LD->getMemOperand()->getSize();
+
+  if (!size || size > 8 || (size & (size - 1)) || !LD->isSimple())
+    return;
+
+  SDNode *LDAddrNode = LD->getOperand(1).getNode();
+  // Match LDAddr against either global_addr or (global_addr + offset)
+  unsigned opcode = LDAddrNode->getOpcode();
+  if (opcode == ISD::ADD) {
+    SDValue OP1 = LDAddrNode->getOperand(0);
+    SDValue OP2 = LDAddrNode->getOperand(1);
+
+    // We want to find the pattern global_addr + offset
+    SDNode *OP1N = OP1.getNode();
+    if (OP1N->getOpcode() <= ISD::BUILTIN_OP_END || OP1N->getNumOperands() == 0)
+      return;
+
+    LLVM_DEBUG(dbgs() << "Check candidate load: "; LD->dump(); dbgs() << '\n');
+
+    const GlobalAddressSDNode *GADN =
+        dyn_cast<GlobalAddressSDNode>(OP1N->getOperand(0).getNode());
+    const ConstantSDNode *CDN = dyn_cast<ConstantSDNode>(OP2.getNode());
+    if (GADN && CDN)
+      to_replace =
+          getConstantFieldValue(GADN, CDN->getZExtValue(), size, new_val.c);
+  } else if (LDAddrNode->getOpcode() > ISD::BUILTIN_OP_END &&
+             LDAddrNode->getNumOperands() > 0) {
+    LLVM_DEBUG(dbgs() << "Check candidate load: "; LD->dump(); dbgs() << '\n');
+
+    SDValue OP1 = LDAddrNode->getOperand(0);
+    if (const GlobalAddressSDNode *GADN =
+            dyn_cast<GlobalAddressSDNode>(OP1.getNode()))
+      to_replace = getConstantFieldValue(GADN, 0, size, new_val.c);
+  }
+
+  if (!to_replace)
+    return;
+
+  // replacing the old with a new value
+  uint64_t val;
+  if (size == 1)
+    val = new_val.c[0];
+  else if (size == 2)
+    val = new_val.s;
+  else if (size == 4)
+    val = new_val.i;
+  else {
+    val = new_val.d;
+  }
+
+  LLVM_DEBUG(dbgs() << "Replacing load of size " << size << " with constant "
+                    << val << '\n');
+
+  /* Some load nodes have edges from TokenFactor nodes.  In this case
+     replacing the load with a constant makes the DAG disconnected.
+     The following checks if any of the load operands are TokenFactor
+     nodes, and if another TokenFactor is a user of the load, the
+     operand TokenFactor is connected to the user, so that the DAG
+     remains connected after replacing the load node by a constant.
+  */
+  for (unsigned I = 0, E = Node->getNumOperands(); I != E; ++I) {
+    const SDValue &OpV = Node->getOperand(I);
+    SDNode *Op = OpV.getNode();
+    if (Op->getOpcode() == ISD::TokenFactor) {
+      for (SDNode::use_iterator UI = Node->use_begin(), UE = Node->use_end(); UI != UE; ++UI) {
+        SDUse &Use = UI.getUse();
+        SDNode *User = Use.getUser();
+        if (User->getOpcode() == ISD::TokenFactor) {
+          SmallVector<SDValue, 8> ExtendedOps;
+          bool NotExtended = true;
+          for (unsigned UOI = 0, UOE = User->getNumOperands(); UOI != UOE; ++UOI) {
+            const SDValue &Operand = User->getOperand(UOI);
+            if (OpV == Operand) {
+              NotExtended = false;
+              break;
+            }
+            ExtendedOps.push_back(Operand);
+          }
+          if (NotExtended) {
+            ExtendedOps.push_back(OpV);
+            SDValue ExtendedTokenFactor = CurDAG->getTokenFactor(SDLoc(User), ExtendedOps);
+            I--;
+            SDValue From[] = {SDValue(User, 0)};
+            SDValue To[] = {ExtendedTokenFactor};
+            CurDAG->ReplaceAllUsesOfValuesWith(From, To, 1);
+            I++;
+            CurDAG->DeleteNode(User);
+          }
+        }
+      }
+    }
+  }
+
+  SDValue NVal = CurDAG->getConstant(val, DL, LD->getValueType(0));
+
+  // After replacement, the current node is dead, we need to
+  // go backward one step to make iterator still work
+  I--;
+  SDValue From[] = {SDValue(Node, 0), SDValue(Node, 1)};
+  SDValue To[] = {NVal, NVal};
+  CurDAG->ReplaceAllUsesOfValuesWith(From, To, 2);
+  I++;
+  // It is safe to delete node now
+  CurDAG->DeleteNode(Node);
+}
+
+void SBFDAGToDAGISel::PreprocessISelDAG() {
+  // Iterate through all nodes, interested in the following case:
+  //
+  //  . loads from ConstantStruct or ConstantArray of constructs
+  //    which can be turns into constant itself, with this we can
+  //    avoid reading from read-only section at runtime.
+  //
+  //  . Removing redundant AND for intrinsic narrow loads.
+  for (SelectionDAG::allnodes_iterator I = CurDAG->allnodes_begin(),
+                                       E = CurDAG->allnodes_end();
+       I != E;) {
+    SDNode *Node = &*I++;
+    unsigned Opcode = Node->getOpcode();
+    if (Opcode == ISD::LOAD)
+      PreprocessLoad(Node, I);
+    else if (Opcode == ISD::AND)
+      PreprocessTrunc(Node, I);
+  }
+}
+
+bool SBFDAGToDAGISel::getConstantFieldValue(const GlobalAddressSDNode *Node,
+                                            uint64_t Offset, uint64_t Size,
+                                            unsigned char *ByteSeq) {
+  const GlobalVariable *V = dyn_cast<GlobalVariable>(Node->getGlobal());
+
+  if (!V || !V->hasInitializer() || !V->isConstant())
+    return false;
+
+  const Constant *Init = V->getInitializer();
+  const DataLayout &DL = CurDAG->getDataLayout();
+  val_vec_type TmpVal;
+
+  auto it = cs_vals_.find(static_cast<const void *>(Init));
+  if (it != cs_vals_.end()) {
+    TmpVal = it->second;
+  } else {
+    uint64_t total_size = 0;
+    if (const ConstantStruct *CS = dyn_cast<ConstantStruct>(Init))
+      total_size =
+          DL.getStructLayout(cast<StructType>(CS->getType()))->getSizeInBytes();
+    else if (const ConstantArray *CA = dyn_cast<ConstantArray>(Init))
+      total_size = DL.getTypeAllocSize(CA->getType()->getElementType()) *
+                   CA->getNumOperands();
+    else
+      return false;
+
+    val_vec_type Vals(total_size, 0);
+    if (fillGenericConstant(DL, Init, Vals, 0) == false)
+      return false;
+    cs_vals_[static_cast<const void *>(Init)] = Vals;
+    TmpVal = std::move(Vals);
+  }
+
+  // test whether host endianness matches target
+  union {
+    uint8_t c[2];
+    uint16_t s;
+  } test_buf;
+  uint16_t test_val = 0x2345;
+  if (DL.isLittleEndian())
+    support::endian::write16le(test_buf.c, test_val);
+  else
+    support::endian::write16be(test_buf.c, test_val);
+
+  bool endian_match = test_buf.s == test_val;
+  for (uint64_t i = Offset, j = 0; i < Offset + Size; i++, j++)
+    ByteSeq[j] = endian_match ? TmpVal[i] : TmpVal[Offset + Size - 1 - j];
+
+  return true;
+}
+
+bool SBFDAGToDAGISel::fillGenericConstant(const DataLayout &DL,
+                                          const Constant *CV,
+                                          val_vec_type &Vals, uint64_t Offset) {
+  uint64_t Size = DL.getTypeAllocSize(CV->getType());
+
+  if (isa<ConstantAggregateZero>(CV) || isa<UndefValue>(CV))
+    return true; // already done
+
+  if (const ConstantInt *CI = dyn_cast<ConstantInt>(CV)) {
+    uint64_t val = CI->getZExtValue();
+    LLVM_DEBUG(dbgs() << "Byte array at offset " << Offset << " with value "
+                      << val << '\n');
+
+    if (Size > 8 || (Size & (Size - 1)))
+      return false;
+
+    // Store based on target endian
+    for (uint64_t i = 0; i < Size; ++i) {
+      Vals[Offset + i] = DL.isLittleEndian()
+                             ? ((val >> (i * 8)) & 0xFF)
+                             : ((val >> ((Size - i - 1) * 8)) & 0xFF);
+    }
+    return true;
+  }
+
+  if (const ConstantDataArray *CDA = dyn_cast<ConstantDataArray>(CV))
+    return fillConstantDataArray(DL, CDA, Vals, Offset);
+
+  if (const ConstantArray *CA = dyn_cast<ConstantArray>(CV))
+    return fillConstantArray(DL, CA, Vals, Offset);
+
+  if (const ConstantStruct *CVS = dyn_cast<ConstantStruct>(CV))
+    return fillConstantStruct(DL, CVS, Vals, Offset);
+
+  return false;
+}
+
+bool SBFDAGToDAGISel::fillConstantDataArray(const DataLayout &DL,
+                                            const ConstantDataArray *CDA,
+                                            val_vec_type &Vals, int Offset) {
+  for (unsigned i = 0, e = CDA->getNumElements(); i != e; ++i) {
+    if (fillGenericConstant(DL, CDA->getElementAsConstant(i), Vals, Offset) ==
+        false)
+      return false;
+    Offset += DL.getTypeAllocSize(CDA->getElementAsConstant(i)->getType());
+  }
+
+  return true;
+}
+
+bool SBFDAGToDAGISel::fillConstantArray(const DataLayout &DL,
+                                        const ConstantArray *CA,
+                                        val_vec_type &Vals, int Offset) {
+  for (unsigned i = 0, e = CA->getNumOperands(); i != e; ++i) {
+    if (fillGenericConstant(DL, CA->getOperand(i), Vals, Offset) == false)
+      return false;
+    Offset += DL.getTypeAllocSize(CA->getOperand(i)->getType());
+  }
+
+  return true;
+}
+
+bool SBFDAGToDAGISel::fillConstantStruct(const DataLayout &DL,
+                                         const ConstantStruct *CS,
+                                         val_vec_type &Vals, int Offset) {
+  const StructLayout *Layout = DL.getStructLayout(CS->getType());
+  for (unsigned i = 0, e = CS->getNumOperands(); i != e; ++i) {
+    const Constant *Field = CS->getOperand(i);
+    uint64_t SizeSoFar = Layout->getElementOffset(i);
+    if (fillGenericConstant(DL, Field, Vals, Offset + SizeSoFar) == false)
+      return false;
+  }
+  return true;
+}
+
+void SBFDAGToDAGISel::PreprocessTrunc(SDNode *Node,
+                                      SelectionDAG::allnodes_iterator &I) {
+  ConstantSDNode *MaskN = dyn_cast<ConstantSDNode>(Node->getOperand(1));
+  if (!MaskN)
+    return;
+
+  // The Reg operand should be a virtual register, which is defined
+  // outside the current basic block. DAG combiner has done a pretty
+  // good job in removing truncating inside a single basic block except
+  // when the Reg operand comes from bpf_load_[byte | half | word] for
+  // which the generic optimizer doesn't understand their results are
+  // zero extended.
+  SDValue BaseV = Node->getOperand(0);
+  if (BaseV.getOpcode() != ISD::INTRINSIC_W_CHAIN)
+    return;
+
+  unsigned IntNo = cast<ConstantSDNode>(BaseV->getOperand(1))->getZExtValue();
+  uint64_t MaskV = MaskN->getZExtValue();
+
+  if (!((IntNo == Intrinsic::bpf_load_byte && MaskV == 0xFF) ||
+        (IntNo == Intrinsic::bpf_load_half && MaskV == 0xFFFF) ||
+        (IntNo == Intrinsic::bpf_load_word && MaskV == 0xFFFFFFFF)))
+    return;
+
+  LLVM_DEBUG(dbgs() << "Remove the redundant AND operation in: ";
+             Node->dump(); dbgs() << '\n');
+
+  I--;
+  CurDAG->ReplaceAllUsesWith(SDValue(Node, 0), BaseV);
+  I++;
+  CurDAG->DeleteNode(Node);
+}
+
+FunctionPass *llvm::createSBFISelDag(SBFTargetMachine &TM) {
+  return new SBFDAGToDAGISel(TM);
+}
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
new file mode 100644
index 0000000000000..da6cfbb97f999
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -0,0 +1,1197 @@
+//===-- SBFISelLowering.cpp - SBF DAG Lowering Implementation  ------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the interfaces that SBF uses to lower LLVM code into a
+// selection DAG.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFISelLowering.h"
+#include "SBF.h"
+#include "SBFRegisterInfo.h"
+#include "SBFSubtarget.h"
+#include "SBFTargetMachine.h"
+#include "llvm/CodeGen/CallingConvLower.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
+#include "llvm/CodeGen/ValueTypes.h"
+#include "llvm/IR/DiagnosticInfo.h"
+#include "llvm/IR/DiagnosticPrinter.h"
+#include "llvm/IR/IntrinsicsBPF.h" // TODO: jle.
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-lower"
+
+static cl::opt<bool> SBFExpandMemcpyInOrder("sbf-expand-memcpy-in-order",
+  cl::Hidden, cl::init(false),
+  cl::desc("Expand memcpy into load/store pairs in order"));
+
+static void fail(const SDLoc &DL, SelectionDAG &DAG, const Twine &Msg) {
+  MachineFunction &MF = DAG.getMachineFunction();
+  DAG.getContext()->diagnose(
+      DiagnosticInfoUnsupported(MF.getFunction(), Msg, DL.getDebugLoc()));
+}
+
+static void fail(const SDLoc &DL, SelectionDAG &DAG, const char *Msg,
+                 SDValue Val) {
+  MachineFunction &MF = DAG.getMachineFunction();
+  std::string Str;
+  raw_string_ostream OS(Str);
+  OS << Msg;
+  Val->print(OS);
+  OS.flush();
+  DAG.getContext()->diagnose(
+      DiagnosticInfoUnsupported(MF.getFunction(), Str, DL.getDebugLoc()));
+}
+
+SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
+                                     const SBFSubtarget &STI)
+    : TargetLowering(TM), Subtarget(&STI) {
+
+  // Set up the register classes.
+  addRegisterClass(MVT::i64, &SBF::GPRRegClass);
+  if (STI.getHasAlu32())
+    addRegisterClass(MVT::i32, &SBF::GPR32RegClass);
+
+  // Compute derived properties from the register classes
+  computeRegisterProperties(STI.getRegisterInfo());
+
+  setStackPointerRegisterToSaveRestore(SBF::R11);
+
+  setOperationAction(ISD::BR_CC, MVT::i64, Custom);
+  setOperationAction(ISD::BR_JT, MVT::Other, Expand);
+  setOperationAction(ISD::BRIND, MVT::Other, Expand);
+  setOperationAction(ISD::BRCOND, MVT::Other, Expand);
+
+  setOperationAction(ISD::GlobalAddress, MVT::i64, Custom);
+
+  setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i64, Custom);
+  setOperationAction(ISD::STACKSAVE, MVT::Other, Expand);
+  setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand);
+
+  setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::Other, Custom);
+
+  for (auto VT : {MVT::i8, MVT::i16, MVT::i32, MVT::i32, MVT::i64}) {
+    if (Subtarget->isSolana()) {
+      // Implement custom lowering for all atomic operations
+      setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
+      setOperationAction(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_ADD, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_AND, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_MAX, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_MIN, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_NAND, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_OR, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_SUB, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_UMAX, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_UMIN, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD_XOR, VT, Custom);
+      continue;
+    }
+
+    if (VT == MVT::i64) {
+      continue;
+    }
+
+    // Set unsupported atomic operations as Custom so we can emit better error
+    // messages than fatal error from selectiondag.
+    if (VT == MVT::i32) {
+      if (STI.getHasAlu32())
+        continue;
+    } else {
+      setOperationAction(ISD::ATOMIC_LOAD_ADD, VT, Custom);
+    }
+
+    setOperationAction(ISD::ATOMIC_LOAD_AND, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_OR, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_XOR, VT, Custom);
+    setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
+    setOperationAction(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS, VT, Custom);
+  }
+
+  for (auto VT : { MVT::i32, MVT::i64 }) {
+    if (VT == MVT::i32 && !STI.getHasAlu32())
+      continue;
+
+    if (Subtarget->isSolana() && !STI.getHasSdiv()) {
+      setOperationAction(ISD::SDIV, VT, Expand);
+    }
+
+    setOperationAction(ISD::SDIVREM, VT, Expand);
+    setOperationAction(ISD::UDIVREM, VT, Expand);
+    setOperationAction(ISD::SREM, VT, Expand);
+    setOperationAction(ISD::UREM, VT, Expand);
+    setOperationAction(ISD::MULHU, VT, Expand);
+    setOperationAction(ISD::MULHS, VT, Expand);
+    setOperationAction(ISD::UMUL_LOHI, VT, Expand);
+    setOperationAction(ISD::SMUL_LOHI, VT, Expand);
+    setOperationAction(ISD::ROTR, VT, Expand);
+    setOperationAction(ISD::ROTL, VT, Expand);
+    setOperationAction(ISD::SHL_PARTS, VT, Expand);
+    setOperationAction(ISD::SRL_PARTS, VT, Expand);
+    setOperationAction(ISD::SRA_PARTS, VT, Expand);
+    setOperationAction(ISD::CTPOP, VT, Expand);
+
+    setOperationAction(ISD::SETCC, VT, Expand);
+    setOperationAction(ISD::SELECT, VT, Expand);
+    setOperationAction(ISD::SELECT_CC, VT, Custom);
+  }
+
+  if (STI.getHasAlu32()) {
+    setOperationAction(ISD::BSWAP, MVT::i32, Promote);
+    setOperationAction(ISD::BR_CC, MVT::i32,
+                       STI.getHasJmp32() ? Custom : Promote);
+  }
+
+  if (Subtarget->isSolana()) {
+    setOperationAction(ISD::CTTZ, MVT::i64, Expand);
+    setOperationAction(ISD::CTLZ, MVT::i64, Expand);
+    setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i64, Expand);
+    setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i64, Expand);
+  } else {
+    setOperationAction(ISD::CTTZ, MVT::i64, Custom);
+    setOperationAction(ISD::CTLZ, MVT::i64, Custom);
+    setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i64, Custom);
+    setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i64, Custom);
+  }
+
+  setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1, Expand);
+  setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i8, Expand);
+  setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i16, Expand);
+  setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i32, Expand);
+
+  // Extended load operations for i1 types must be promoted
+  for (MVT VT : MVT::integer_valuetypes()) {
+    setLoadExtAction(ISD::EXTLOAD, VT, MVT::i1, Promote);
+    setLoadExtAction(ISD::ZEXTLOAD, VT, MVT::i1, Promote);
+    setLoadExtAction(ISD::SEXTLOAD, VT, MVT::i1, Promote);
+
+    setLoadExtAction(ISD::SEXTLOAD, VT, MVT::i8, Expand);
+    setLoadExtAction(ISD::SEXTLOAD, VT, MVT::i16, Expand);
+    setLoadExtAction(ISD::SEXTLOAD, VT, MVT::i32, Expand);
+  }
+
+  setBooleanContents(ZeroOrOneBooleanContent);
+
+  // Function alignments
+  setMinFunctionAlignment(Align(8));
+  setPrefFunctionAlignment(Align(8));
+
+  if (SBFExpandMemcpyInOrder) {
+    // LLVM generic code will try to expand memcpy into load/store pairs at this
+    // stage which is before quite a few IR optimization passes, therefore the
+    // loads and stores could potentially be moved apart from each other which
+    // will cause trouble to memcpy pattern matcher inside kernel eBPF JIT
+    // compilers.
+    //
+    // When -sbf-expand-memcpy-in-order specified, we want to defer the expand
+    // of memcpy to later stage in IR optimization pipeline so those load/store
+    // pairs won't be touched and could be kept in order. Hence, we set
+    // MaxStoresPerMem* to zero to disable the generic getMemcpyLoadsAndStores
+    // code path, and ask LLVM to use target expander EmitTargetCodeForMemcpy.
+    MaxStoresPerMemset = MaxStoresPerMemsetOptSize = 0;
+    MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = 0;
+    MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 0;
+  } else {
+    auto SelectionDAGInfo = STI.getSelectionDAGInfo();
+    SelectionDAGInfo->setSolanaFlag(STI.isSolana());
+    // inline memcpy() for kernel to see explicit copy
+    unsigned CommonMaxStores =
+      SelectionDAGInfo->getCommonMaxStoresPerMemFunc();
+
+    MaxStoresPerMemset = MaxStoresPerMemsetOptSize = CommonMaxStores;
+    MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = CommonMaxStores;
+    MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = CommonMaxStores;
+  }
+
+  // CPU/Feature control
+  HasAlu32 = STI.getHasAlu32();
+  HasJmp32 = STI.getHasJmp32();
+  HasJmpExt = STI.getHasJmpExt();
+  SBFRegisterInfo::FrameLength = STI.isSolana() ? 4096 : 512;
+}
+
+bool SBFTargetLowering::allowsMisalignedMemoryAccesses(
+    EVT VT, unsigned, Align, MachineMemOperand::Flags, bool *Fast) const {
+  if (!VT.isSimple()) {
+    return false;
+  }
+  bool isSolana = Subtarget->isSolana();
+  if (isSolana && Fast) {
+    *Fast = true;
+  }
+  return isSolana;
+}
+
+bool SBFTargetLowering::lowerAtomicStoreAsStoreSDNode(
+    const StoreInst &SI) const {
+  return Subtarget->isSolana();
+}
+
+bool SBFTargetLowering::lowerAtomicLoadAsLoadSDNode(const LoadInst &LI) const {
+  return Subtarget->isSolana();
+}
+
+bool SBFTargetLowering::isOffsetFoldingLegal(
+    const GlobalAddressSDNode *GA) const {
+  return false;
+}
+
+bool SBFTargetLowering::isTruncateFree(Type *Ty1, Type *Ty2) const {
+  if (!Ty1->isIntegerTy() || !Ty2->isIntegerTy())
+    return false;
+  unsigned NumBits1 = Ty1->getPrimitiveSizeInBits();
+  unsigned NumBits2 = Ty2->getPrimitiveSizeInBits();
+  return NumBits1 > NumBits2;
+}
+
+bool SBFTargetLowering::isTruncateFree(EVT VT1, EVT VT2) const {
+  if (!VT1.isInteger() || !VT2.isInteger())
+    return false;
+  unsigned NumBits1 = VT1.getSizeInBits();
+  unsigned NumBits2 = VT2.getSizeInBits();
+  return NumBits1 > NumBits2;
+}
+
+bool SBFTargetLowering::isZExtFree(Type *Ty1, Type *Ty2) const {
+  if (!getHasAlu32() || !Ty1->isIntegerTy() || !Ty2->isIntegerTy())
+    return false;
+  unsigned NumBits1 = Ty1->getPrimitiveSizeInBits();
+  unsigned NumBits2 = Ty2->getPrimitiveSizeInBits();
+  return NumBits1 == 32 && NumBits2 == 64;
+}
+
+bool SBFTargetLowering::isZExtFree(EVT VT1, EVT VT2) const {
+  if (!getHasAlu32() || !VT1.isInteger() || !VT2.isInteger())
+    return false;
+  unsigned NumBits1 = VT1.getSizeInBits();
+  unsigned NumBits2 = VT2.getSizeInBits();
+  return NumBits1 == 32 && NumBits2 == 64;
+}
+
+SBFTargetLowering::ConstraintType
+SBFTargetLowering::getConstraintType(StringRef Constraint) const {
+  if (Constraint.size() == 1) {
+    switch (Constraint[0]) {
+    default:
+      break;
+    case 'w':
+      return C_RegisterClass;
+    }
+  }
+
+  return TargetLowering::getConstraintType(Constraint);
+}
+
+std::pair<unsigned, const TargetRegisterClass *>
+SBFTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
+                                                StringRef Constraint,
+                                                MVT VT) const {
+  if (Constraint.size() == 1)
+    // GCC Constraint Letters
+    switch (Constraint[0]) {
+    case 'r': // GENERAL_REGS
+      return std::make_pair(0U, &SBF::GPRRegClass);
+    case 'w':
+      if (HasAlu32)
+        return std::make_pair(0U, &SBF::GPR32RegClass);
+      break;
+    default:
+      break;
+    }
+
+  return TargetLowering::getRegForInlineAsmConstraint(TRI, Constraint, VT);
+}
+
+void SBFTargetLowering::ReplaceNodeResults(SDNode *N,
+                                           SmallVectorImpl<SDValue> &Results,
+                                           SelectionDAG &DAG) const {
+  const char *err_msg;
+  uint32_t Opcode = N->getOpcode();
+  switch (Opcode) {
+  default:
+    report_fatal_error("Unhandled custom legalization");
+  case ISD::ATOMIC_SWAP:
+  case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
+  case ISD::ATOMIC_LOAD_ADD:
+  case ISD::ATOMIC_LOAD_AND:
+  case ISD::ATOMIC_LOAD_MAX:
+  case ISD::ATOMIC_LOAD_MIN:
+  case ISD::ATOMIC_LOAD_NAND:
+  case ISD::ATOMIC_LOAD_OR:
+  case ISD::ATOMIC_LOAD_SUB:
+  case ISD::ATOMIC_LOAD_UMAX:
+  case ISD::ATOMIC_LOAD_UMIN:
+  case ISD::ATOMIC_LOAD_XOR:
+    if (Subtarget->isSolana()) {
+      // We do lowering during legalization, see LowerOperation()
+      return;
+    }
+
+    if (HasAlu32 || Opcode == ISD::ATOMIC_LOAD_ADD)
+      err_msg = "Unsupported atomic operations, please use 32/64 bit version";
+    else
+      err_msg = "Unsupported atomic operations, please use 64 bit version";
+    break;
+  }
+
+  SDLoc DL(N);
+  fail(DL, DAG, err_msg);
+}
+
+SDValue SBFTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
+  switch (Op.getOpcode()) {
+  case ISD::BR_CC:
+    return LowerBR_CC(Op, DAG);
+  case ISD::GlobalAddress:
+    return LowerGlobalAddress(Op, DAG);
+  case ISD::SELECT_CC:
+    return LowerSELECT_CC(Op, DAG);
+  case ISD::ATOMIC_SWAP:
+  case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
+  case ISD::ATOMIC_LOAD_ADD:
+  case ISD::ATOMIC_LOAD_AND:
+  case ISD::ATOMIC_LOAD_MAX:
+  case ISD::ATOMIC_LOAD_MIN:
+  case ISD::ATOMIC_LOAD_NAND:
+  case ISD::ATOMIC_LOAD_OR:
+  case ISD::ATOMIC_LOAD_SUB:
+  case ISD::ATOMIC_LOAD_UMAX:
+  case ISD::ATOMIC_LOAD_UMIN:
+  case ISD::ATOMIC_LOAD_XOR:
+    return LowerATOMICRMW(Op, DAG);
+  case ISD::INTRINSIC_W_CHAIN: {
+    unsigned IntNo = cast<ConstantSDNode>(Op->getOperand(1))->getZExtValue();
+    switch (IntNo) {
+    case Intrinsic::bpf_load_byte:
+    case Intrinsic::bpf_load_half:
+    case Intrinsic::bpf_load_word:
+      if (Subtarget->isSolana()) {
+        report_fatal_error(
+            "llvm.bpf.load.* intrinsics are not supported in SBF", false);
+      }
+      break;
+    default:
+      break;
+    }
+
+    // continue the expansion as defined with tablegen
+    return SDValue();
+  }
+  case ISD::DYNAMIC_STACKALLOC:
+    report_fatal_error("Unsupported dynamic stack allocation");
+  default:
+    llvm_unreachable("unimplemented operation");
+  }
+}
+
+// Calling Convention Implementation
+#include "SBFGenCallingConv.inc"
+
+SDValue SBFTargetLowering::LowerFormalArguments(
+    SDValue Chain, CallingConv::ID CallConv, bool IsVarArg,
+    const SmallVectorImpl<ISD::InputArg> &Ins, const SDLoc &DL,
+    SelectionDAG &DAG, SmallVectorImpl<SDValue> &InVals) const {
+  switch (CallConv) {
+  default:
+    report_fatal_error("Unsupported calling convention");
+  case CallingConv::C:
+  case CallingConv::Fast:
+    break;
+  }
+
+  MachineFunction &MF = DAG.getMachineFunction();
+  MachineRegisterInfo &RegInfo = MF.getRegInfo();
+
+  // Assign locations to all of the incoming arguments.
+  SmallVector<CCValAssign, 16> ArgLocs;
+  CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
+  if (Subtarget->isSolana() && Ins.size() > MaxArgs) {
+    // Pass args 1-4 via registers, remaining args via stack, referenced via SBF::R5
+    CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
+  } else {
+    // Pass all args via registers
+    CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32 : CC_SBF64);
+  }
+
+  for (auto &VA : ArgLocs) {
+    if (VA.isRegLoc()) {
+      // Argument passed in registers
+      EVT RegVT = VA.getLocVT();
+      MVT::SimpleValueType SimpleTy = RegVT.getSimpleVT().SimpleTy;
+      switch (SimpleTy) {
+      default: {
+        errs() << "LowerFormalArguments Unhandled argument type: "
+               << RegVT.getEVTString() << '\n';
+        llvm_unreachable(nullptr);
+      }
+      case MVT::i32:
+      case MVT::i64:
+        Register VReg = RegInfo.createVirtualRegister(
+            SimpleTy == MVT::i64 ? &SBF::GPRRegClass : &SBF::GPR32RegClass);
+        RegInfo.addLiveIn(VA.getLocReg(), VReg);
+        SDValue ArgValue = DAG.getCopyFromReg(Chain, DL, VReg, RegVT);
+
+        // If this is a value that has been promoted to a wider type, insert an
+        // assert[sz]ext to capture this, then truncate to the right size.
+        if (VA.getLocInfo() == CCValAssign::SExt)
+          ArgValue = DAG.getNode(ISD::AssertSext, DL, RegVT, ArgValue,
+                                 DAG.getValueType(VA.getValVT()));
+        else if (VA.getLocInfo() == CCValAssign::ZExt)
+          ArgValue = DAG.getNode(ISD::AssertZext, DL, RegVT, ArgValue,
+                                 DAG.getValueType(VA.getValVT()));
+
+        if (VA.getLocInfo() != CCValAssign::Full)
+          ArgValue = DAG.getNode(ISD::TRUNCATE, DL, VA.getValVT(), ArgValue);
+
+        InVals.push_back(ArgValue);
+
+        break;
+      }
+    } else if (Subtarget->isSolana()) {
+      // Argument passed via stack
+      assert(VA.isMemLoc() && "Should be isMemLoc");
+
+      EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
+      EVT LocVT = VA.getLocVT();
+
+      // Arguments relative to SBF::R5
+      unsigned reg = MF.addLiveIn(SBF::R5, &SBF::GPRRegClass);
+      SDValue Const = DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(), DL, MVT::i64);
+      SDValue SDV = DAG.getCopyFromReg(Chain, DL, reg, getPointerTy(MF.getDataLayout()));
+      SDV = DAG.getNode(ISD::SUB, DL, PtrVT, SDV, Const);
+      SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo(), 0);
+      InVals.push_back(SDV);
+    } else {
+      fail(DL, DAG, "defined with too many args");
+      InVals.push_back(DAG.getConstant(0, DL, VA.getLocVT()));
+    }
+  }
+
+  if (Subtarget->isSolana()) {
+    if (IsVarArg) {
+      fail(DL, DAG, "Functions with VarArgs are not supported");
+    }
+  } else if (IsVarArg || MF.getFunction().hasStructRetAttr()) {
+    fail(DL, DAG, "functions with VarArgs or StructRet are not supported");
+  }
+
+  return Chain;
+}
+
+const unsigned SBFTargetLowering::MaxArgs = 5;
+
+SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
+                                     SmallVectorImpl<SDValue> &InVals) const {
+  SelectionDAG &DAG = CLI.DAG;
+  auto &Outs = CLI.Outs;
+  auto &OutVals = CLI.OutVals;
+  auto &Ins = CLI.Ins;
+  SDValue Chain = CLI.Chain;
+  SDValue Callee = CLI.Callee;
+  bool &IsTailCall = CLI.IsTailCall;
+  CallingConv::ID CallConv = CLI.CallConv;
+  bool IsVarArg = CLI.IsVarArg;
+  MachineFunction &MF = DAG.getMachineFunction();
+
+  // SBF target does not support tail call optimization.
+  IsTailCall = false;
+
+  switch (CallConv) {
+  default:
+    report_fatal_error("Unsupported calling convention");
+  case CallingConv::Fast:
+  case CallingConv::C:
+    break;
+  }
+
+  // Analyze operands of the call, assigning locations to each operand.
+  SmallVector<CCValAssign, 16> ArgLocs;
+  CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
+  if (Subtarget->isSolana() && Outs.size() > MaxArgs) {
+    // Pass args 1-4 via registers, remaining args via stack, referenced via SBF::R5
+    CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
+  } else {
+    // Pass all args via registers
+    CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32 : CC_SBF64);
+  }
+
+  unsigned NumBytes = CCInfo.getNextStackOffset();
+
+  if (!Subtarget->isSolana()) {
+    if (Outs.size() > MaxArgs)
+      fail(CLI.DL, DAG, "too many args to ", Callee);
+
+    for (auto &Arg : Outs) {
+      ISD::ArgFlagsTy Flags = Arg.Flags;
+      if (!Flags.isByVal())
+        continue;
+
+      fail(CLI.DL, DAG, "pass by value not supported ", Callee);
+    }
+  }
+
+  auto PtrVT = getPointerTy(MF.getDataLayout());
+  Chain = DAG.getCALLSEQ_START(Chain, NumBytes, 0, CLI.DL);
+
+  SmallVector<std::pair<unsigned, SDValue>, MaxArgs> RegsToPass;
+
+  // Walk arg assignments
+  bool HasStackArgs = false;
+  unsigned e, i, ae = ArgLocs.size();
+  for (i = 0, e = (Subtarget->isSolana()) ? ae : std::min(ae, MaxArgs); i != e; ++i) {
+    CCValAssign &VA = ArgLocs[i];
+    SDValue Arg = OutVals[i];
+
+    // Promote the value if needed.
+    switch (VA.getLocInfo()) {
+    default:
+      llvm_unreachable("Unknown loc info");
+    case CCValAssign::Full:
+      break;
+    case CCValAssign::SExt:
+      Arg = DAG.getNode(ISD::SIGN_EXTEND, CLI.DL, VA.getLocVT(), Arg);
+      break;
+    case CCValAssign::ZExt:
+      Arg = DAG.getNode(ISD::ZERO_EXTEND, CLI.DL, VA.getLocVT(), Arg);
+      break;
+    case CCValAssign::AExt:
+      Arg = DAG.getNode(ISD::ANY_EXTEND, CLI.DL, VA.getLocVT(), Arg);
+      break;
+    }
+
+    if (Subtarget->isSolana() && VA.isMemLoc()) {
+      HasStackArgs = true;
+      break;
+    }
+
+    // Push arguments into RegsToPass vector
+    if (VA.isRegLoc())
+      RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
+    else
+      llvm_unreachable("call arg pass bug");
+  }
+
+  SDValue InFlag;
+
+  if (HasStackArgs) {
+    SDValue FramePtr = DAG.getCopyFromReg(Chain, CLI.DL, SBF::R10, getPointerTy(MF.getDataLayout()));
+
+    // Stack arguments have to be walked in reverse order by inserting
+    // chained stores, this ensures their order is not changed by the scheduler
+    // and that the push instruction sequence generated is correct, otherwise they
+    // can be freely intermixed.
+    for (ae = i, i = ArgLocs.size(); i != ae; --i) {
+      unsigned Loc = i - 1;
+      CCValAssign &VA = ArgLocs[Loc];
+      SDValue Arg = OutVals[Loc];
+
+      assert(VA.isMemLoc());
+
+      EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
+      SDValue Const = DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(), CLI.DL, MVT::i64);
+      SDValue PtrOff = DAG.getNode(ISD::SUB, CLI.DL, PtrVT, FramePtr, Const);
+      Chain = DAG.getStore(Chain, CLI.DL, Arg, PtrOff, MachinePointerInfo());
+    }
+
+    // Pass the current stack frame pointer via SBF::R5, gluing the
+    // instruction to instructions passing the first 4 arguments in
+    // registers below.
+    Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InFlag);
+    InFlag = Chain.getValue(1);
+  }
+
+  // Build a sequence of copy-to-reg nodes chained together with token chain and
+  // flag operands which copy the outgoing args into registers.  The InFlag is
+  // necessary since all emitted instructions must be stuck together.
+  for (auto &Reg : RegsToPass) {
+    Chain = DAG.getCopyToReg(Chain, CLI.DL, Reg.first, Reg.second, InFlag);
+    InFlag = Chain.getValue(1);
+  }
+
+  // If the callee is a GlobalAddress node (quite common, every direct call is)
+  // turn it into a TargetGlobalAddress node so that legalize doesn't hack it.
+  // Likewise ExternalSymbol -> TargetExternalSymbol.
+  if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee)) {
+    Callee = DAG.getTargetGlobalAddress(G->getGlobal(), CLI.DL, PtrVT,
+                                        G->getOffset(), 0);
+  } else if (ExternalSymbolSDNode *E = dyn_cast<ExternalSymbolSDNode>(Callee)) {
+    Callee = DAG.getTargetExternalSymbol(E->getSymbol(), PtrVT, 0);
+    // This is not a warning but info, will be resolved on load
+    if (!Subtarget->isSolana()) {
+      fail(CLI.DL, DAG, Twine("A call to built-in function '"
+                              + StringRef(E->getSymbol())
+                              + "' remains unresolved"));
+    }
+  }
+
+  // Returns a chain & a flag for retval copy to use.
+  SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue);
+  SmallVector<SDValue, 8> Ops;
+  Ops.push_back(Chain);
+  Ops.push_back(Callee);
+
+  // Add argument registers to the end of the list so that they are
+  // known live into the call.
+  for (auto &Reg : RegsToPass)
+    Ops.push_back(DAG.getRegister(Reg.first, Reg.second.getValueType()));
+
+  if (HasStackArgs) {
+    Ops.push_back(DAG.getRegister(SBF::R5, MVT::i64));
+  }
+
+  if (InFlag.getNode())
+    Ops.push_back(InFlag);
+
+  Chain = DAG.getNode(SBFISD::CALL, CLI.DL, NodeTys, Ops);
+  InFlag = Chain.getValue(1);
+
+  // Create the CALLSEQ_END node.
+  Chain = DAG.getCALLSEQ_END(
+      Chain, DAG.getConstant(NumBytes, CLI.DL, PtrVT, true),
+      DAG.getConstant(0, CLI.DL, PtrVT, true), InFlag, CLI.DL);
+  InFlag = Chain.getValue(1);
+
+  // Handle result values, copying them out of physregs into vregs that we
+  // return.
+  return LowerCallResult(Chain, InFlag, CallConv, IsVarArg, Ins, CLI.DL, DAG,
+                         InVals);
+}
+
+bool SBFTargetLowering::shouldSignExtendTypeInLibCall(EVT Type, bool IsSigned) const {
+  return Subtarget->isSolana() && (IsSigned || Type == MVT::i32);
+}
+
+bool SBFTargetLowering::CanLowerReturn(
+    CallingConv::ID CallConv, MachineFunction &MF, bool IsVarArg,
+    const SmallVectorImpl<ISD::OutputArg> &Outs, LLVMContext &Context) const {
+  if (!Subtarget->isSolana()) {
+    return true;
+  }
+  // At minimal return Outs.size() <= 1, or check valid types in CC.
+  SmallVector<CCValAssign, 16> RVLocs;
+  CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, Context);
+  return CCInfo.CheckReturn(Outs, getHasAlu32() ? RetCC_SBF32 : RetCC_SBF64);
+}
+
+SDValue
+SBFTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
+                               bool IsVarArg,
+                               const SmallVectorImpl<ISD::OutputArg> &Outs,
+                               const SmallVectorImpl<SDValue> &OutVals,
+                               const SDLoc &DL, SelectionDAG &DAG) const {
+  unsigned Opc = SBFISD::RET_FLAG;
+
+  // CCValAssign - represent the assignment of the return value to a location
+  SmallVector<CCValAssign, 16> RVLocs;
+  MachineFunction &MF = DAG.getMachineFunction();
+
+  // CCState - Info about the registers and stack slot.
+  CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, *DAG.getContext());
+
+  if (Subtarget->isSolana()) {
+    if (Outs.size() > 1) {
+      fail(DL, DAG, "Only a single return supported");
+      assert(false);
+    }
+  } else if (MF.getFunction().getReturnType()->isAggregateType()) {
+    fail(DL, DAG, "only integer returns supported");
+    return DAG.getNode(Opc, DL, MVT::Other, Chain);
+  }
+
+  // Analize return values.
+  CCInfo.AnalyzeReturn(Outs, getHasAlu32() ? RetCC_SBF32 : RetCC_SBF64);
+
+  SDValue Flag;
+  SmallVector<SDValue, 4> RetOps(1, Chain);
+
+  // Copy the result values into the output registers.
+  for (unsigned i = 0; i != RVLocs.size(); ++i) {
+    CCValAssign &VA = RVLocs[i];
+    assert(VA.isRegLoc() && "Can only return in registers!");
+
+    Chain = DAG.getCopyToReg(Chain, DL, VA.getLocReg(), OutVals[i], Flag);
+
+    // Guarantee that all emitted copies are stuck together,
+    // avoiding something bad.
+    Flag = Chain.getValue(1);
+    RetOps.push_back(DAG.getRegister(VA.getLocReg(), VA.getLocVT()));
+  }
+
+  RetOps[0] = Chain; // Update chain.
+
+  // Add the flag if we have it.
+  if (Flag.getNode())
+    RetOps.push_back(Flag);
+
+  return DAG.getNode(Opc, DL, MVT::Other, RetOps);
+}
+
+SDValue SBFTargetLowering::LowerCallResult(
+    SDValue Chain, SDValue InFlag, CallingConv::ID CallConv, bool IsVarArg,
+    const SmallVectorImpl<ISD::InputArg> &Ins, const SDLoc &DL,
+    SelectionDAG &DAG, SmallVectorImpl<SDValue> &InVals) const {
+
+  MachineFunction &MF = DAG.getMachineFunction();
+  // Assign locations to each value returned by this call.
+  SmallVector<CCValAssign, 16> RVLocs;
+  CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, *DAG.getContext());
+
+  if (Subtarget->isSolana()) {
+    if (Ins.size() > 1) {
+      fail(DL, DAG, "Only a single return supported");
+      assert(false);
+    }
+  } else if (Ins.size() >= 2) {
+    fail(DL, DAG, "only small returns supported");
+    for (unsigned i = 0, e = Ins.size(); i != e; ++i)
+      InVals.push_back(DAG.getConstant(0, DL, Ins[i].VT));
+    return DAG.getCopyFromReg(Chain, DL, 1, Ins[0].VT, InFlag).getValue(1);
+  }
+
+  CCInfo.AnalyzeCallResult(Ins, getHasAlu32() ? RetCC_SBF32 : RetCC_SBF64);
+
+  // Copy all of the result registers out of their specified physreg.
+  for (auto &Val : RVLocs) {
+    Chain = DAG.getCopyFromReg(Chain, DL, Val.getLocReg(),
+                               Val.getValVT(), InFlag).getValue(1);
+    InFlag = Chain.getValue(2);
+    InVals.push_back(Chain.getValue(0));
+  }
+
+  return Chain;
+}
+
+static void NegateCC(SDValue &LHS, SDValue &RHS, ISD::CondCode &CC) {
+  switch (CC) {
+  default:
+    break;
+  case ISD::SETULT:
+  case ISD::SETULE:
+  case ISD::SETLT:
+  case ISD::SETLE:
+    CC = ISD::getSetCCSwappedOperands(CC);
+    std::swap(LHS, RHS);
+    break;
+  }
+}
+
+SDValue SBFTargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
+  SDValue Chain = Op.getOperand(0);
+  ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(1))->get();
+  SDValue LHS = Op.getOperand(2);
+  SDValue RHS = Op.getOperand(3);
+  SDValue Dest = Op.getOperand(4);
+  SDLoc DL(Op);
+
+  if (!getHasJmpExt())
+    NegateCC(LHS, RHS, CC);
+
+  return DAG.getNode(SBFISD::BR_CC, DL, Op.getValueType(), Chain, LHS, RHS,
+                     DAG.getConstant(CC, DL, LHS.getValueType()), Dest);
+}
+
+SDValue SBFTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
+  SDValue LHS = Op.getOperand(0);
+  SDValue RHS = Op.getOperand(1);
+  SDValue TrueV = Op.getOperand(2);
+  SDValue FalseV = Op.getOperand(3);
+  ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(4))->get();
+  SDLoc DL(Op);
+
+  if (!getHasJmpExt())
+    NegateCC(LHS, RHS, CC);
+
+  SDValue TargetCC = DAG.getConstant(CC, DL, LHS.getValueType());
+  SDVTList VTs = DAG.getVTList(Op.getValueType(), MVT::Glue);
+  SDValue Ops[] = {LHS, RHS, TargetCC, TrueV, FalseV};
+
+  return DAG.getNode(SBFISD::SELECT_CC, DL, VTs, Ops);
+}
+
+SDValue SBFTargetLowering::LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  AtomicSDNode *AN = cast<AtomicSDNode>(Op);
+  assert(AN && "Expected custom lowering of an atomic load node");
+
+  SDValue Chain = AN->getChain();
+  SDValue Ptr = AN->getBasePtr();
+  EVT PtrVT = AN->getMemoryVT();
+  EVT RetVT = Op.getValueType();
+
+  // Load the current value
+  SDValue Load =
+      DAG.getExtLoad(ISD::EXTLOAD, DL, RetVT, Chain, Ptr, MachinePointerInfo(),
+                     PtrVT, AN->getAlignment());
+  Chain = Load.getValue(1);
+
+  // Most ops return the current value, except CMP_SWAP_WITH_SUCCESS see below
+  SDValue Ret = Load;
+  SDValue RetFlag;
+
+  // Val contains the new value we want to set. For CMP_SWAP, Cmp contains the
+  // expected current value.
+  SDValue Cmp, Val;
+  if (AN->isCompareAndSwap()) {
+    Cmp = Op.getOperand(2);
+    Val = Op.getOperand(3);
+
+    // The Cmp value must match the pointer type
+    EVT CmpVT = Cmp->getValueType(0);
+    if (CmpVT != RetVT) {
+      Cmp = RetVT.bitsGT(CmpVT) ? DAG.getNode(ISD::SIGN_EXTEND, DL, RetVT, Cmp)
+                                : DAG.getNode(ISD::TRUNCATE, DL, RetVT, Cmp);
+    }
+  } else {
+    Val = AN->getVal();
+  }
+
+  // The new value type must match the pointer type
+  EVT ValVT = Val->getValueType(0);
+  if (ValVT != RetVT) {
+    Val = RetVT.bitsGT(ValVT) ? DAG.getNode(ISD::SIGN_EXTEND, DL, RetVT, Val)
+                              : DAG.getNode(ISD::TRUNCATE, DL, RetVT, Val);
+    ValVT = Val->getValueType(0);
+  }
+
+  SDValue NewVal;
+  switch (Op.getOpcode()) {
+  case ISD::ATOMIC_SWAP:
+    NewVal = Val;
+    break;
+  case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS: {
+    EVT RetFlagVT = AN->getValueType(1);
+    NewVal = DAG.getSelectCC(DL, Load, Cmp, Val, Load, ISD::SETEQ);
+    RetFlag = DAG.getSelectCC(
+        DL, Load, Cmp, DAG.getBoolConstant(true, DL, RetFlagVT, RetFlagVT),
+        DAG.getBoolConstant(false, DL, RetFlagVT, RetFlagVT), ISD::SETEQ);
+    break;
+  }
+  case ISD::ATOMIC_LOAD_ADD:
+    NewVal = DAG.getNode(ISD::ADD, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_SUB:
+    NewVal = DAG.getNode(ISD::SUB, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_AND:
+    NewVal = DAG.getNode(ISD::AND, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_NAND: {
+    NewVal =
+        DAG.getNOT(DL, DAG.getNode(ISD::AND, DL, ValVT, Load, Val), ValVT);
+    break;
+  }
+  case ISD::ATOMIC_LOAD_OR:
+    NewVal = DAG.getNode(ISD::OR, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_XOR:
+    NewVal = DAG.getNode(ISD::XOR, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_MIN:
+    NewVal = DAG.getNode(ISD::SMIN, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_UMIN:
+    NewVal = DAG.getNode(ISD::UMIN, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_MAX:
+    NewVal = DAG.getNode(ISD::SMAX, DL, ValVT, Load, Val);
+    break;
+  case ISD::ATOMIC_LOAD_UMAX:
+    NewVal = DAG.getNode(ISD::UMAX, DL, ValVT, Load, Val);
+    break;
+  default:
+    llvm_unreachable("unknown atomicrmw op");
+  }
+
+  Chain =
+      DAG.getTruncStore(Chain, DL, NewVal, Ptr, MachinePointerInfo(), PtrVT);
+
+  if (RetFlag) {
+    // CMP_SWAP_WITH_SUCCESS returns {value, success, chain}
+    Ret = DAG.getMergeValues({Ret, RetFlag, Chain}, DL);
+  } else {
+    // All the other ops return {value, chain}
+    Ret = DAG.getMergeValues({Ret, Chain}, DL);
+  }
+
+  return Ret;
+}
+
+const char *SBFTargetLowering::getTargetNodeName(unsigned Opcode) const {
+  switch ((SBFISD::NodeType)Opcode) {
+  case SBFISD::FIRST_NUMBER:
+    break;
+  case SBFISD::RET_FLAG:
+    return "SBFISD::RET_FLAG";
+  case SBFISD::CALL:
+    return "SBFISD::CALL";
+  case SBFISD::SELECT_CC:
+    return "SBFISD::SELECT_CC";
+  case SBFISD::BR_CC:
+    return "SBFISD::BR_CC";
+  case SBFISD::Wrapper:
+    return "SBFISD::Wrapper";
+  case SBFISD::MEMCPY:
+    return "SBFISD::MEMCPY";
+  }
+  return nullptr;
+}
+
+SDValue SBFTargetLowering::LowerGlobalAddress(SDValue Op,
+                                              SelectionDAG &DAG) const {
+  auto N = cast<GlobalAddressSDNode>(Op);
+  assert(N->getOffset() == 0 && "Invalid offset for global address");
+
+  SDLoc DL(Op);
+  const GlobalValue *GV = N->getGlobal();
+  SDValue GA = DAG.getTargetGlobalAddress(GV, DL, MVT::i64);
+
+  return DAG.getNode(SBFISD::Wrapper, DL, MVT::i64, GA);
+}
+
+unsigned
+SBFTargetLowering::EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB,
+                                 unsigned Reg, bool isSigned) const {
+  const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
+  const TargetRegisterClass *RC = getRegClassFor(MVT::i64);
+  int RShiftOp = isSigned ? SBF::SRA_ri : SBF::SRL_ri;
+  MachineFunction *F = BB->getParent();
+  DebugLoc DL = MI.getDebugLoc();
+
+  MachineRegisterInfo &RegInfo = F->getRegInfo();
+
+  if (!isSigned) {
+    Register PromotedReg0 = RegInfo.createVirtualRegister(RC);
+    BuildMI(BB, DL, TII.get(SBF::MOV_32_64), PromotedReg0).addReg(Reg);
+    return PromotedReg0;
+  }
+  Register PromotedReg0 = RegInfo.createVirtualRegister(RC);
+  Register PromotedReg1 = RegInfo.createVirtualRegister(RC);
+  Register PromotedReg2 = RegInfo.createVirtualRegister(RC);
+  BuildMI(BB, DL, TII.get(SBF::MOV_32_64), PromotedReg0).addReg(Reg);
+  BuildMI(BB, DL, TII.get(SBF::SLL_ri), PromotedReg1)
+    .addReg(PromotedReg0).addImm(32);
+  BuildMI(BB, DL, TII.get(RShiftOp), PromotedReg2)
+    .addReg(PromotedReg1).addImm(32);
+
+  return PromotedReg2;
+}
+
+MachineBasicBlock *
+SBFTargetLowering::EmitInstrWithCustomInserterMemcpy(MachineInstr &MI,
+                                                     MachineBasicBlock *BB)
+                                                     const {
+  MachineFunction *MF = MI.getParent()->getParent();
+  MachineRegisterInfo &MRI = MF->getRegInfo();
+  MachineInstrBuilder MIB(*MF, MI);
+  unsigned ScratchReg;
+
+  // This function does custom insertion during lowering SBFISD::MEMCPY which
+  // only has two register operands from memcpy semantics, the copy source
+  // address and the copy destination address.
+  //
+  // Because we will expand SBFISD::MEMCPY into load/store pairs, we will need
+  // a third scratch register to serve as the destination register of load and
+  // source register of store.
+  //
+  // The scratch register here is with the Define | Dead | EarlyClobber flags.
+  // The EarlyClobber flag has the semantic property that the operand it is
+  // attached to is clobbered before the rest of the inputs are read. Hence it
+  // must be unique among the operands to the instruction. The Define flag is
+  // needed to coerce the machine verifier that an Undef value isn't a problem
+  // as we anyway is loading memory into it. The Dead flag is needed as the
+  // value in scratch isn't supposed to be used by any other instruction.
+  ScratchReg = MRI.createVirtualRegister(&SBF::GPRRegClass);
+  MIB.addReg(ScratchReg,
+             RegState::Define | RegState::Dead | RegState::EarlyClobber);
+
+  return BB;
+}
+
+MachineBasicBlock *
+SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
+                                               MachineBasicBlock *BB) const {
+  const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
+  DebugLoc DL = MI.getDebugLoc();
+  unsigned Opc = MI.getOpcode();
+  bool isSelectRROp = (Opc == SBF::Select ||
+                       Opc == SBF::Select_64_32 ||
+                       Opc == SBF::Select_32 ||
+                       Opc == SBF::Select_32_64);
+
+  bool isMemcpyOp = Opc == SBF::MEMCPY;
+  bool isAtomicFence = Opc == SBF::ATOMIC_FENCE;
+
+#ifndef NDEBUG
+  bool isSelectRIOp = (Opc == SBF::Select_Ri ||
+                       Opc == SBF::Select_Ri_64_32 ||
+                       Opc == SBF::Select_Ri_32 ||
+                       Opc == SBF::Select_Ri_32_64);
+
+
+  assert((isSelectRROp || isSelectRIOp || isMemcpyOp || isAtomicFence) &&
+         "Unexpected instr type to insert");
+#endif
+
+  if (isMemcpyOp)
+    return EmitInstrWithCustomInserterMemcpy(MI, BB);
+
+  if (isAtomicFence) {
+    // this is currently a nop
+    MI.eraseFromParent();
+    return BB;
+  }
+
+  bool is32BitCmp = (Opc == SBF::Select_32 ||
+                     Opc == SBF::Select_32_64 ||
+                     Opc == SBF::Select_Ri_32 ||
+                     Opc == SBF::Select_Ri_32_64);
+
+  // To "insert" a SELECT instruction, we actually have to insert the diamond
+  // control-flow pattern.  The incoming instruction knows the destination vreg
+  // to set, the condition code register to branch on, the true/false values to
+  // select between, and a branch opcode to use.
+  const BasicBlock *LLVM_BB = BB->getBasicBlock();
+  MachineFunction::iterator I = ++BB->getIterator();
+
+  // ThisMBB:
+  // ...
+  //  TrueVal = ...
+  //  jmp_XX r1, r2 goto Copy1MBB
+  //  fallthrough --> Copy0MBB
+  MachineBasicBlock *ThisMBB = BB;
+  MachineFunction *F = BB->getParent();
+  MachineBasicBlock *Copy0MBB = F->CreateMachineBasicBlock(LLVM_BB);
+  MachineBasicBlock *Copy1MBB = F->CreateMachineBasicBlock(LLVM_BB);
+
+  F->insert(I, Copy0MBB);
+  F->insert(I, Copy1MBB);
+  // Update machine-CFG edges by transferring all successors of the current
+  // block to the new block which will contain the Phi node for the select.
+  Copy1MBB->splice(Copy1MBB->begin(), BB,
+                   std::next(MachineBasicBlock::iterator(MI)), BB->end());
+  Copy1MBB->transferSuccessorsAndUpdatePHIs(BB);
+  // Next, add the true and fallthrough blocks as its successors.
+  BB->addSuccessor(Copy0MBB);
+  BB->addSuccessor(Copy1MBB);
+
+  // Insert Branch if Flag
+  int CC = MI.getOperand(3).getImm();
+  int NewCC;
+  switch (CC) {
+#define SET_NEWCC(X, Y) \
+  case ISD::X: \
+    if (is32BitCmp && HasJmp32) \
+      NewCC = isSelectRROp ? SBF::Y##_rr_32 : SBF::Y##_ri_32; \
+    else \
+      NewCC = isSelectRROp ? SBF::Y##_rr : SBF::Y##_ri; \
+    break
+  SET_NEWCC(SETGT, JSGT);
+  SET_NEWCC(SETUGT, JUGT);
+  SET_NEWCC(SETGE, JSGE);
+  SET_NEWCC(SETUGE, JUGE);
+  SET_NEWCC(SETEQ, JEQ);
+  SET_NEWCC(SETNE, JNE);
+  SET_NEWCC(SETLT, JSLT);
+  SET_NEWCC(SETULT, JULT);
+  SET_NEWCC(SETLE, JSLE);
+  SET_NEWCC(SETULE, JULE);
+  default:
+    report_fatal_error("unimplemented select CondCode " + Twine(CC));
+  }
+
+  Register LHS = MI.getOperand(1).getReg();
+  bool isSignedCmp = (CC == ISD::SETGT ||
+                      CC == ISD::SETGE ||
+                      CC == ISD::SETLT ||
+                      CC == ISD::SETLE);
+
+  // eBPF at the moment only has 64-bit comparison. Any 32-bit comparison need
+  // to be promoted, however if the 32-bit comparison operands are destination
+  // registers then they are implicitly zero-extended already, there is no
+  // need of explicit zero-extend sequence for them.
+  //
+  // We simply do extension for all situations in this method, but we will
+  // try to remove those unnecessary in SBFMIPeephole pass.
+  if (is32BitCmp && !HasJmp32)
+    LHS = EmitSubregExt(MI, BB, LHS, isSignedCmp);
+
+  if (isSelectRROp) {
+    Register RHS = MI.getOperand(2).getReg();
+
+    if (is32BitCmp && !HasJmp32)
+      RHS = EmitSubregExt(MI, BB, RHS, isSignedCmp);
+
+    BuildMI(BB, DL, TII.get(NewCC)).addReg(LHS).addReg(RHS).addMBB(Copy1MBB);
+  } else {
+    int64_t imm32 = MI.getOperand(2).getImm();
+    // Check before we build J*_ri instruction.
+    assert (isInt<32>(imm32));
+    BuildMI(BB, DL, TII.get(NewCC))
+        .addReg(LHS).addImm(imm32).addMBB(Copy1MBB);
+  }
+
+  // Copy0MBB:
+  //  %FalseValue = ...
+  //  # fallthrough to Copy1MBB
+  BB = Copy0MBB;
+
+  // Update machine-CFG edges
+  BB->addSuccessor(Copy1MBB);
+
+  // Copy1MBB:
+  //  %Result = phi [ %FalseValue, Copy0MBB ], [ %TrueValue, ThisMBB ]
+  // ...
+  BB = Copy1MBB;
+  BuildMI(*BB, BB->begin(), DL, TII.get(SBF::PHI), MI.getOperand(0).getReg())
+      .addReg(MI.getOperand(5).getReg())
+      .addMBB(Copy0MBB)
+      .addReg(MI.getOperand(4).getReg())
+      .addMBB(ThisMBB);
+
+  MI.eraseFromParent(); // The pseudo instruction is gone now.
+  return BB;
+}
+
+EVT SBFTargetLowering::getSetCCResultType(const DataLayout &, LLVMContext &,
+                                          EVT VT) const {
+  return getHasAlu32() ? MVT::i32 : MVT::i64;
+}
+
+MVT SBFTargetLowering::getScalarShiftAmountTy(const DataLayout &DL,
+                                              EVT VT) const {
+  return (getHasAlu32() && VT == MVT::i32) ? MVT::i32 : MVT::i64;
+}
+
+bool SBFTargetLowering::isLegalAddressingMode(const DataLayout &DL,
+                                              const AddrMode &AM, Type *Ty,
+                                              unsigned AS,
+                                              Instruction *I) const {
+  // No global is ever allowed as a base.
+  if (AM.BaseGV)
+    return false;
+
+  switch (AM.Scale) {
+  case 0: // "r+i" or just "i", depending on HasBaseReg.
+    break;
+  case 1:
+    if (!AM.HasBaseReg) // allow "r+i".
+      break;
+    return false; // disallow "r+r" or "r+r+i".
+  default:
+    return false;
+  }
+
+  return true;
+}
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
new file mode 100644
index 0000000000000..da0739ac6116e
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -0,0 +1,174 @@
+//===-- SBFISelLowering.h - SBF DAG Lowering Interface ----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the interfaces that SBF uses to lower LLVM code into a
+// selection DAG.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFISELLOWERING_H
+#define LLVM_LIB_TARGET_SBF_SBFISELLOWERING_H
+
+#include "SBF.h"
+#include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/CodeGen/TargetLowering.h"
+
+namespace llvm {
+class SBFSubtarget;
+namespace SBFISD {
+enum NodeType : unsigned {
+  FIRST_NUMBER = ISD::BUILTIN_OP_END,
+  RET_FLAG,
+  CALL,
+  SELECT_CC,
+  BR_CC,
+  Wrapper,
+  MEMCPY
+};
+}
+
+class SBFTargetLowering : public TargetLowering {
+  const SBFSubtarget *Subtarget;
+public:
+  explicit SBFTargetLowering(const TargetMachine &TM, const SBFSubtarget &STI);
+
+  bool allowsMisalignedMemoryAccesses(EVT VT, unsigned, Align,
+                                      MachineMemOperand::Flags,
+                                      bool *) const override;
+
+  // Provide custom lowering hooks for some operations.
+  SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const override;
+
+  // This method returns the name of a target specific DAG node.
+  const char *getTargetNodeName(unsigned Opcode) const override;
+
+  // This method decides whether folding a constant offset
+  // with the given GlobalAddress is legal.
+  bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const override;
+
+  SBFTargetLowering::ConstraintType
+  getConstraintType(StringRef Constraint) const override;
+
+  std::pair<unsigned, const TargetRegisterClass *>
+  getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
+                               StringRef Constraint, MVT VT) const override;
+
+  MachineBasicBlock *
+  EmitInstrWithCustomInserter(MachineInstr &MI,
+                              MachineBasicBlock *BB) const override;
+
+  bool getHasAlu32() const { return HasAlu32; }
+  bool getHasJmp32() const { return HasJmp32; }
+  bool getHasJmpExt() const { return HasJmpExt; }
+
+  EVT getSetCCResultType(const DataLayout &DL, LLVMContext &Context,
+                         EVT VT) const override;
+
+  MVT getScalarShiftAmountTy(const DataLayout &, EVT) const override;
+
+  bool lowerAtomicStoreAsStoreSDNode(const StoreInst &SI) const override;
+  bool lowerAtomicLoadAsLoadSDNode(const LoadInst &LI) const override;
+
+private:
+  // Control Instruction Selection Features
+  bool HasAlu32;
+  bool HasJmp32;
+  bool HasJmpExt;
+
+  SDValue LowerBR_CC(SDValue Op, SelectionDAG &DAG) const;
+  SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const;
+  SDValue LowerGlobalAddress(SDValue Op, SelectionDAG &DAG) const;
+  SDValue LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const;
+
+  // Lower the result values of a call, copying them out of physregs into vregs
+  SDValue LowerCallResult(SDValue Chain, SDValue InFlag,
+                          CallingConv::ID CallConv, bool IsVarArg,
+                          const SmallVectorImpl<ISD::InputArg> &Ins,
+                          const SDLoc &DL, SelectionDAG &DAG,
+                          SmallVectorImpl<SDValue> &InVals) const;
+
+  // Maximum number of arguments to a call
+  static const unsigned MaxArgs;
+
+  // Lower a call into CALLSEQ_START - SBFISD:CALL - CALLSEQ_END chain
+  SDValue LowerCall(TargetLowering::CallLoweringInfo &CLI,
+                    SmallVectorImpl<SDValue> &InVals) const override;
+
+  /// Returns true if arguments should be sign-extended in lib calls.
+  bool shouldSignExtendTypeInLibCall(EVT Type, bool IsSigned) const override;
+
+  // Lower incoming arguments, copy physregs into vregs
+  SDValue LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv,
+                               bool IsVarArg,
+                               const SmallVectorImpl<ISD::InputArg> &Ins,
+                               const SDLoc &DL, SelectionDAG &DAG,
+                               SmallVectorImpl<SDValue> &InVals) const override;
+
+  bool CanLowerReturn(CallingConv::ID CallConv, MachineFunction &MF,
+                        bool IsVarArg,
+                        const SmallVectorImpl<ISD::OutputArg> &Outs,
+                        LLVMContext &Context) const override;
+
+  SDValue LowerReturn(SDValue Chain, CallingConv::ID CallConv, bool IsVarArg,
+                      const SmallVectorImpl<ISD::OutputArg> &Outs,
+                      const SmallVectorImpl<SDValue> &OutVals, const SDLoc &DL,
+                      SelectionDAG &DAG) const override;
+
+  void ReplaceNodeResults(SDNode *N, SmallVectorImpl<SDValue> &Results,
+                          SelectionDAG &DAG) const override;
+
+  EVT getOptimalMemOpType(const MemOp &Op,
+                          const AttributeList &FuncAttributes) const override {
+    return Op.size() >= 8 ? MVT::i64 : MVT::i32;
+  }
+
+  bool isIntDivCheap(EVT VT, AttributeList Attr) const override { return true; }
+
+  bool shouldConvertConstantLoadToIntImm(const APInt &Imm,
+                                         Type *Ty) const override {
+    return true;
+  }
+
+  // Prevent reducing load width during SelectionDag phase.
+  // Otherwise, we may transform the following
+  //   ctx = ctx + reloc_offset
+  //   ... (*(u32 *)ctx) & 0x8000...
+  // to
+  //   ctx = ctx + reloc_offset
+  //   ... (*(u8 *)(ctx + 1)) & 0x80 ...
+  // which will be rejected by the verifier.
+  bool shouldReduceLoadWidth(SDNode *Load, ISD::LoadExtType ExtTy,
+                             EVT NewVT) const override {
+    return false;
+  }
+
+  bool isLegalAddressingMode(const DataLayout &DL, const AddrMode &AM,
+                             Type *Ty, unsigned AS,
+                             Instruction *I = nullptr) const override;
+
+  // isTruncateFree - Return true if it's free to truncate a value of
+  // type Ty1 to type Ty2. e.g. On SBF at alu32 mode, it's free to truncate
+  // a i64 value in register R1 to i32 by referencing its sub-register W1.
+  bool isTruncateFree(Type *Ty1, Type *Ty2) const override;
+  bool isTruncateFree(EVT VT1, EVT VT2) const override;
+
+  // For 32bit ALU result zext to 64bit is free.
+  bool isZExtFree(Type *Ty1, Type *Ty2) const override;
+  bool isZExtFree(EVT VT1, EVT VT2) const override;
+
+  unsigned EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB, unsigned Reg,
+                         bool isSigned) const;
+
+  MachineBasicBlock * EmitInstrWithCustomInserterMemcpy(MachineInstr &MI,
+                                                        MachineBasicBlock *BB)
+                                                        const;
+
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
new file mode 100644
index 0000000000000..bb42a6141e6d0
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -0,0 +1,124 @@
+//===-- SBFInstrFormats.td - SBF Instruction Formats -------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+class SBFOpClass<bits<3> val> {
+  bits<3> Value = val;
+}
+
+def SBF_LD    : SBFOpClass<0x0>;
+def SBF_LDX   : SBFOpClass<0x1>;
+def SBF_ST    : SBFOpClass<0x2>;
+def SBF_STX   : SBFOpClass<0x3>;
+def SBF_ALU   : SBFOpClass<0x4>;
+def SBF_JMP   : SBFOpClass<0x5>;
+def SBF_JMP32 : SBFOpClass<0x6>;
+def SBF_ALU64 : SBFOpClass<0x7>;
+
+class SBFSrcType<bits<1> val> {
+  bits<1> Value = val;
+}
+
+def SBF_K : SBFSrcType<0x0>;
+def SBF_X : SBFSrcType<0x1>;
+
+class SBFArithOp<bits<4> val> {
+  bits<4> Value = val;
+}
+
+def SBF_ADD  : SBFArithOp<0x0>;
+def SBF_SUB  : SBFArithOp<0x1>;
+def SBF_MUL  : SBFArithOp<0x2>;
+def SBF_DIV  : SBFArithOp<0x3>;
+def SBF_OR   : SBFArithOp<0x4>;
+def SBF_AND  : SBFArithOp<0x5>;
+def SBF_LSH  : SBFArithOp<0x6>;
+def SBF_RSH  : SBFArithOp<0x7>;
+def SBF_NEG  : SBFArithOp<0x8>;
+def SBF_XOR  : SBFArithOp<0xa>;
+def SBF_MOV  : SBFArithOp<0xb>;
+def SBF_ARSH : SBFArithOp<0xc>;
+def SBF_END  : SBFArithOp<0xd>;
+def SBF_SDIV : SBFArithOp<0xe>;
+
+def SBF_XCHG    : SBFArithOp<0xe>;
+def SBF_CMPXCHG : SBFArithOp<0xf>;
+
+class SBFEndDir<bits<1> val> {
+  bits<1> Value = val;
+}
+
+def SBF_TO_LE : SBFSrcType<0x0>;
+def SBF_TO_BE : SBFSrcType<0x1>;
+
+class SBFJumpOp<bits<4> val> {
+  bits<4> Value = val;
+}
+
+def SBF_JA   : SBFJumpOp<0x0>;
+def SBF_JEQ  : SBFJumpOp<0x1>;
+def SBF_JGT  : SBFJumpOp<0x2>;
+def SBF_JGE  : SBFJumpOp<0x3>;
+def SBF_JNE  : SBFJumpOp<0x5>;
+def SBF_JSGT : SBFJumpOp<0x6>;
+def SBF_JSGE : SBFJumpOp<0x7>;
+def SBF_CALL : SBFJumpOp<0x8>;
+def SBF_EXIT : SBFJumpOp<0x9>;
+def SBF_JLT  : SBFJumpOp<0xa>;
+def SBF_JLE  : SBFJumpOp<0xb>;
+def SBF_JSLT : SBFJumpOp<0xc>;
+def SBF_JSLE : SBFJumpOp<0xd>;
+
+class SBFWidthModifer<bits<2> val> {
+  bits<2> Value = val;
+}
+
+def SBF_W  : SBFWidthModifer<0x0>;
+def SBF_H  : SBFWidthModifer<0x1>;
+def SBF_B  : SBFWidthModifer<0x2>;
+def SBF_DW : SBFWidthModifer<0x3>;
+
+class SBFModeModifer<bits<3> val> {
+  bits<3> Value = val;
+}
+
+def SBF_IMM  : SBFModeModifer<0x0>;
+def SBF_ABS  : SBFModeModifer<0x1>;
+def SBF_IND  : SBFModeModifer<0x2>;
+def SBF_MEM  : SBFModeModifer<0x3>;
+def SBF_ATOMIC : SBFModeModifer<0x6>;
+
+class SBFAtomicFlag<bits<4> val> {
+  bits<4> Value = val;
+}
+
+def SBF_FETCH : SBFAtomicFlag<0x1>;
+
+class InstSBF<dag outs, dag ins, string asmstr, list<dag> pattern>
+  : Instruction {
+  field bits<64> Inst;
+  field bits<64> SoftFail = 0;
+  let Size = 8;
+
+  let Namespace = "SBF";
+  let DecoderNamespace = "SBF";
+
+  SBFOpClass SBFClass;
+  let Inst{58-56} = SBFClass.Value;
+
+  dag OutOperandList = outs;
+  dag InOperandList = ins;
+  let AsmString = asmstr;
+  let Pattern = pattern;
+}
+
+// Pseudo instructions
+class Pseudo<dag outs, dag ins, string asmstr, list<dag> pattern>
+  : InstSBF<outs, ins, asmstr, pattern> {
+  let Inst{63-0} = 0;
+  let isPseudo = 1;
+}
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
new file mode 100644
index 0000000000000..886eb9e9c5fd9
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -0,0 +1,260 @@
+//===-- SBFInstrInfo.cpp - SBF Instruction Information ----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the SBF implementation of the TargetInstrInfo class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFInstrInfo.h"
+#include "SBF.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/IR/DebugLoc.h"
+#include "llvm/Support/ErrorHandling.h"
+#include <cassert>
+#include <iterator>
+
+#define GET_INSTRINFO_CTOR_DTOR
+#include "SBFGenInstrInfo.inc"
+
+using namespace llvm;
+
+SBFInstrInfo::SBFInstrInfo()
+    : SBFGenInstrInfo(SBF::ADJCALLSTACKDOWN, SBF::ADJCALLSTACKUP) {}
+
+void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
+                               MachineBasicBlock::iterator I,
+                               const DebugLoc &DL, MCRegister DestReg,
+                               MCRegister SrcReg, bool KillSrc) const {
+  if (SBF::GPRRegClass.contains(DestReg, SrcReg))
+    BuildMI(MBB, I, DL, get(SBF::MOV_rr), DestReg)
+        .addReg(SrcReg, getKillRegState(KillSrc));
+  else if (SBF::GPR32RegClass.contains(DestReg, SrcReg))
+    BuildMI(MBB, I, DL, get(SBF::MOV_rr_32), DestReg)
+        .addReg(SrcReg, getKillRegState(KillSrc));
+  else
+    llvm_unreachable("Impossible reg-to-reg copy");
+}
+
+void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
+  Register DstReg = MI->getOperand(0).getReg();
+  Register SrcReg = MI->getOperand(1).getReg();
+  uint64_t CopyLen = MI->getOperand(2).getImm();
+  uint64_t Alignment = MI->getOperand(3).getImm();
+  Register ScratchReg = MI->getOperand(4).getReg();
+  MachineBasicBlock *BB = MI->getParent();
+  DebugLoc dl = MI->getDebugLoc();
+  unsigned LdOpc, StOpc;
+
+  switch (Alignment) {
+  case 1:
+    LdOpc = SBF::LDB;
+    StOpc = SBF::STB;
+    break;
+  case 2:
+    LdOpc = SBF::LDH;
+    StOpc = SBF::STH;
+    break;
+  case 4:
+    LdOpc = SBF::LDW;
+    StOpc = SBF::STW;
+    break;
+  case 8:
+    LdOpc = SBF::LDD;
+    StOpc = SBF::STD;
+    break;
+  default:
+    llvm_unreachable("unsupported memcpy alignment");
+  }
+
+  unsigned IterationNum = CopyLen >> Log2_64(Alignment);
+  for(unsigned I = 0; I < IterationNum; ++I) {
+    BuildMI(*BB, MI, dl, get(LdOpc))
+            .addReg(ScratchReg, RegState::Define).addReg(SrcReg)
+            .addImm(I * Alignment);
+    BuildMI(*BB, MI, dl, get(StOpc))
+            .addReg(ScratchReg, RegState::Kill).addReg(DstReg)
+            .addImm(I * Alignment);
+  }
+
+  unsigned BytesLeft = CopyLen & (Alignment - 1);
+  unsigned Offset = IterationNum * Alignment;
+  bool Hanging4Byte = BytesLeft & 0x4;
+  bool Hanging2Byte = BytesLeft & 0x2;
+  bool Hanging1Byte = BytesLeft & 0x1;
+  if (Hanging4Byte) {
+    BuildMI(*BB, MI, dl, get(SBF::LDW))
+            .addReg(ScratchReg, RegState::Define).addReg(SrcReg).addImm(Offset);
+    BuildMI(*BB, MI, dl, get(SBF::STW))
+            .addReg(ScratchReg, RegState::Kill).addReg(DstReg).addImm(Offset);
+    Offset += 4;
+  }
+  if (Hanging2Byte) {
+    BuildMI(*BB, MI, dl, get(SBF::LDH))
+            .addReg(ScratchReg, RegState::Define).addReg(SrcReg).addImm(Offset);
+    BuildMI(*BB, MI, dl, get(SBF::STH))
+            .addReg(ScratchReg, RegState::Kill).addReg(DstReg).addImm(Offset);
+    Offset += 2;
+  }
+  if (Hanging1Byte) {
+    BuildMI(*BB, MI, dl, get(SBF::LDB))
+            .addReg(ScratchReg, RegState::Define).addReg(SrcReg).addImm(Offset);
+    BuildMI(*BB, MI, dl, get(SBF::STB))
+            .addReg(ScratchReg, RegState::Kill).addReg(DstReg).addImm(Offset);
+  }
+
+  BB->erase(MI);
+}
+
+bool SBFInstrInfo::expandPostRAPseudo(MachineInstr &MI) const {
+  if (MI.getOpcode() == SBF::MEMCPY) {
+    expandMEMCPY(MI);
+    return true;
+  }
+
+  return false;
+}
+
+void SBFInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
+                                       MachineBasicBlock::iterator I,
+                                       Register SrcReg, bool IsKill, int FI,
+                                       const TargetRegisterClass *RC,
+                                       const TargetRegisterInfo *TRI) const {
+  DebugLoc DL;
+  if (I != MBB.end())
+    DL = I->getDebugLoc();
+
+  if (RC == &SBF::GPRRegClass)
+    BuildMI(MBB, I, DL, get(SBF::STD))
+        .addReg(SrcReg, getKillRegState(IsKill))
+        .addFrameIndex(FI)
+        .addImm(0);
+  else if (RC == &SBF::GPR32RegClass)
+    BuildMI(MBB, I, DL, get(SBF::STW32))
+        .addReg(SrcReg, getKillRegState(IsKill))
+        .addFrameIndex(FI)
+        .addImm(0);
+  else
+    llvm_unreachable("Can't store this register to stack slot");
+}
+
+void SBFInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
+                                        MachineBasicBlock::iterator I,
+                                        Register DestReg, int FI,
+                                        const TargetRegisterClass *RC,
+                                        const TargetRegisterInfo *TRI) const {
+  DebugLoc DL;
+  if (I != MBB.end())
+    DL = I->getDebugLoc();
+
+  if (RC == &SBF::GPRRegClass)
+    BuildMI(MBB, I, DL, get(SBF::LDD), DestReg).addFrameIndex(FI).addImm(0);
+  else if (RC == &SBF::GPR32RegClass)
+    BuildMI(MBB, I, DL, get(SBF::LDW32), DestReg).addFrameIndex(FI).addImm(0);
+  else
+    llvm_unreachable("Can't load this register from stack slot");
+}
+
+bool SBFInstrInfo::analyzeBranch(MachineBasicBlock &MBB,
+                                 MachineBasicBlock *&TBB,
+                                 MachineBasicBlock *&FBB,
+                                 SmallVectorImpl<MachineOperand> &Cond,
+                                 bool AllowModify) const {
+  // Start from the bottom of the block and work up, examining the
+  // terminator instructions.
+  MachineBasicBlock::iterator I = MBB.end();
+  while (I != MBB.begin()) {
+    --I;
+    if (I->isDebugInstr())
+      continue;
+
+    // Working from the bottom, when we see a non-terminator
+    // instruction, we're done.
+    if (!isUnpredicatedTerminator(*I))
+      break;
+
+    // A terminator that isn't a branch can't easily be handled
+    // by this analysis.
+    if (!I->isBranch())
+      return true;
+
+    // Handle unconditional branches.
+    if (I->getOpcode() == SBF::JMP) {
+      if (!AllowModify) {
+        TBB = I->getOperand(0).getMBB();
+        continue;
+      }
+
+      // If the block has any instructions after a J, delete them.
+      while (std::next(I) != MBB.end())
+        std::next(I)->eraseFromParent();
+      Cond.clear();
+      FBB = nullptr;
+
+      // Delete the J if it's equivalent to a fall-through.
+      if (MBB.isLayoutSuccessor(I->getOperand(0).getMBB())) {
+        TBB = nullptr;
+        I->eraseFromParent();
+        I = MBB.end();
+        continue;
+      }
+
+      // TBB is used to indicate the unconditinal destination.
+      TBB = I->getOperand(0).getMBB();
+      continue;
+    }
+    // Cannot handle conditional branches
+    return true;
+  }
+
+  return false;
+}
+
+unsigned SBFInstrInfo::insertBranch(MachineBasicBlock &MBB,
+                                    MachineBasicBlock *TBB,
+                                    MachineBasicBlock *FBB,
+                                    ArrayRef<MachineOperand> Cond,
+                                    const DebugLoc &DL,
+                                    int *BytesAdded) const {
+  assert(!BytesAdded && "code size not handled");
+
+  // Shouldn't be a fall through.
+  assert(TBB && "insertBranch must not be told to insert a fallthrough");
+
+  if (Cond.empty()) {
+    // Unconditional branch
+    assert(!FBB && "Unconditional branch with multiple successors!");
+    BuildMI(&MBB, DL, get(SBF::JMP)).addMBB(TBB);
+    return 1;
+  }
+
+  llvm_unreachable("Unexpected conditional branch");
+}
+
+unsigned SBFInstrInfo::removeBranch(MachineBasicBlock &MBB,
+                                    int *BytesRemoved) const {
+  assert(!BytesRemoved && "code size not handled");
+
+  MachineBasicBlock::iterator I = MBB.end();
+  unsigned Count = 0;
+
+  while (I != MBB.begin()) {
+    --I;
+    if (I->isDebugInstr())
+      continue;
+    if (I->getOpcode() != SBF::JMP)
+      break;
+    // Remove the branch.
+    I->eraseFromParent();
+    I = MBB.end();
+    ++Count;
+  }
+
+  return Count;
+}
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
new file mode 100644
index 0000000000000..150149bff1eed
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -0,0 +1,65 @@
+//===-- SBFInstrInfo.h - SBF Instruction Information ------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the SBF implementation of the TargetInstrInfo class.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFINSTRINFO_H
+#define LLVM_LIB_TARGET_SBF_SBFINSTRINFO_H
+
+#include "SBFRegisterInfo.h"
+#include "llvm/CodeGen/TargetInstrInfo.h"
+
+#define GET_INSTRINFO_HEADER
+#include "SBFGenInstrInfo.inc"
+
+namespace llvm {
+
+class SBFInstrInfo : public SBFGenInstrInfo {
+  const SBFRegisterInfo RI;
+
+public:
+  SBFInstrInfo();
+
+  const SBFRegisterInfo &getRegisterInfo() const { return RI; }
+
+  void copyPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator I,
+                   const DebugLoc &DL, MCRegister DestReg, MCRegister SrcReg,
+                   bool KillSrc) const override;
+
+  bool expandPostRAPseudo(MachineInstr &MI) const override;
+
+  void storeRegToStackSlot(MachineBasicBlock &MBB,
+                           MachineBasicBlock::iterator MBBI, Register SrcReg,
+                           bool isKill, int FrameIndex,
+                           const TargetRegisterClass *RC,
+                           const TargetRegisterInfo *TRI) const override;
+
+  void loadRegFromStackSlot(MachineBasicBlock &MBB,
+                            MachineBasicBlock::iterator MBBI, Register DestReg,
+                            int FrameIndex, const TargetRegisterClass *RC,
+                            const TargetRegisterInfo *TRI) const override;
+  bool analyzeBranch(MachineBasicBlock &MBB, MachineBasicBlock *&TBB,
+                     MachineBasicBlock *&FBB,
+                     SmallVectorImpl<MachineOperand> &Cond,
+                     bool AllowModify) const override;
+
+  unsigned removeBranch(MachineBasicBlock &MBB,
+                        int *BytesRemoved = nullptr) const override;
+  unsigned insertBranch(MachineBasicBlock &MBB, MachineBasicBlock *TBB,
+                        MachineBasicBlock *FBB, ArrayRef<MachineOperand> Cond,
+                        const DebugLoc &DL,
+                        int *BytesAdded = nullptr) const override;
+private:
+  void expandMEMCPY(MachineBasicBlock::iterator) const;
+
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
new file mode 100644
index 0000000000000..44a9abff44732
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -0,0 +1,1008 @@
+//===-- SBFInstrInfo.td - Target Description for SBF Target ---------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file describes the SBF instructions in TableGen format.
+//
+//===----------------------------------------------------------------------===//
+
+include "SBFInstrFormats.td"
+
+// Instruction Operands and Patterns
+
+// These are target-independent nodes, but have target-specific formats.
+def SDT_SBFCallSeqStart : SDCallSeqStart<[SDTCisVT<0, iPTR>,
+                                          SDTCisVT<1, iPTR>]>;
+def SDT_SBFCallSeqEnd   : SDCallSeqEnd<[SDTCisVT<0, iPTR>, SDTCisVT<1, iPTR>]>;
+def SDT_SBFCall         : SDTypeProfile<0, -1, [SDTCisVT<0, iPTR>]>;
+def SDT_SBFSetFlag      : SDTypeProfile<0, 3, [SDTCisSameAs<0, 1>]>;
+def SDT_SBFSelectCC     : SDTypeProfile<1, 5, [SDTCisSameAs<1, 2>,
+                                               SDTCisSameAs<0, 4>,
+                                               SDTCisSameAs<4, 5>]>;
+def SDT_SBFBrCC         : SDTypeProfile<0, 4, [SDTCisSameAs<0, 1>,
+                                               SDTCisVT<3, OtherVT>]>;
+def SDT_SBFWrapper      : SDTypeProfile<1, 1, [SDTCisSameAs<0, 1>,
+                                               SDTCisPtrTy<0>]>;
+def SDT_SBFMEMCPY       : SDTypeProfile<0, 4, [SDTCisVT<0, i64>,
+                                               SDTCisVT<1, i64>,
+                                               SDTCisVT<2, i64>,
+                                               SDTCisVT<3, i64>]>;
+
+def SBFcall         : SDNode<"SBFISD::CALL", SDT_SBFCall,
+                             [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
+                              SDNPVariadic]>;
+def SBFretflag      : SDNode<"SBFISD::RET_FLAG", SDTNone,
+                             [SDNPHasChain, SDNPOptInGlue, SDNPVariadic]>;
+def SBFcallseq_start: SDNode<"ISD::CALLSEQ_START", SDT_SBFCallSeqStart,
+                             [SDNPHasChain, SDNPOutGlue]>;
+def SBFcallseq_end  : SDNode<"ISD::CALLSEQ_END",   SDT_SBFCallSeqEnd,
+                             [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>;
+def SBFbrcc         : SDNode<"SBFISD::BR_CC", SDT_SBFBrCC,
+                             [SDNPHasChain, SDNPOutGlue, SDNPInGlue]>;
+
+def SBFselectcc     : SDNode<"SBFISD::SELECT_CC", SDT_SBFSelectCC, [SDNPInGlue]>;
+def SBFWrapper      : SDNode<"SBFISD::Wrapper", SDT_SBFWrapper>;
+def SBFmemcpy       : SDNode<"SBFISD::MEMCPY", SDT_SBFMEMCPY,
+                             [SDNPHasChain, SDNPInGlue, SDNPOutGlue,
+                              SDNPMayStore, SDNPMayLoad]>;
+def SBFIsLittleEndian : Predicate<"CurDAG->getDataLayout().isLittleEndian()">;
+def SBFIsBigEndian    : Predicate<"!CurDAG->getDataLayout().isLittleEndian()">;
+def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
+def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
+def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
+
+def brtarget : Operand<OtherVT> {
+  let PrintMethod = "printBrTargetOperand";
+}
+def calltarget : Operand<i64>;
+
+def u64imm   : Operand<i64> {
+  let PrintMethod = "printImm64Operand";
+}
+
+def i64immSExt32 : PatLeaf<(i64 imm),
+                [{return isInt<32>(N->getSExtValue()); }]>;
+def i32immSExt32 : PatLeaf<(i32 imm),
+                [{return isInt<32>(N->getSExtValue()); }]>;
+
+// Addressing modes.
+def ADDRri : ComplexPattern<i64, 2, "SelectAddr", [], []>;
+def FIri : ComplexPattern<i64, 2, "SelectFIAddr", [add, or], []>;
+
+// Address operands
+def MEMri : Operand<i64> {
+  let PrintMethod = "printMemOperand";
+  let EncoderMethod = "getMemoryOpValue";
+  let DecoderMethod = "decodeMemoryOpValue";
+  let MIOperandInfo = (ops GPR, i16imm);
+}
+
+// Conditional code predicates - used for pattern matching for jump instructions
+def SBF_CC_EQ  : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETEQ);}]>;
+def SBF_CC_NE  : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETNE);}]>;
+def SBF_CC_GE  : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETGE);}]>;
+def SBF_CC_GT  : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETGT);}]>;
+def SBF_CC_GTU : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETUGT);}]>;
+def SBF_CC_GEU : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETUGE);}]>;
+def SBF_CC_LE  : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETLE);}]>;
+def SBF_CC_LT  : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETLT);}]>;
+def SBF_CC_LTU : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETULT);}]>;
+def SBF_CC_LEU : PatLeaf<(i64 imm),
+                         [{return (N->getZExtValue() == ISD::SETULE);}]>;
+def SBF_CC_EQ_32  : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETEQ);}]>;
+def SBF_CC_NE_32  : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETNE);}]>;
+def SBF_CC_GE_32  : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETGE);}]>;
+def SBF_CC_GT_32  : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETGT);}]>;
+def SBF_CC_GTU_32 : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETUGT);}]>;
+def SBF_CC_GEU_32 : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETUGE);}]>;
+def SBF_CC_LE_32  : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETLE);}]>;
+def SBF_CC_LT_32  : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETLT);}]>;
+def SBF_CC_LTU_32 : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETULT);}]>;
+def SBF_CC_LEU_32 : PatLeaf<(i32 imm),
+                         [{return (N->getZExtValue() == ISD::SETULE);}]>;
+
+// For arithmetic and jump instructions the 8-bit 'code'
+// field is divided into three parts:
+//
+//  +----------------+--------+--------------------+
+//  |   4 bits       |  1 bit |   3 bits           |
+//  | operation code | source | instruction class  |
+//  +----------------+--------+--------------------+
+//  (MSB)                                      (LSB)
+class TYPE_ALU_JMP<bits<4> op, bits<1> srctype,
+                   dag outs, dag ins, string asmstr, list<dag> pattern>
+  : InstSBF<outs, ins, asmstr, pattern> {
+
+  let Inst{63-60} = op;
+  let Inst{59} = srctype;
+}
+
+//For load and store instructions the 8-bit 'code' field is divided as:
+//
+//  +--------+--------+-------------------+
+//  | 3 bits | 2 bits |   3 bits          |
+//  |  mode  |  size  | instruction class |
+//  +--------+--------+-------------------+
+//  (MSB)                             (LSB)
+class TYPE_LD_ST<bits<3> mode, bits<2> size,
+                 dag outs, dag ins, string asmstr, list<dag> pattern>
+  : InstSBF<outs, ins, asmstr, pattern> {
+
+  let Inst{63-61} = mode;
+  let Inst{60-59} = size;
+}
+
+// jump instructions
+class JMP_RR<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+    : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
+                   (outs),
+                   (ins GPR:$dst, GPR:$src, brtarget:$BrDst),
+                   "if $dst "#OpcodeStr#" $src goto $BrDst",
+                   [(SBFbrcc i64:$dst, i64:$src, Cond, bb:$BrDst)]> {
+  bits<4> dst;
+  bits<4> src;
+  bits<16> BrDst;
+
+  let Inst{55-52} = src;
+  let Inst{51-48} = dst;
+  let Inst{47-32} = BrDst;
+  let SBFClass = SBF_JMP;
+}
+
+class JMP_RI<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
+                   (outs),
+                   (ins GPR:$dst, i64imm:$imm, brtarget:$BrDst),
+                   "if $dst "#OpcodeStr#" $imm goto $BrDst",
+                   [(SBFbrcc i64:$dst, i64immSExt32:$imm, Cond, bb:$BrDst)]> {
+  bits<4> dst;
+  bits<16> BrDst;
+  bits<32> imm;
+
+  let Inst{51-48} = dst;
+  let Inst{47-32} = BrDst;
+  let Inst{31-0} = imm;
+  let SBFClass = SBF_JMP;
+}
+
+class JMP_RR_32<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+    : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
+                   (outs),
+                   (ins GPR32:$dst, GPR32:$src, brtarget:$BrDst),
+                   "if $dst "#OpcodeStr#" $src goto $BrDst",
+                   [(SBFbrcc i32:$dst, i32:$src, Cond, bb:$BrDst)]> {
+  bits<4> dst;
+  bits<4> src;
+  bits<16> BrDst;
+
+  let Inst{55-52} = src;
+  let Inst{51-48} = dst;
+  let Inst{47-32} = BrDst;
+  let SBFClass = SBF_JMP32;
+}
+
+class JMP_RI_32<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
+                   (outs),
+                   (ins GPR32:$dst, i32imm:$imm, brtarget:$BrDst),
+                   "if $dst "#OpcodeStr#" $imm goto $BrDst",
+                   [(SBFbrcc i32:$dst, i32immSExt32:$imm, Cond, bb:$BrDst)]> {
+  bits<4> dst;
+  bits<16> BrDst;
+  bits<32> imm;
+
+  let Inst{51-48} = dst;
+  let Inst{47-32} = BrDst;
+  let Inst{31-0} = imm;
+  let SBFClass = SBF_JMP32;
+}
+
+multiclass J<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond, PatLeaf Cond32> {
+  def _rr : JMP_RR<Opc, OpcodeStr, Cond>;
+  def _ri : JMP_RI<Opc, OpcodeStr, Cond>;
+  def _rr_32 : JMP_RR_32<Opc, OpcodeStr, Cond32>;
+  def _ri_32 : JMP_RI_32<Opc, OpcodeStr, Cond32>;
+}
+
+let isBranch = 1, isTerminator = 1, hasDelaySlot=0 in {
+// cmp+goto instructions
+defm JEQ  : J<SBF_JEQ, "==",  SBF_CC_EQ, SBF_CC_EQ_32>;
+defm JUGT : J<SBF_JGT, ">", SBF_CC_GTU, SBF_CC_GTU_32>;
+defm JUGE : J<SBF_JGE, ">=", SBF_CC_GEU, SBF_CC_GEU_32>;
+defm JNE  : J<SBF_JNE, "!=",  SBF_CC_NE, SBF_CC_NE_32>;
+defm JSGT : J<SBF_JSGT, "s>", SBF_CC_GT, SBF_CC_GT_32>;
+defm JSGE : J<SBF_JSGE, "s>=", SBF_CC_GE, SBF_CC_GE_32>;
+defm JULT : J<SBF_JLT, "<", SBF_CC_LTU, SBF_CC_LTU_32>;
+defm JULE : J<SBF_JLE, "<=", SBF_CC_LEU, SBF_CC_LEU_32>;
+defm JSLT : J<SBF_JSLT, "s<", SBF_CC_LT, SBF_CC_LT_32>;
+defm JSLE : J<SBF_JSLE, "s<=", SBF_CC_LE, SBF_CC_LE_32>;
+}
+
+// ALU instructions
+class ALU_RI<SBFOpClass Class, SBFArithOp Opc,
+             dag outs, dag ins, string asmstr, list<dag> pattern>
+    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value, outs, ins, asmstr, pattern> {
+  bits<4> dst;
+  bits<32> imm;
+
+  let Inst{51-48} = dst;
+  let Inst{31-0} = imm;
+  let SBFClass = Class;
+}
+
+class ALU_RR<SBFOpClass Class, SBFArithOp Opc,
+             dag outs, dag ins, string asmstr, list<dag> pattern>
+    : TYPE_ALU_JMP<Opc.Value, SBF_X.Value, outs, ins, asmstr, pattern> {
+  bits<4> dst;
+  bits<4> src;
+
+  let Inst{55-52} = src;
+  let Inst{51-48} = dst;
+  let SBFClass = Class;
+}
+
+multiclass ALU<SBFArithOp Opc, string OpcodeStr, SDNode OpNode> {
+  def _rr : ALU_RR<SBF_ALU64, Opc,
+                   (outs GPR:$dst),
+                   (ins GPR:$src2, GPR:$src),
+                   "$dst "#OpcodeStr#" $src",
+                   [(set GPR:$dst, (OpNode i64:$src2, i64:$src))]>;
+  def _ri : ALU_RI<SBF_ALU64, Opc,
+                   (outs GPR:$dst),
+                   (ins GPR:$src2, i64imm:$imm),
+                   "$dst "#OpcodeStr#" $imm",
+                   [(set GPR:$dst, (OpNode GPR:$src2, i64immSExt32:$imm))]>;
+  def _rr_32 : ALU_RR<SBF_ALU, Opc,
+                   (outs GPR32:$dst),
+                   (ins GPR32:$src2, GPR32:$src),
+                   "$dst "#OpcodeStr#" $src",
+                   [(set GPR32:$dst, (OpNode i32:$src2, i32:$src))]>;
+  def _ri_32 : ALU_RI<SBF_ALU, Opc,
+                   (outs GPR32:$dst),
+                   (ins GPR32:$src2, i32imm:$imm),
+                   "$dst "#OpcodeStr#" $imm",
+                   [(set GPR32:$dst, (OpNode GPR32:$src2, i32immSExt32:$imm))]>;
+}
+
+let Constraints = "$dst = $src2" in {
+    let isAsCheapAsAMove = 1 in {
+        defm ADD : ALU<SBF_ADD, "+=", add>;
+        defm SUB : ALU<SBF_SUB, "-=", sub>;
+        defm OR  : ALU<SBF_OR, "|=", or>;
+        defm AND : ALU<SBF_AND, "&=", and>;
+        defm SLL : ALU<SBF_LSH, "<<=", shl>;
+        defm SRL : ALU<SBF_RSH, ">>=", srl>;
+        defm XOR : ALU<SBF_XOR, "^=", xor>;
+        defm SRA : ALU<SBF_ARSH, "s>>=", sra>;
+    }
+
+    defm MUL : ALU<SBF_MUL, "*=", mul>;
+    defm DIV : ALU<SBF_DIV, "/=", udiv>;
+
+    let Predicates = [SBFSubtargetSolana] in {
+        defm SDIV : ALU<SBF_SDIV, "s/=", sdiv>;
+    }
+}
+
+class NEG_RR<SBFOpClass Class, SBFArithOp Opc,
+             dag outs, dag ins, string asmstr, list<dag> pattern>
+    : TYPE_ALU_JMP<Opc.Value, 0, outs, ins, asmstr, pattern> {
+  bits<4> dst;
+
+  let Inst{51-48} = dst;
+  let SBFClass = Class;
+}
+
+let Constraints = "$dst = $src", isAsCheapAsAMove = 1 in {
+  def NEG_64: NEG_RR<SBF_ALU64, SBF_NEG, (outs GPR:$dst), (ins GPR:$src),
+                     "$dst = -$src",
+                     [(set GPR:$dst, (ineg i64:$src))]>;
+  def NEG_32: NEG_RR<SBF_ALU, SBF_NEG, (outs GPR32:$dst), (ins GPR32:$src),
+                     "$dst = -$src",
+                     [(set GPR32:$dst, (ineg i32:$src))]>;
+}
+
+class LD_IMM64<bits<4> Pseudo, string OpcodeStr>
+    : TYPE_LD_ST<SBF_IMM.Value, SBF_DW.Value,
+                 (outs GPR:$dst),
+                 (ins u64imm:$imm),
+                 "$dst "#OpcodeStr#" ${imm} ll",
+                 [(set GPR:$dst, (i64 imm:$imm))]> {
+
+  bits<4> dst;
+  bits<64> imm;
+
+  let Inst{51-48} = dst;
+  let Inst{55-52} = Pseudo;
+  let Inst{47-32} = 0;
+  let Inst{31-0} = imm{31-0};
+  let SBFClass = SBF_LD;
+}
+
+let isReMaterializable = 1, isAsCheapAsAMove = 1 in {
+def LD_imm64 : LD_IMM64<0, "=">;
+def MOV_rr : ALU_RR<SBF_ALU64, SBF_MOV,
+                    (outs GPR:$dst),
+                    (ins GPR:$src),
+                    "$dst = $src",
+                    []>;
+def MOV_ri : ALU_RI<SBF_ALU64, SBF_MOV,
+                    (outs GPR:$dst),
+                    (ins i64imm:$imm),
+                    "$dst = $imm",
+                    [(set GPR:$dst, (i64 i64immSExt32:$imm))]>;
+def MOV_rr_32 : ALU_RR<SBF_ALU, SBF_MOV,
+                    (outs GPR32:$dst),
+                    (ins GPR32:$src),
+                    "$dst = $src",
+                    []>;
+def MOV_ri_32 : ALU_RI<SBF_ALU, SBF_MOV,
+                    (outs GPR32:$dst),
+                    (ins i32imm:$imm),
+                    "$dst = $imm",
+                    [(set GPR32:$dst, (i32 i32immSExt32:$imm))]>;
+}
+
+def FI_ri
+    : TYPE_LD_ST<SBF_IMM.Value, SBF_DW.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr),
+                 "lea\t$dst, $addr",
+                 [(set i64:$dst, FIri:$addr)]> {
+  // This is a tentative instruction, and will be replaced
+  // with MOV_rr and ADD_ri in PEI phase
+  let Inst{51-48} = 0;
+  let Inst{55-52} = 2;
+  let Inst{47-32} = 0;
+  let Inst{31-0} = 0;
+  let SBFClass = SBF_LD;
+}
+
+def LD_pseudo
+    : TYPE_LD_ST<SBF_IMM.Value, SBF_DW.Value,
+                 (outs GPR:$dst),
+                 (ins i64imm:$pseudo, u64imm:$imm),
+                 "ld_pseudo\t$dst, $pseudo, $imm",
+                 [(set GPR:$dst, (int_bpf_pseudo imm:$pseudo, imm:$imm))]> {
+
+  bits<4> dst;
+  bits<64> imm;
+  bits<4> pseudo;
+
+  let Inst{51-48} = dst;
+  let Inst{55-52} = pseudo;
+  let Inst{47-32} = 0;
+  let Inst{31-0} = imm{31-0};
+  let SBFClass = SBF_LD;
+}
+
+// STORE instructions
+class STORE<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+    : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
+                 (outs),
+                 (ins GPR:$src, MEMri:$addr),
+                 "*("#OpcodeStr#" *)($addr) = $src",
+                 Pattern> {
+  bits<4> src;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = src;
+  let Inst{47-32} = addr{15-0}; // offset
+  let SBFClass = SBF_STX;
+}
+
+class STOREi64<SBFWidthModifer Opc, string OpcodeStr, PatFrag OpNode>
+    : STORE<Opc, OpcodeStr, [(OpNode i64:$src, ADDRri:$addr)]>;
+
+let Predicates = [SBFNoALU32] in {
+  def STW : STOREi64<SBF_W, "u32", truncstorei32>;
+  def STH : STOREi64<SBF_H, "u16", truncstorei16>;
+  def STB : STOREi64<SBF_B, "u8", truncstorei8>;
+}
+def STD : STOREi64<SBF_DW, "u64", store>;
+
+// LOAD instructions
+class LOAD<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+    : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr),
+                 "$dst = *("#OpcodeStr#" *)($addr)",
+                 Pattern> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = dst;
+  let Inst{55-52} = addr{19-16};
+  let Inst{47-32} = addr{15-0};
+  let SBFClass = SBF_LDX;
+}
+
+class LOADi64<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : LOAD<SizeOp, OpcodeStr, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
+
+let isCodeGenOnly = 1 in {
+  def CORE_MEM : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
+                            (outs GPR:$dst),
+                            (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
+                            "$dst = core_mem($opcode, $src, $offset)",
+                            []>;
+  def CORE_ALU32_MEM : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
+                                  (outs GPR32:$dst),
+                                  (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
+                                  "$dst = core_alu32_mem($opcode, $src, $offset)",
+                                  []>;
+  let Constraints = "$dst = $src" in {
+    def CORE_SHIFT : ALU_RR<SBF_ALU64, SBF_LSH,
+                             (outs GPR:$dst),
+                             (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
+                             "$dst = core_shift($opcode, $src, $offset)",
+                             []>;
+  }
+}
+
+let Predicates = [SBFNoALU32] in {
+  def LDW : LOADi64<SBF_W, "u32", zextloadi32>;
+  def LDH : LOADi64<SBF_H, "u16", zextloadi16>;
+  def LDB : LOADi64<SBF_B, "u8", zextloadi8>;
+}
+
+def LDD : LOADi64<SBF_DW, "u64", load>;
+
+class BRANCH<SBFJumpOp Opc, string OpcodeStr, list<dag> Pattern>
+    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
+                   (outs),
+                   (ins brtarget:$BrDst),
+                   !strconcat(OpcodeStr, " $BrDst"),
+                   Pattern> {
+  bits<16> BrDst;
+
+  let Inst{47-32} = BrDst;
+  let SBFClass = SBF_JMP;
+}
+
+class CALL<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_CALL.Value, SBF_K.Value,
+                   (outs),
+                   (ins calltarget:$BrDst),
+                   !strconcat(OpcodeStr, " $BrDst"),
+                   []> {
+  bits<32> BrDst;
+
+  let Inst{31-0} = BrDst;
+  let SBFClass = SBF_JMP;
+}
+
+class CALLX<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_CALL.Value, SBF_X.Value,
+                   (outs),
+                   (ins GPR:$BrDst),
+                   !strconcat(OpcodeStr, " $BrDst"),
+                   []> {
+  bits<32> BrDst;
+
+  let Inst{31-0} = BrDst;
+  let SBFClass = SBF_JMP;
+}
+
+// Jump always
+let isBranch = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1 in {
+  def JMP : BRANCH<SBF_JA, "goto", [(br bb:$BrDst)]>;
+}
+
+// Jump and link
+let isCall=1, hasDelaySlot=0, Uses = [R11],
+    // Potentially clobbered registers
+    Defs = [R0, R1, R2, R3, R4, R5] in {
+  def JAL  : CALL<"call">;
+  def JALX  : CALLX<"callx">;
+}
+
+class NOP_I<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_MOV.Value, SBF_X.Value,
+                   (outs),
+                   (ins i32imm:$imm),
+                   !strconcat(OpcodeStr, "\t$imm"),
+                   []> {
+  // mov r0, r0 == nop
+  let Inst{55-52} = 0;
+  let Inst{51-48} = 0;
+  let SBFClass = SBF_ALU64;
+}
+
+let hasSideEffects = 0, isCodeGenOnly = 1 in
+  def NOP : NOP_I<"nop">;
+
+class RET<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_EXIT.Value, SBF_K.Value,
+                   (outs),
+                   (ins),
+                   !strconcat(OpcodeStr, ""),
+                   [(SBFretflag)]> {
+  let Inst{31-0} = 0;
+  let SBFClass = SBF_JMP;
+}
+
+let isReturn = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1,
+    isNotDuplicable = 1 in {
+  def RET : RET<"exit">;
+}
+
+// ADJCALLSTACKDOWN/UP pseudo insns
+let Defs = [R11], Uses = [R11], isCodeGenOnly = 1 in {
+def ADJCALLSTACKDOWN : Pseudo<(outs), (ins i64imm:$amt1, i64imm:$amt2),
+                              "#ADJCALLSTACKDOWN $amt1 $amt2",
+                              [(SBFcallseq_start timm:$amt1, timm:$amt2)]>;
+def ADJCALLSTACKUP   : Pseudo<(outs), (ins i64imm:$amt1, i64imm:$amt2),
+                              "#ADJCALLSTACKUP $amt1 $amt2",
+                              [(SBFcallseq_end timm:$amt1, timm:$amt2)]>;
+}
+
+let usesCustomInserter = 1, isCodeGenOnly = 1 in {
+  def Select : Pseudo<(outs GPR:$dst),
+                      (ins GPR:$lhs, GPR:$rhs, i64imm:$imm, GPR:$src, GPR:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i64:$dst,
+                       (SBFselectcc i64:$lhs, i64:$rhs, (i64 imm:$imm), i64:$src, i64:$src2))]>;
+  def Select_Ri : Pseudo<(outs GPR:$dst),
+                      (ins GPR:$lhs, i64imm:$rhs, i64imm:$imm, GPR:$src, GPR:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i64:$dst,
+                       (SBFselectcc i64:$lhs, (i64immSExt32:$rhs), (i64 imm:$imm), i64:$src, i64:$src2))]>;
+  def Select_64_32 : Pseudo<(outs GPR32:$dst),
+                      (ins GPR:$lhs, GPR:$rhs, i64imm:$imm, GPR32:$src, GPR32:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i32:$dst,
+                       (SBFselectcc i64:$lhs, i64:$rhs, (i64 imm:$imm), i32:$src, i32:$src2))]>;
+  def Select_Ri_64_32 : Pseudo<(outs GPR32:$dst),
+                      (ins GPR:$lhs, i64imm:$rhs, i64imm:$imm, GPR32:$src, GPR32:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i32:$dst,
+                       (SBFselectcc i64:$lhs, (i64immSExt32:$rhs), (i64 imm:$imm), i32:$src, i32:$src2))]>;
+  def Select_32 : Pseudo<(outs GPR32:$dst),
+                      (ins GPR32:$lhs, GPR32:$rhs, i32imm:$imm, GPR32:$src, GPR32:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i32:$dst,
+                       (SBFselectcc i32:$lhs, i32:$rhs, (i32 imm:$imm), i32:$src, i32:$src2))]>;
+  def Select_Ri_32 : Pseudo<(outs GPR32:$dst),
+                      (ins GPR32:$lhs, i32imm:$rhs, i32imm:$imm, GPR32:$src, GPR32:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i32:$dst,
+                       (SBFselectcc i32:$lhs, (i32immSExt32:$rhs), (i32 imm:$imm), i32:$src, i32:$src2))]>;
+  def Select_32_64 : Pseudo<(outs GPR:$dst),
+                      (ins GPR32:$lhs, GPR32:$rhs, i32imm:$imm, GPR:$src, GPR:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i64:$dst,
+                       (SBFselectcc i32:$lhs, i32:$rhs, (i32 imm:$imm), i64:$src, i64:$src2))]>;
+  def Select_Ri_32_64 : Pseudo<(outs GPR:$dst),
+                      (ins GPR32:$lhs, i32imm:$rhs, i32imm:$imm, GPR:$src, GPR:$src2),
+                      "# Select PSEUDO $dst = $lhs $imm $rhs ? $src : $src2",
+                      [(set i64:$dst,
+                       (SBFselectcc i32:$lhs, (i32immSExt32:$rhs), (i32 imm:$imm), i64:$src, i64:$src2))]>;
+}
+
+// load 64-bit global addr into register
+def : Pat<(SBFWrapper tglobaladdr:$in), (LD_imm64 tglobaladdr:$in)>;
+
+// 0xffffFFFF doesn't fit into simm32, optimize common case
+def : Pat<(i64 (and (i64 GPR:$src), 0xffffFFFF)),
+          (SRL_ri (SLL_ri (i64 GPR:$src), 32), 32)>;
+
+// Calls
+def : Pat<(SBFcall tglobaladdr:$dst), (JAL tglobaladdr:$dst)>;
+def : Pat<(SBFcall texternalsym:$dst), (JAL texternalsym:$dst)>;
+def : Pat<(SBFcall imm:$dst), (JAL imm:$dst)>;
+def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>;
+
+// Loads
+let Predicates = [SBFNoALU32] in {
+  def : Pat<(i64 (extloadi8  ADDRri:$src)), (i64 (LDB ADDRri:$src))>;
+  def : Pat<(i64 (extloadi16 ADDRri:$src)), (i64 (LDH ADDRri:$src))>;
+  def : Pat<(i64 (extloadi32 ADDRri:$src)), (i64 (LDW ADDRri:$src))>;
+}
+
+// Atomic XADD for SBFNoALU32
+class XADD<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr, GPR:$val),
+                 "lock *("#OpcodeStr#" *)($addr) += $val",
+                 [(set GPR:$dst, (OpNode ADDRri:$addr, GPR:$val))]> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = SBF_ADD.Value;
+  let SBFClass = SBF_STX;
+}
+
+let Constraints = "$dst = $val" in {
+  let Predicates = [SBFNoALU32] in {
+    def XADDW : XADD<SBF_W, "u32", atomic_load_add_32>;
+  }
+}
+
+// Atomic add, and, or, xor
+class ATOMIC_NOFETCH<SBFArithOp Opc, string Opstr>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SBF_DW.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr, GPR:$val),
+                 "lock *(u64 *)($addr) " #Opstr# "= $val",
+                 []> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = Opc.Value;
+  let SBFClass = SBF_STX;
+}
+
+class ATOMIC32_NOFETCH<SBFArithOp Opc, string Opstr>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SBF_W.Value,
+                 (outs GPR32:$dst),
+                 (ins MEMri:$addr, GPR32:$val),
+                 "lock *(u32 *)($addr) " #Opstr# "= $val",
+                 []> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = Opc.Value;
+  let SBFClass = SBF_STX;
+}
+
+let Constraints = "$dst = $val" in {
+  let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
+    def XADDW32 : ATOMIC32_NOFETCH<SBF_ADD, "+">;
+    def XANDW32 : ATOMIC32_NOFETCH<SBF_AND, "&">;
+    def XORW32  : ATOMIC32_NOFETCH<SBF_OR, "|">;
+    def XXORW32 : ATOMIC32_NOFETCH<SBF_XOR, "^">;
+  }
+
+  def XADDD  : ATOMIC_NOFETCH<SBF_ADD, "+">;
+  def XANDD  : ATOMIC_NOFETCH<SBF_AND, "&">;
+  def XORD   : ATOMIC_NOFETCH<SBF_OR, "|">;
+  def XXORD  : ATOMIC_NOFETCH<SBF_XOR, "^">;
+}
+
+// Atomic Fetch-and-<add, and, or, xor> operations
+class XFALU64<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
+              string OpcStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr, GPR:$val),
+                 "$dst = atomic_fetch_"#OpcStr#"(("#OpcodeStr#" *)($addr), $val)",
+                 [(set GPR:$dst, (OpNode ADDRri:$addr, GPR:$val))]> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = Opc.Value;
+  let Inst{3-0} = SBF_FETCH.Value;
+  let SBFClass = SBF_STX;
+}
+
+class XFALU32<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
+              string OpcStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs GPR32:$dst),
+                 (ins MEMri:$addr, GPR32:$val),
+                 "$dst = atomic_fetch_"#OpcStr#"(("#OpcodeStr#" *)($addr), $val)",
+                 [(set GPR32:$dst, (OpNode ADDRri:$addr, GPR32:$val))]> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = Opc.Value;
+  let Inst{3-0} = SBF_FETCH.Value;
+  let SBFClass = SBF_STX;
+}
+
+let Constraints = "$dst = $val" in {
+  let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
+    def XFADDW32 : XFALU32<SBF_W, SBF_ADD, "u32", "add", atomic_load_add_32>;
+    def XFANDW32 : XFALU32<SBF_W, SBF_AND, "u32", "and", atomic_load_and_32>;
+    def XFORW32  : XFALU32<SBF_W, SBF_OR,  "u32", "or",  atomic_load_or_32>;
+    def XFXORW32 : XFALU32<SBF_W, SBF_XOR, "u32", "xor", atomic_load_xor_32>;
+  }
+
+  def XFADDD : XFALU64<SBF_DW, SBF_ADD, "u64", "add", atomic_load_add_64>;
+  def XFANDD : XFALU64<SBF_DW, SBF_AND, "u64", "and", atomic_load_and_64>;
+  def XFORD  : XFALU64<SBF_DW, SBF_OR,  "u64", "or",  atomic_load_or_64>;
+  def XFXORD : XFALU64<SBF_DW, SBF_XOR, "u64", "xor", atomic_load_xor_64>;
+}
+
+// atomic_load_sub can be represented as a neg followed
+// by an atomic_load_add.
+def : Pat<(atomic_load_sub_32 ADDRri:$addr, GPR32:$val),
+          (XFADDW32 ADDRri:$addr, (NEG_32 GPR32:$val))>;
+def : Pat<(atomic_load_sub_64 ADDRri:$addr, GPR:$val),
+          (XFADDD ADDRri:$addr, (NEG_64 GPR:$val))>;
+
+let Predicates = [SBFSubtargetSolana], usesCustomInserter = 1, isCodeGenOnly = 1 in {
+  def ATOMIC_FENCE : Pseudo<
+    (outs),
+    (ins),
+    "#atomic_fence",
+    [(atomic_fence timm, timm)]>;
+}
+
+// Atomic Exchange
+class XCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr, GPR:$val),
+                 "$dst = xchg_"#OpcodeStr#"($addr, $val)",
+                 [(set GPR:$dst, (OpNode ADDRri:$addr,GPR:$val))]> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = SBF_XCHG.Value;
+  let Inst{3-0} = SBF_FETCH.Value;
+  let SBFClass = SBF_STX;
+}
+
+class XCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs GPR32:$dst),
+                 (ins MEMri:$addr, GPR32:$val),
+                 "$dst = xchg32_"#OpcodeStr#"($addr, $val)",
+                 [(set GPR32:$dst, (OpNode ADDRri:$addr,GPR32:$val))]> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = dst;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = SBF_XCHG.Value;
+  let Inst{3-0} = SBF_FETCH.Value;
+  let SBFClass = SBF_STX;
+}
+
+let Constraints = "$dst = $val" in {
+  let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
+    def XCHGW32 : XCHG32<SBF_W, "32", atomic_swap_32>;
+  }
+
+  def XCHGD : XCHG<SBF_DW, "64", atomic_swap_64>;
+}
+
+// Compare-And-Exchange
+class CMPXCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs),
+                 (ins MEMri:$addr, GPR:$new),
+                 "r0 = cmpxchg_"#OpcodeStr#"($addr, r0, $new)",
+                 [(set R0, (OpNode ADDRri:$addr, R0, GPR:$new))]> {
+  bits<4> new;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = new;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = SBF_CMPXCHG.Value;
+  let Inst{3-0} = SBF_FETCH.Value;
+  let SBFClass = SBF_STX;
+}
+
+class CMPXCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
+                 (outs),
+                 (ins MEMri:$addr, GPR32:$new),
+                 "w0 = cmpxchg32_"#OpcodeStr#"($addr, w0, $new)",
+                 [(set W0, (OpNode ADDRri:$addr, W0, GPR32:$new))]> {
+  bits<4> new;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = new;
+  let Inst{47-32} = addr{15-0}; // offset
+  let Inst{7-4} = SBF_CMPXCHG.Value;
+  let Inst{3-0} = SBF_FETCH.Value;
+  let SBFClass = SBF_STX;
+}
+
+let Predicates = [SBFHasALU32], Defs = [W0], Uses = [W0],
+    DecoderNamespace = "SBFALU32" in {
+  def CMPXCHGW32 : CMPXCHG32<SBF_W, "32", atomic_cmp_swap_32>;
+}
+
+let Defs = [R0], Uses = [R0] in {
+  def CMPXCHGD : CMPXCHG<SBF_DW, "64", atomic_cmp_swap_64>;
+}
+
+// bswap16, bswap32, bswap64
+class BSWAP<bits<32> SizeOp, string OpcodeStr, SBFSrcType SrcType, list<dag> Pattern>
+    : TYPE_ALU_JMP<SBF_END.Value, SrcType.Value,
+                   (outs GPR:$dst),
+                   (ins GPR:$src),
+                   "$dst = "#OpcodeStr#" $src",
+                   Pattern> {
+  bits<4> dst;
+
+  let Inst{51-48} = dst;
+  let Inst{31-0} = SizeOp;
+  let SBFClass = SBF_ALU;
+}
+
+
+let Constraints = "$dst = $src" in {
+    let Predicates = [SBFIsLittleEndian] in {
+        def BE16 : BSWAP<16, "be16", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 48)))]>;
+        def BE32 : BSWAP<32, "be32", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 32)))]>;
+        def BE64 : BSWAP<64, "be64", SBF_TO_BE, [(set GPR:$dst, (bswap GPR:$src))]>;
+    }
+    let Predicates = [SBFIsBigEndian] in {
+        def LE16 : BSWAP<16, "le16", SBF_TO_LE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 48)))]>;
+        def LE32 : BSWAP<32, "le32", SBF_TO_LE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 32)))]>;
+        def LE64 : BSWAP<64, "le64", SBF_TO_LE, [(set GPR:$dst, (bswap GPR:$src))]>;
+    }
+}
+
+let Defs = [R0, R1, R2, R3, R4, R5], Uses = [R6], hasSideEffects = 1,
+    hasExtraDefRegAllocReq = 1, hasExtraSrcRegAllocReq = 1, mayLoad = 1 in {
+class LOAD_ABS<SBFWidthModifer SizeOp, string OpcodeStr, Intrinsic OpNode>
+    : TYPE_LD_ST<SBF_ABS.Value, SizeOp.Value,
+                 (outs),
+                 (ins GPR:$skb, i64imm:$imm),
+                 "r0 = *("#OpcodeStr#" *)skb[$imm]",
+                 [(set R0, (OpNode GPR:$skb, i64immSExt32:$imm))]> {
+  bits<32> imm;
+
+  let Inst{31-0} = imm;
+  let SBFClass = SBF_LD;
+}
+
+class LOAD_IND<SBFWidthModifer SizeOp, string OpcodeStr, Intrinsic OpNode>
+    : TYPE_LD_ST<SBF_IND.Value, SizeOp.Value,
+                 (outs),
+                 (ins GPR:$skb, GPR:$val),
+                 "r0 = *("#OpcodeStr#" *)skb[$val]",
+                 [(set R0, (OpNode GPR:$skb, GPR:$val))]> {
+  bits<4> val;
+
+  let Inst{55-52} = val;
+  let SBFClass = SBF_LD;
+}
+}
+
+def LD_ABS_B : LOAD_ABS<SBF_B, "u8", int_bpf_load_byte>;
+def LD_ABS_H : LOAD_ABS<SBF_H, "u16", int_bpf_load_half>;
+def LD_ABS_W : LOAD_ABS<SBF_W, "u32", int_bpf_load_word>;
+
+def LD_IND_B : LOAD_IND<SBF_B, "u8", int_bpf_load_byte>;
+def LD_IND_H : LOAD_IND<SBF_H, "u16", int_bpf_load_half>;
+def LD_IND_W : LOAD_IND<SBF_W, "u32", int_bpf_load_word>;
+
+let isCodeGenOnly = 1 in {
+  def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
+                         (outs GPR:$dst), (ins GPR32:$src),
+                         "$dst = $src", []>;
+}
+
+def : Pat<(i64 (sext GPR32:$src)),
+          (SRA_ri (SLL_ri (MOV_32_64 GPR32:$src), 32), 32)>;
+
+def : Pat<(i64 (zext GPR32:$src)), (MOV_32_64 GPR32:$src)>;
+
+// For i64 -> i32 truncation, use the 32-bit subregister directly.
+def : Pat<(i32 (trunc GPR:$src)),
+          (i32 (EXTRACT_SUBREG GPR:$src, sub_32))>;
+
+// For i32 -> i64 anyext, we don't care about the high bits.
+def : Pat<(i64 (anyext GPR32:$src)),
+          (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>;
+
+class STORE32<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+    : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
+                 (outs),
+                 (ins GPR32:$src, MEMri:$addr),
+                 "*("#OpcodeStr#" *)($addr) = $src",
+                 Pattern> {
+  bits<4> src;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = src;
+  let Inst{47-32} = addr{15-0}; // offset
+  let SBFClass = SBF_STX;
+}
+
+class STOREi32<SBFWidthModifer Opc, string OpcodeStr, PatFrag OpNode>
+    : STORE32<Opc, OpcodeStr, [(OpNode i32:$src, ADDRri:$addr)]>;
+
+let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
+  def STW32 : STOREi32<SBF_W, "u32", store>;
+  def STH32 : STOREi32<SBF_H, "u16", truncstorei16>;
+  def STB32 : STOREi32<SBF_B, "u8", truncstorei8>;
+}
+
+class LOAD32<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+    : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
+                (outs GPR32:$dst),
+                (ins MEMri:$addr),
+                "$dst = *("#OpcodeStr#" *)($addr)",
+                Pattern> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = dst;
+  let Inst{55-52} = addr{19-16};
+  let Inst{47-32} = addr{15-0};
+  let SBFClass = SBF_LDX;
+}
+
+class LOADi32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+    : LOAD32<SizeOp, OpcodeStr, [(set i32:$dst, (OpNode ADDRri:$addr))]>;
+
+let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
+  def LDW32 : LOADi32<SBF_W, "u32", load>;
+  def LDH32 : LOADi32<SBF_H, "u16", zextloadi16>;
+  def LDB32 : LOADi32<SBF_B, "u8", zextloadi8>;
+}
+
+let Predicates = [SBFHasALU32] in {
+  def : Pat<(truncstorei8 GPR:$src, ADDRri:$dst),
+            (STB32 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(truncstorei16 GPR:$src, ADDRri:$dst),
+            (STH32 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(truncstorei32 GPR:$src, ADDRri:$dst),
+            (STW32 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(i32 (extloadi8 ADDRri:$src)), (i32 (LDB32 ADDRri:$src))>;
+  def : Pat<(i32 (extloadi16 ADDRri:$src)), (i32 (LDH32 ADDRri:$src))>;
+  def : Pat<(i64 (zextloadi8  ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDB32 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (zextloadi16 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDH32 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (zextloadi32 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDW32 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (extloadi8  ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDB32 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (extloadi16 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDH32 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (extloadi32 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDW32 ADDRri:$src), sub_32)>;
+}
+
+let usesCustomInserter = 1, isCodeGenOnly = 1 in {
+    def MEMCPY : Pseudo<
+      (outs),
+      (ins GPR:$dst, GPR:$src, i64imm:$len, i64imm:$align, variable_ops),
+      "#memcpy dst: $dst, src: $src, len: $len, align: $align",
+      [(SBFmemcpy GPR:$dst, GPR:$src, imm:$len, imm:$align)]>;
+}
diff --git a/llvm/lib/Target/SBF/SBFMCInstLower.cpp b/llvm/lib/Target/SBF/SBFMCInstLower.cpp
new file mode 100644
index 0000000000000..421592d876924
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFMCInstLower.cpp
@@ -0,0 +1,81 @@
+//=-- SBFMCInstLower.cpp - Convert SBF MachineInstr to an MCInst ------------=//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains code to lower SBF MachineInstrs to their corresponding
+// MCInst records.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFMCInstLower.h"
+#include "llvm/CodeGen/AsmPrinter.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCExpr.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
+using namespace llvm;
+
+MCSymbol *
+SBFMCInstLower::GetGlobalAddressSymbol(const MachineOperand &MO) const {
+  return Printer.getSymbol(MO.getGlobal());
+}
+
+MCSymbol *
+SBFMCInstLower::GetExternalSymbolSymbol(const MachineOperand &MO) const {
+  return Printer.GetExternalSymbolSymbol(MO.getSymbolName());
+}
+
+MCOperand SBFMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
+                                             MCSymbol *Sym) const {
+
+  const MCExpr *Expr = MCSymbolRefExpr::create(Sym, Ctx);
+
+  if (!MO.isJTI() && MO.getOffset())
+    llvm_unreachable("unknown symbol op");
+
+  return MCOperand::createExpr(Expr);
+}
+
+void SBFMCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
+  OutMI.setOpcode(MI->getOpcode());
+
+  for (const MachineOperand &MO : MI->operands()) {
+    MCOperand MCOp;
+    switch (MO.getType()) {
+    default:
+      MI->print(errs());
+      llvm_unreachable("unknown operand type");
+    case MachineOperand::MO_Register:
+      // Ignore all implicit register operands.
+      if (MO.isImplicit())
+        continue;
+      MCOp = MCOperand::createReg(MO.getReg());
+      break;
+    case MachineOperand::MO_Immediate:
+      MCOp = MCOperand::createImm(MO.getImm());
+      break;
+    case MachineOperand::MO_MachineBasicBlock:
+      MCOp = MCOperand::createExpr(
+          MCSymbolRefExpr::create(MO.getMBB()->getSymbol(), Ctx));
+      break;
+    case MachineOperand::MO_RegisterMask:
+      continue;
+    case MachineOperand::MO_ExternalSymbol:
+      MCOp = LowerSymbolOperand(MO, GetExternalSymbolSymbol(MO));
+      break;
+    case MachineOperand::MO_GlobalAddress:
+      MCOp = LowerSymbolOperand(MO, GetGlobalAddressSymbol(MO));
+      break;
+    }
+
+    OutMI.addOperand(MCOp);
+  }
+}
diff --git a/llvm/lib/Target/SBF/SBFMCInstLower.h b/llvm/lib/Target/SBF/SBFMCInstLower.h
new file mode 100644
index 0000000000000..1d03df89ee4db
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFMCInstLower.h
@@ -0,0 +1,41 @@
+//===-- SBFMCInstLower.h - Lower MachineInstr to MCInst ---------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFMCINSTLOWER_H
+#define LLVM_LIB_TARGET_SBF_SBFMCINSTLOWER_H
+
+#include "llvm/Support/Compiler.h"
+
+namespace llvm {
+class AsmPrinter;
+class MCContext;
+class MCInst;
+class MCOperand;
+class MCSymbol;
+class MachineInstr;
+class MachineOperand;
+
+// SBFMCInstLower - This class is used to lower an MachineInstr into an MCInst.
+class LLVM_LIBRARY_VISIBILITY SBFMCInstLower {
+  MCContext &Ctx;
+
+  AsmPrinter &Printer;
+
+public:
+  SBFMCInstLower(MCContext &ctx, AsmPrinter &printer)
+      : Ctx(ctx), Printer(printer) {}
+  void Lower(const MachineInstr *MI, MCInst &OutMI) const;
+
+  MCOperand LowerSymbolOperand(const MachineOperand &MO, MCSymbol *Sym) const;
+
+  MCSymbol *GetGlobalAddressSymbol(const MachineOperand &MO) const;
+  MCSymbol *GetExternalSymbolSymbol(const MachineOperand &MO) const;
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFMIChecking.cpp b/llvm/lib/Target/SBF/SBFMIChecking.cpp
new file mode 100644
index 0000000000000..6fc74f7d71306
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFMIChecking.cpp
@@ -0,0 +1,251 @@
+//===-------------- SBFMIChecking.cpp - MI Checking Legality -------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This pass performs checking to signal errors for certain illegal usages at
+// MachineInstruction layer. Specially, the result of XADD{32,64} insn should
+// not be used. The pass is done at the PreEmit pass right before the
+// machine code is emitted at which point the register liveness information
+// is still available.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFInstrInfo.h"
+#include "SBFTargetMachine.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/Support/Debug.h"
+
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-mi-checking"
+
+namespace {
+
+struct SBFMIPreEmitChecking : public MachineFunctionPass {
+
+  static char ID;
+  MachineFunction *MF;
+  const TargetRegisterInfo *TRI;
+
+  SBFMIPreEmitChecking() : MachineFunctionPass(ID) {
+    initializeSBFMIPreEmitCheckingPass(*PassRegistry::getPassRegistry());
+  }
+
+private:
+  // Initialize class variables.
+  void initialize(MachineFunction &MFParm);
+
+  bool processAtomicInsts();
+
+public:
+
+  // Main entry point for this pass.
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    if (!skipFunction(MF.getFunction())) {
+      initialize(MF);
+      return processAtomicInsts();
+    }
+    return false;
+  }
+};
+
+// Initialize class variables.
+void SBFMIPreEmitChecking::initialize(MachineFunction &MFParm) {
+  MF = &MFParm;
+  TRI = MF->getSubtarget<SBFSubtarget>().getRegisterInfo();
+  LLVM_DEBUG(dbgs() << "*** SBF PreEmit checking pass ***\n\n");
+}
+
+// Make sure all Defs of XADD are dead, meaning any result of XADD insn is not
+// used.
+//
+// NOTE: SBF backend hasn't enabled sub-register liveness track, so when the
+// source and destination operands of XADD are GPR32, there is no sub-register
+// dead info. If we rely on the generic MachineInstr::allDefsAreDead, then we
+// will raise false alarm on GPR32 Def.
+//
+// To support GPR32 Def, ideally we could just enable sub-registr liveness track
+// on SBF backend, then allDefsAreDead could work on GPR32 Def. This requires
+// implementing TargetSubtargetInfo::enableSubRegLiveness on SBF.
+//
+// However, sub-register liveness tracking module inside LLVM is actually
+// designed for the situation where one register could be split into more than
+// one sub-registers for which case each sub-register could have their own
+// liveness and kill one of them doesn't kill others. So, tracking liveness for
+// each make sense.
+//
+// For SBF, each 64-bit register could only have one 32-bit sub-register. This
+// is exactly the case which LLVM think brings no benefits for doing
+// sub-register tracking, because the live range of sub-register must always
+// equal to its parent register, therefore liveness tracking is disabled even
+// the back-end has implemented enableSubRegLiveness. The detailed information
+// is at r232695:
+//
+//   Author: Matthias Braun <matze@braunis.de>
+//   Date:   Thu Mar 19 00:21:58 2015 +0000
+//   Do not track subregister liveness when it brings no benefits
+//
+// Hence, for SBF, we enhance MachineInstr::allDefsAreDead. Given the solo
+// sub-register always has the same liveness as its parent register, LLVM is
+// already attaching a implicit 64-bit register Def whenever the there is
+// a sub-register Def. The liveness of the implicit 64-bit Def is available.
+// For example, for "lock *(u32 *)(r0 + 4) += w9", the MachineOperand info could
+// be:
+//
+//   $w9 = XADDW32 killed $r0, 4, $w9(tied-def 0),
+//                        implicit killed $r9, implicit-def dead $r9
+//
+// Even though w9 is not marked as Dead, the parent register r9 is marked as
+// Dead correctly, and it is safe to use such information or our purpose.
+static bool hasLiveDefs(const MachineInstr &MI, const TargetRegisterInfo *TRI) {
+  const MCRegisterClass *GPR64RegClass =
+    &SBFMCRegisterClasses[SBF::GPRRegClassID];
+  std::vector<unsigned> GPR32LiveDefs;
+  std::vector<unsigned> GPR64DeadDefs;
+
+  for (const MachineOperand &MO : MI.operands()) {
+    bool RegIsGPR64;
+
+    if (!MO.isReg() || MO.isUse())
+      continue;
+
+    RegIsGPR64 = GPR64RegClass->contains(MO.getReg());
+    if (!MO.isDead()) {
+      // It is a GPR64 live Def, we are sure it is live. */
+      if (RegIsGPR64)
+        return true;
+      // It is a GPR32 live Def, we are unsure whether it is really dead due to
+      // no sub-register liveness tracking. Push it to vector for deferred
+      // check.
+      GPR32LiveDefs.push_back(MO.getReg());
+      continue;
+    }
+
+    // Record any GPR64 dead Def as some unmarked GPR32 could be alias of its
+    // low 32-bit.
+    if (RegIsGPR64)
+      GPR64DeadDefs.push_back(MO.getReg());
+  }
+
+  // No GPR32 live Def, safe to return false.
+  if (GPR32LiveDefs.empty())
+    return false;
+
+  // No GPR64 dead Def, so all those GPR32 live Def can't have alias, therefore
+  // must be truely live, safe to return true.
+  if (GPR64DeadDefs.empty())
+    return true;
+
+  // Otherwise, return true if any aliased SuperReg of GPR32 is not dead.
+  for (auto I : GPR32LiveDefs)
+    for (MCSuperRegIterator SR(I, TRI); SR.isValid(); ++SR)
+      if (!llvm::is_contained(GPR64DeadDefs, *SR))
+        return true;
+
+  return false;
+}
+
+bool SBFMIPreEmitChecking::processAtomicInsts() {
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      if (MI.getOpcode() != SBF::XADDW &&
+          MI.getOpcode() != SBF::XADDD &&
+          MI.getOpcode() != SBF::XADDW32)
+        continue;
+
+      LLVM_DEBUG(MI.dump());
+      if (hasLiveDefs(MI, TRI)) {
+        DebugLoc Empty;
+        const DebugLoc &DL = MI.getDebugLoc();
+        if (DL != Empty)
+          report_fatal_error(Twine("line ") + std::to_string(DL.getLine()) +
+                             ": Invalid usage of the XADD return value", false);
+        else
+          report_fatal_error("Invalid usage of the XADD return value", false);
+      }
+    }
+  }
+
+  // Check return values of atomic_fetch_and_{add,and,or,xor}.
+  // If the return is not used, the atomic_fetch_and_<op> instruction
+  // is replaced with atomic_<op> instruction.
+  MachineInstr *ToErase = nullptr;
+  bool Changed = false;
+  const SBFInstrInfo *TII = MF->getSubtarget<SBFSubtarget>().getInstrInfo();
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      if (ToErase) {
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      if (MI.getOpcode() != SBF::XFADDW32 && MI.getOpcode() != SBF::XFADDD &&
+          MI.getOpcode() != SBF::XFANDW32 && MI.getOpcode() != SBF::XFANDD &&
+          MI.getOpcode() != SBF::XFXORW32 && MI.getOpcode() != SBF::XFXORD &&
+          MI.getOpcode() != SBF::XFORW32 && MI.getOpcode() != SBF::XFORD)
+        continue;
+
+      if (hasLiveDefs(MI, TRI))
+        continue;
+
+      LLVM_DEBUG(dbgs() << "Transforming "; MI.dump());
+      unsigned newOpcode;
+      switch (MI.getOpcode()) {
+      case SBF::XFADDW32:
+        newOpcode = SBF::XADDW32;
+        break;
+      case SBF::XFADDD:
+        newOpcode = SBF::XADDD;
+        break;
+      case SBF::XFANDW32:
+        newOpcode = SBF::XANDW32;
+        break;
+      case SBF::XFANDD:
+        newOpcode = SBF::XANDD;
+        break;
+      case SBF::XFXORW32:
+        newOpcode = SBF::XXORW32;
+        break;
+      case SBF::XFXORD:
+        newOpcode = SBF::XXORD;
+        break;
+      case SBF::XFORW32:
+        newOpcode = SBF::XORW32;
+        break;
+      case SBF::XFORD:
+        newOpcode = SBF::XORD;
+        break;
+      default:
+        llvm_unreachable("Incorrect Atomic Instruction Opcode");
+      }
+
+      BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(newOpcode))
+          .add(MI.getOperand(0))
+          .add(MI.getOperand(1))
+          .add(MI.getOperand(2))
+          .add(MI.getOperand(3));
+
+      ToErase = &MI;
+      Changed = true;
+    }
+  }
+
+  return Changed;
+}
+
+} // end default namespace
+
+INITIALIZE_PASS(SBFMIPreEmitChecking, "sbf-mi-pemit-checking",
+                "SBF PreEmit Checking", false, false)
+
+char SBFMIPreEmitChecking::ID = 0;
+FunctionPass* llvm::createSBFMIPreEmitCheckingPass()
+{
+  return new SBFMIPreEmitChecking();
+}
diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
new file mode 100644
index 0000000000000..3aa7d88f2a8c7
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -0,0 +1,564 @@
+//===-------------- SBFMIPeephole.cpp - MI Peephole Cleanups  -------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This pass performs peephole optimizations to cleanup ugly code sequences at
+// MachineInstruction layer.
+//
+// Currently, there are two optimizations implemented:
+//  - One pre-RA MachineSSA pass to eliminate type promotion sequences, those
+//    zero extend 32-bit subregisters to 64-bit registers, if the compiler
+//    could prove the subregisters is defined by 32-bit operations in which
+//    case the upper half of the underlying 64-bit registers were zeroed
+//    implicitly.
+//
+//  - One post-RA PreEmit pass to do final cleanup on some redundant
+//    instructions generated due to bad RA on subregister.
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFInstrInfo.h"
+#include "SBFTargetMachine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/Support/Debug.h"
+#include <set>
+
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-mi-zext-elim"
+
+STATISTIC(ZExtElemNum, "Number of zero extension shifts eliminated");
+
+namespace {
+
+struct SBFMIPeephole : public MachineFunctionPass {
+
+  static char ID;
+  const SBFInstrInfo *TII;
+  MachineFunction *MF;
+  MachineRegisterInfo *MRI;
+
+  SBFMIPeephole() : MachineFunctionPass(ID) {
+    initializeSBFMIPeepholePass(*PassRegistry::getPassRegistry());
+  }
+
+private:
+  // Initialize class variables.
+  void initialize(MachineFunction &MFParm);
+
+  bool isCopyFrom32Def(MachineInstr *CopyMI);
+  bool isInsnFrom32Def(MachineInstr *DefInsn);
+  bool isPhiFrom32Def(MachineInstr *MovMI);
+  bool isMovFrom32Def(MachineInstr *MovMI);
+  bool eliminateZExtSeq();
+  bool eliminateZExt();
+
+  std::set<MachineInstr *> PhiInsns;
+
+public:
+
+  // Main entry point for this pass.
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    if (skipFunction(MF.getFunction()))
+      return false;
+
+    initialize(MF);
+
+    // First try to eliminate (zext, lshift, rshift) and then
+    // try to eliminate zext.
+    bool ZExtSeqExist, ZExtExist;
+    ZExtSeqExist = eliminateZExtSeq();
+    ZExtExist = eliminateZExt();
+    return ZExtSeqExist || ZExtExist;
+  }
+};
+
+// Initialize class variables.
+void SBFMIPeephole::initialize(MachineFunction &MFParm) {
+  MF = &MFParm;
+  MRI = &MF->getRegInfo();
+  TII = MF->getSubtarget<SBFSubtarget>().getInstrInfo();
+  LLVM_DEBUG(dbgs() << "*** SBF MachineSSA ZEXT Elim peephole pass ***\n\n");
+}
+
+bool SBFMIPeephole::isCopyFrom32Def(MachineInstr *CopyMI)
+{
+  MachineOperand &opnd = CopyMI->getOperand(1);
+
+  if (!opnd.isReg())
+    return false;
+
+  // Return false if getting value from a 32bit physical register.
+  // Most likely, this physical register is aliased to
+  // function call return value or current function parameters.
+  Register Reg = opnd.getReg();
+  if (!Register::isVirtualRegister(Reg))
+    return false;
+
+  if (MRI->getRegClass(Reg) == &SBF::GPRRegClass)
+    return false;
+
+  MachineInstr *DefInsn = MRI->getVRegDef(Reg);
+  if (!isInsnFrom32Def(DefInsn))
+    return false;
+
+  return true;
+}
+
+bool SBFMIPeephole::isPhiFrom32Def(MachineInstr *PhiMI)
+{
+  for (unsigned i = 1, e = PhiMI->getNumOperands(); i < e; i += 2) {
+    MachineOperand &opnd = PhiMI->getOperand(i);
+
+    if (!opnd.isReg())
+      return false;
+
+    MachineInstr *PhiDef = MRI->getVRegDef(opnd.getReg());
+    if (!PhiDef)
+      return false;
+    if (PhiDef->isPHI()) {
+      if (PhiInsns.find(PhiDef) != PhiInsns.end())
+        return false;
+      PhiInsns.insert(PhiDef);
+      if (!isPhiFrom32Def(PhiDef))
+        return false;
+    }
+    if (PhiDef->getOpcode() == SBF::COPY && !isCopyFrom32Def(PhiDef))
+      return false;
+  }
+
+  return true;
+}
+
+// The \p DefInsn instruction defines a virtual register.
+bool SBFMIPeephole::isInsnFrom32Def(MachineInstr *DefInsn)
+{
+  if (!DefInsn)
+    return false;
+
+  if (DefInsn->isPHI()) {
+    if (PhiInsns.find(DefInsn) != PhiInsns.end())
+      return false;
+    PhiInsns.insert(DefInsn);
+    if (!isPhiFrom32Def(DefInsn))
+      return false;
+  } else if (DefInsn->getOpcode() == SBF::COPY) {
+    if (!isCopyFrom32Def(DefInsn))
+      return false;
+  }
+
+  return true;
+}
+
+bool SBFMIPeephole::isMovFrom32Def(MachineInstr *MovMI)
+{
+  MachineInstr *DefInsn = MRI->getVRegDef(MovMI->getOperand(1).getReg());
+
+  LLVM_DEBUG(dbgs() << "  Def of Mov Src:");
+  LLVM_DEBUG(DefInsn->dump());
+
+  PhiInsns.clear();
+  if (!isInsnFrom32Def(DefInsn))
+    return false;
+
+  LLVM_DEBUG(dbgs() << "  One ZExt elim sequence identified.\n");
+
+  return true;
+}
+
+bool SBFMIPeephole::eliminateZExtSeq() {
+  MachineInstr* ToErase = nullptr;
+  bool Eliminated = false;
+
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      // If the previous instruction was marked for elimination, remove it now.
+      if (ToErase) {
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      // Eliminate the 32-bit to 64-bit zero extension sequence when possible.
+      //
+      //   MOV_32_64 rB, wA
+      //   SLL_ri    rB, rB, 32
+      //   SRL_ri    rB, rB, 32
+      if (MI.getOpcode() == SBF::SRL_ri &&
+          MI.getOperand(2).getImm() == 32) {
+        Register DstReg = MI.getOperand(0).getReg();
+        Register ShfReg = MI.getOperand(1).getReg();
+        MachineInstr *SllMI = MRI->getVRegDef(ShfReg);
+
+        LLVM_DEBUG(dbgs() << "Starting SRL found:");
+        LLVM_DEBUG(MI.dump());
+
+        if (!SllMI ||
+            SllMI->isPHI() ||
+            SllMI->getOpcode() != SBF::SLL_ri ||
+            SllMI->getOperand(2).getImm() != 32)
+          continue;
+
+        LLVM_DEBUG(dbgs() << "  SLL found:");
+        LLVM_DEBUG(SllMI->dump());
+
+        MachineInstr *MovMI = MRI->getVRegDef(SllMI->getOperand(1).getReg());
+        if (!MovMI ||
+            MovMI->isPHI() ||
+            MovMI->getOpcode() != SBF::MOV_32_64)
+          continue;
+
+        LLVM_DEBUG(dbgs() << "  Type cast Mov found:");
+        LLVM_DEBUG(MovMI->dump());
+
+        Register SubReg = MovMI->getOperand(1).getReg();
+        if (!isMovFrom32Def(MovMI)) {
+          LLVM_DEBUG(dbgs()
+                     << "  One ZExt elim sequence failed qualifying elim.\n");
+          continue;
+        }
+
+        BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(SBF::SUBREG_TO_REG), DstReg)
+          .addImm(0).addReg(SubReg).addImm(SBF::sub_32);
+
+        SllMI->eraseFromParent();
+        MovMI->eraseFromParent();
+        // MI is the right shift, we can't erase it in it's own iteration.
+        // Mark it to ToErase, and erase in the next iteration.
+        ToErase = &MI;
+        ZExtElemNum++;
+        Eliminated = true;
+      }
+    }
+  }
+
+  return Eliminated;
+}
+
+bool SBFMIPeephole::eliminateZExt() {
+  MachineInstr* ToErase = nullptr;
+  bool Eliminated = false;
+
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      // If the previous instruction was marked for elimination, remove it now.
+      if (ToErase) {
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      if (MI.getOpcode() != SBF::MOV_32_64)
+        continue;
+
+      // Eliminate MOV_32_64 if possible.
+      //   MOV_32_64 rA, wB
+      //
+      // If wB has been zero extended, replace it with a SUBREG_TO_REG.
+      // This is to workaround SBF programs where pkt->{data, data_end}
+      // is encoded as u32, but actually the verifier populates them
+      // as 64bit pointer. The MOV_32_64 will zero out the top 32 bits.
+      LLVM_DEBUG(dbgs() << "Candidate MOV_32_64 instruction:");
+      LLVM_DEBUG(MI.dump());
+
+      if (!isMovFrom32Def(&MI))
+        continue;
+
+      LLVM_DEBUG(dbgs() << "Removing the MOV_32_64 instruction\n");
+
+      Register dst = MI.getOperand(0).getReg();
+      Register src = MI.getOperand(1).getReg();
+
+      // Build a SUBREG_TO_REG instruction.
+      BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(SBF::SUBREG_TO_REG), dst)
+        .addImm(0).addReg(src).addImm(SBF::sub_32);
+
+      ToErase = &MI;
+      Eliminated = true;
+    }
+  }
+
+  return Eliminated;
+}
+
+} // end default namespace
+
+INITIALIZE_PASS(SBFMIPeephole, DEBUG_TYPE,
+                "SBF MachineSSA Peephole Optimization For ZEXT Eliminate",
+                false, false)
+
+char SBFMIPeephole::ID = 0;
+FunctionPass* llvm::createSBFMIPeepholePass() { return new SBFMIPeephole(); }
+
+STATISTIC(RedundantMovElemNum, "Number of redundant moves eliminated");
+
+namespace {
+
+struct SBFMIPreEmitPeephole : public MachineFunctionPass {
+
+  static char ID;
+  MachineFunction *MF;
+  const TargetRegisterInfo *TRI;
+
+  SBFMIPreEmitPeephole() : MachineFunctionPass(ID) {
+    initializeSBFMIPreEmitPeepholePass(*PassRegistry::getPassRegistry());
+  }
+
+private:
+  // Initialize class variables.
+  void initialize(MachineFunction &MFParm);
+
+  bool eliminateRedundantMov();
+
+public:
+
+  // Main entry point for this pass.
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    if (skipFunction(MF.getFunction()))
+      return false;
+
+    initialize(MF);
+
+    return eliminateRedundantMov();
+  }
+};
+
+// Initialize class variables.
+void SBFMIPreEmitPeephole::initialize(MachineFunction &MFParm) {
+  MF = &MFParm;
+  TRI = MF->getSubtarget<SBFSubtarget>().getRegisterInfo();
+  LLVM_DEBUG(dbgs() << "*** SBF PreEmit peephole pass ***\n\n");
+}
+
+bool SBFMIPreEmitPeephole::eliminateRedundantMov() {
+  MachineInstr* ToErase = nullptr;
+  bool Eliminated = false;
+
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      // If the previous instruction was marked for elimination, remove it now.
+      if (ToErase) {
+        LLVM_DEBUG(dbgs() << "  Redundant Mov Eliminated:");
+        LLVM_DEBUG(ToErase->dump());
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      // Eliminate identical move:
+      //
+      //   MOV rA, rA
+      //
+      // Note that we cannot remove
+      //   MOV_32_64  rA, wA
+      //   MOV_rr_32  wA, wA
+      // as these two instructions having side effects, zeroing out
+      // top 32 bits of rA.
+      unsigned Opcode = MI.getOpcode();
+      if (Opcode == SBF::MOV_rr) {
+        Register dst = MI.getOperand(0).getReg();
+        Register src = MI.getOperand(1).getReg();
+
+        if (dst != src)
+          continue;
+
+        ToErase = &MI;
+        RedundantMovElemNum++;
+        Eliminated = true;
+      }
+    }
+  }
+
+  return Eliminated;
+}
+
+} // end default namespace
+
+INITIALIZE_PASS(SBFMIPreEmitPeephole, "sbf-mi-pemit-peephole",
+                "SBF PreEmit Peephole Optimization", false, false)
+
+char SBFMIPreEmitPeephole::ID = 0;
+FunctionPass* llvm::createSBFMIPreEmitPeepholePass()
+{
+  return new SBFMIPreEmitPeephole();
+}
+
+STATISTIC(TruncElemNum, "Number of truncation eliminated");
+
+namespace {
+
+struct SBFMIPeepholeTruncElim : public MachineFunctionPass {
+
+  static char ID;
+  const SBFInstrInfo *TII;
+  MachineFunction *MF;
+  MachineRegisterInfo *MRI;
+
+  SBFMIPeepholeTruncElim() : MachineFunctionPass(ID) {
+    initializeSBFMIPeepholeTruncElimPass(*PassRegistry::getPassRegistry());
+  }
+
+private:
+  // Initialize class variables.
+  void initialize(MachineFunction &MFParm);
+
+  bool eliminateTruncSeq();
+
+public:
+
+  // Main entry point for this pass.
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    if (skipFunction(MF.getFunction()))
+      return false;
+
+    initialize(MF);
+
+    return eliminateTruncSeq();
+  }
+};
+
+static bool TruncSizeCompatible(int TruncSize, unsigned opcode)
+{
+  if (TruncSize == 1)
+    return opcode == SBF::LDB || opcode == SBF::LDB32;
+
+  if (TruncSize == 2)
+    return opcode == SBF::LDH || opcode == SBF::LDH32;
+
+  if (TruncSize == 4)
+    return opcode == SBF::LDW || opcode == SBF::LDW32;
+
+  return false;
+}
+
+// Initialize class variables.
+void SBFMIPeepholeTruncElim::initialize(MachineFunction &MFParm) {
+  MF = &MFParm;
+  MRI = &MF->getRegInfo();
+  TII = MF->getSubtarget<SBFSubtarget>().getInstrInfo();
+  LLVM_DEBUG(dbgs() << "*** SBF MachineSSA TRUNC Elim peephole pass ***\n\n");
+}
+
+// Reg truncating is often the result of 8/16/32bit->64bit or
+// 8/16bit->32bit conversion. If the reg value is loaded with
+// masked byte width, the AND operation can be removed since
+// SBF LOAD already has zero extension.
+//
+// This also solved a correctness issue.
+// In SBF socket-related program, e.g., __sk_buff->{data, data_end}
+// are 32-bit registers, but later on, kernel verifier will rewrite
+// it with 64-bit value. Therefore, truncating the value after the
+// load will result in incorrect code.
+bool SBFMIPeepholeTruncElim::eliminateTruncSeq() {
+  MachineInstr* ToErase = nullptr;
+  bool Eliminated = false;
+
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      // The second insn to remove if the eliminate candidate is a pair.
+      MachineInstr *MI2 = nullptr;
+      Register DstReg, SrcReg;
+      MachineInstr *DefMI;
+      int TruncSize = -1;
+
+      // If the previous instruction was marked for elimination, remove it now.
+      if (ToErase) {
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      // AND A, 0xFFFFFFFF will be turned into SLL/SRL pair due to immediate
+      // for SBF ANDI is i32, and this case only happens on ALU64.
+      if (MI.getOpcode() == SBF::SRL_ri &&
+          MI.getOperand(2).getImm() == 32) {
+        SrcReg = MI.getOperand(1).getReg();
+        if (!MRI->hasOneNonDBGUse(SrcReg))
+          continue;
+
+        MI2 = MRI->getVRegDef(SrcReg);
+        DstReg = MI.getOperand(0).getReg();
+
+        if (!MI2 ||
+            MI2->getOpcode() != SBF::SLL_ri ||
+            MI2->getOperand(2).getImm() != 32)
+          continue;
+
+        // Update SrcReg.
+        SrcReg = MI2->getOperand(1).getReg();
+        DefMI = MRI->getVRegDef(SrcReg);
+        if (DefMI)
+          TruncSize = 4;
+      } else if (MI.getOpcode() == SBF::AND_ri ||
+                 MI.getOpcode() == SBF::AND_ri_32) {
+        SrcReg = MI.getOperand(1).getReg();
+        DstReg = MI.getOperand(0).getReg();
+        DefMI = MRI->getVRegDef(SrcReg);
+
+        if (!DefMI)
+          continue;
+
+        int64_t imm = MI.getOperand(2).getImm();
+        if (imm == 0xff)
+          TruncSize = 1;
+        else if (imm == 0xffff)
+          TruncSize = 2;
+      }
+
+      if (TruncSize == -1)
+        continue;
+
+      // The definition is PHI node, check all inputs.
+      if (DefMI->isPHI()) {
+        bool CheckFail = false;
+
+        for (unsigned i = 1, e = DefMI->getNumOperands(); i < e; i += 2) {
+          MachineOperand &opnd = DefMI->getOperand(i);
+          if (!opnd.isReg()) {
+            CheckFail = true;
+            break;
+          }
+
+          MachineInstr *PhiDef = MRI->getVRegDef(opnd.getReg());
+          if (!PhiDef || PhiDef->isPHI() ||
+              !TruncSizeCompatible(TruncSize, PhiDef->getOpcode())) {
+            CheckFail = true;
+            break;
+          }
+        }
+
+        if (CheckFail)
+          continue;
+      } else if (!TruncSizeCompatible(TruncSize, DefMI->getOpcode())) {
+        continue;
+      }
+
+      BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(SBF::MOV_rr), DstReg)
+              .addReg(SrcReg);
+
+      if (MI2)
+        MI2->eraseFromParent();
+
+      // Mark it to ToErase, and erase in the next iteration.
+      ToErase = &MI;
+      TruncElemNum++;
+      Eliminated = true;
+    }
+  }
+
+  return Eliminated;
+}
+
+} // end default namespace
+
+INITIALIZE_PASS(SBFMIPeepholeTruncElim, "sbf-mi-trunc-elim",
+                "SBF MachineSSA Peephole Optimization For TRUNC Eliminate",
+                false, false)
+
+char SBFMIPeepholeTruncElim::ID = 0;
+FunctionPass* llvm::createSBFMIPeepholeTruncElimPass()
+{
+  return new SBFMIPeepholeTruncElim();
+}
diff --git a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
new file mode 100644
index 0000000000000..50520a613b284
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
@@ -0,0 +1,312 @@
+//===----- SBFMISimplifyPatchable.cpp - MI Simplify Patchable Insts -------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This pass targets a subset of instructions like below
+//    ld_imm64 r1, @global
+//    ldd r2, r1, 0
+//    add r3, struct_base_reg, r2
+//
+// Here @global should represent an AMA (abstruct member access).
+// Such an access is subject to bpf load time patching. After this pass, the
+// code becomes
+//    ld_imm64 r1, @global
+//    add r3, struct_base_reg, r1
+//
+// Eventually, at BTF output stage, a relocation record will be generated
+// for ld_imm64 which should be replaced later by bpf loader:
+//    r1 = <calculated field_info>
+//    add r3, struct_base_reg, r1
+//
+// This pass also removes the intermediate load generated in IR pass for
+// __builtin_btf_type_id() intrinsic.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFCORE.h"
+#include "SBFInstrInfo.h"
+#include "SBFTargetMachine.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/Support/Debug.h"
+
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-mi-simplify-patchable"
+
+namespace {
+
+struct SBFMISimplifyPatchable : public MachineFunctionPass {
+
+  static char ID;
+  const SBFInstrInfo *TII;
+  MachineFunction *MF;
+
+  SBFMISimplifyPatchable() : MachineFunctionPass(ID) {
+    initializeSBFMISimplifyPatchablePass(*PassRegistry::getPassRegistry());
+  }
+
+private:
+  // Initialize class variables.
+  void initialize(MachineFunction &MFParm);
+
+  bool removeLD();
+  void processCandidate(MachineRegisterInfo *MRI, MachineBasicBlock &MBB,
+                        MachineInstr &MI, Register &SrcReg, Register &DstReg,
+                        const GlobalValue *GVal, bool IsAma);
+  void processDstReg(MachineRegisterInfo *MRI, Register &DstReg,
+                     Register &SrcReg, const GlobalValue *GVal,
+                     bool doSrcRegProp, bool IsAma);
+  void processInst(MachineRegisterInfo *MRI, MachineInstr *Inst,
+                   MachineOperand *RelocOp, const GlobalValue *GVal);
+  void checkADDrr(MachineRegisterInfo *MRI, MachineOperand *RelocOp,
+                  const GlobalValue *GVal);
+  void checkShift(MachineRegisterInfo *MRI, MachineBasicBlock &MBB,
+                  MachineOperand *RelocOp, const GlobalValue *GVal,
+                  unsigned Opcode);
+
+public:
+  // Main entry point for this pass.
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    if (skipFunction(MF.getFunction()))
+      return false;
+
+    initialize(MF);
+    return removeLD();
+  }
+};
+
+// Initialize class variables.
+void SBFMISimplifyPatchable::initialize(MachineFunction &MFParm) {
+  MF = &MFParm;
+  TII = MF->getSubtarget<SBFSubtarget>().getInstrInfo();
+  LLVM_DEBUG(dbgs() << "*** SBF simplify patchable insts pass ***\n\n");
+}
+
+void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
+    MachineOperand *RelocOp, const GlobalValue *GVal) {
+  const MachineInstr *Inst = RelocOp->getParent();
+  const MachineOperand *Op1 = &Inst->getOperand(1);
+  const MachineOperand *Op2 = &Inst->getOperand(2);
+  const MachineOperand *BaseOp = (RelocOp == Op1) ? Op2 : Op1;
+
+  // Go through all uses of %1 as in %1 = ADD_rr %2, %3
+  const MachineOperand Op0 = Inst->getOperand(0);
+  for (MachineOperand &MO :
+       llvm::make_early_inc_range(MRI->use_operands(Op0.getReg()))) {
+    // The candidate needs to have a unique definition.
+    if (!MRI->getUniqueVRegDef(MO.getReg()))
+      continue;
+
+    MachineInstr *DefInst = MO.getParent();
+    unsigned Opcode = DefInst->getOpcode();
+    unsigned COREOp;
+    if (Opcode == SBF::LDB || Opcode == SBF::LDH || Opcode == SBF::LDW ||
+        Opcode == SBF::LDD || Opcode == SBF::STB || Opcode == SBF::STH ||
+        Opcode == SBF::STW || Opcode == SBF::STD)
+      COREOp = SBF::CORE_MEM;
+    else if (Opcode == SBF::LDB32 || Opcode == SBF::LDH32 ||
+             Opcode == SBF::LDW32 || Opcode == SBF::STB32 ||
+             Opcode == SBF::STH32 || Opcode == SBF::STW32)
+      COREOp = SBF::CORE_ALU32_MEM;
+    else
+      continue;
+
+    // It must be a form of %2 = *(type *)(%1 + 0) or *(type *)(%1 + 0) = %2.
+    const MachineOperand &ImmOp = DefInst->getOperand(2);
+    if (!ImmOp.isImm() || ImmOp.getImm() != 0)
+      continue;
+
+    // Reject the form:
+    //   %1 = ADD_rr %2, %3
+    //   *(type *)(%2 + 0) = %1
+    if (Opcode == SBF::STB || Opcode == SBF::STH || Opcode == SBF::STW ||
+        Opcode == SBF::STD || Opcode == SBF::STB32 || Opcode == SBF::STH32 ||
+        Opcode == SBF::STW32) {
+      const MachineOperand &Opnd = DefInst->getOperand(0);
+      if (Opnd.isReg() && Opnd.getReg() == MO.getReg())
+        continue;
+    }
+
+    BuildMI(*DefInst->getParent(), *DefInst, DefInst->getDebugLoc(), TII->get(COREOp))
+        .add(DefInst->getOperand(0)).addImm(Opcode).add(*BaseOp)
+        .addGlobalAddress(GVal);
+    DefInst->eraseFromParent();
+  }
+}
+
+void SBFMISimplifyPatchable::checkShift(MachineRegisterInfo *MRI,
+    MachineBasicBlock &MBB, MachineOperand *RelocOp, const GlobalValue *GVal,
+    unsigned Opcode) {
+  // Relocation operand should be the operand #2.
+  MachineInstr *Inst = RelocOp->getParent();
+  if (RelocOp != &Inst->getOperand(2))
+    return;
+
+  BuildMI(MBB, *Inst, Inst->getDebugLoc(), TII->get(SBF::CORE_SHIFT))
+      .add(Inst->getOperand(0)).addImm(Opcode)
+      .add(Inst->getOperand(1)).addGlobalAddress(GVal);
+  Inst->eraseFromParent();
+}
+
+void SBFMISimplifyPatchable::processCandidate(MachineRegisterInfo *MRI,
+    MachineBasicBlock &MBB, MachineInstr &MI, Register &SrcReg,
+    Register &DstReg, const GlobalValue *GVal, bool IsAma) {
+  if (MRI->getRegClass(DstReg) == &SBF::GPR32RegClass) {
+    if (IsAma) {
+      // We can optimize such a pattern:
+      //  %1:gpr = LD_imm64 @"llvm.s:0:4$0:2"
+      //  %2:gpr32 = LDW32 %1:gpr, 0
+      //  %3:gpr = SUBREG_TO_REG 0, %2:gpr32, %subreg.sub_32
+      //  %4:gpr = ADD_rr %0:gpr, %3:gpr
+      //  or similar patterns below for non-alu32 case.
+      auto Begin = MRI->use_begin(DstReg), End = MRI->use_end();
+      decltype(End) NextI;
+      for (auto I = Begin; I != End; I = NextI) {
+        NextI = std::next(I);
+        if (!MRI->getUniqueVRegDef(I->getReg()))
+          continue;
+
+        unsigned Opcode = I->getParent()->getOpcode();
+        if (Opcode == SBF::SUBREG_TO_REG) {
+          Register TmpReg = I->getParent()->getOperand(0).getReg();
+          processDstReg(MRI, TmpReg, DstReg, GVal, false, IsAma);
+        }
+      }
+    }
+
+    BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(SBF::COPY), DstReg)
+        .addReg(SrcReg, 0, SBF::sub_32);
+    return;
+  }
+
+  // All uses of DstReg replaced by SrcReg
+  processDstReg(MRI, DstReg, SrcReg, GVal, true, IsAma);
+}
+
+void SBFMISimplifyPatchable::processDstReg(MachineRegisterInfo *MRI,
+    Register &DstReg, Register &SrcReg, const GlobalValue *GVal,
+    bool doSrcRegProp, bool IsAma) {
+  auto Begin = MRI->use_begin(DstReg), End = MRI->use_end();
+  decltype(End) NextI;
+  for (auto I = Begin; I != End; I = NextI) {
+    NextI = std::next(I);
+    if (doSrcRegProp)
+      I->setReg(SrcReg);
+
+    // The candidate needs to have a unique definition.
+    if (IsAma && MRI->getUniqueVRegDef(I->getReg()))
+      processInst(MRI, I->getParent(), &*I, GVal);
+  }
+}
+
+// Check to see whether we could do some optimization
+// to attach relocation to downstream dependent instructions.
+// Two kinds of patterns are recognized below:
+// Pattern 1:
+//   %1 = LD_imm64 @"llvm.b:0:4$0:1"  <== patch_imm = 4
+//   %2 = LDD %1, 0  <== this insn will be removed
+//   %3 = ADD_rr %0, %2
+//   %4 = LDW[32] %3, 0 OR STW[32] %4, %3, 0
+//   The `%4 = ...` will be transformed to
+//      CORE_[ALU32_]MEM(%4, mem_opcode, %0, @"llvm.b:0:4$0:1")
+//   and later on, BTF emit phase will translate to
+//      %4 = LDW[32] %0, 4 STW[32] %4, %0, 4
+//   and attach a relocation to it.
+// Pattern 2:
+//    %15 = LD_imm64 @"llvm.t:5:63$0:2" <== relocation type 5
+//    %16 = LDD %15, 0   <== this insn will be removed
+//    %17 = SRA_rr %14, %16
+//    The `%17 = ...` will be transformed to
+//       %17 = CORE_SHIFT(SRA_ri, %14, @"llvm.t:5:63$0:2")
+//    and later on, BTF emit phase will translate to
+//       %r4 = SRA_ri %r4, 63
+void SBFMISimplifyPatchable::processInst(MachineRegisterInfo *MRI,
+    MachineInstr *Inst, MachineOperand *RelocOp, const GlobalValue *GVal) {
+  unsigned Opcode = Inst->getOpcode();
+  if (Opcode == SBF::ADD_rr)
+    checkADDrr(MRI, RelocOp, GVal);
+  else if (Opcode == SBF::SLL_rr)
+    checkShift(MRI, *Inst->getParent(), RelocOp, GVal, SBF::SLL_ri);
+  else if (Opcode == SBF::SRA_rr)
+    checkShift(MRI, *Inst->getParent(), RelocOp, GVal, SBF::SRA_ri);
+  else if (Opcode == SBF::SRL_rr)
+    checkShift(MRI, *Inst->getParent(), RelocOp, GVal, SBF::SRL_ri);
+}
+
+/// Remove unneeded Load instructions.
+bool SBFMISimplifyPatchable::removeLD() {
+  MachineRegisterInfo *MRI = &MF->getRegInfo();
+  MachineInstr *ToErase = nullptr;
+  bool Changed = false;
+
+  for (MachineBasicBlock &MBB : *MF) {
+    for (MachineInstr &MI : MBB) {
+      if (ToErase) {
+        ToErase->eraseFromParent();
+        ToErase = nullptr;
+      }
+
+      // Ensure the register format is LOAD <reg>, <reg>, 0
+      if (MI.getOpcode() != SBF::LDD && MI.getOpcode() != SBF::LDW &&
+          MI.getOpcode() != SBF::LDH && MI.getOpcode() != SBF::LDB &&
+          MI.getOpcode() != SBF::LDW32 && MI.getOpcode() != SBF::LDH32 &&
+          MI.getOpcode() != SBF::LDB32)
+        continue;
+
+      if (!MI.getOperand(0).isReg() || !MI.getOperand(1).isReg())
+        continue;
+
+      if (!MI.getOperand(2).isImm() || MI.getOperand(2).getImm())
+        continue;
+
+      Register DstReg = MI.getOperand(0).getReg();
+      Register SrcReg = MI.getOperand(1).getReg();
+
+      MachineInstr *DefInst = MRI->getUniqueVRegDef(SrcReg);
+      if (!DefInst)
+        continue;
+
+      if (DefInst->getOpcode() != SBF::LD_imm64)
+        continue;
+
+      const MachineOperand &MO = DefInst->getOperand(1);
+      if (!MO.isGlobal())
+        continue;
+
+      const GlobalValue *GVal = MO.getGlobal();
+      auto *GVar = dyn_cast<GlobalVariable>(GVal);
+      if (!GVar)
+        continue;
+
+      // Global variables representing structure offset or type id.
+      bool IsAma = false;
+      if (GVar->hasAttribute(SBFCoreSharedInfo::AmaAttr))
+        IsAma = true;
+      else if (!GVar->hasAttribute(SBFCoreSharedInfo::TypeIdAttr))
+        continue;
+
+      processCandidate(MRI, MBB, MI, SrcReg, DstReg, GVal, IsAma);
+
+      ToErase = &MI;
+      Changed = true;
+    }
+  }
+
+  return Changed;
+}
+
+} // namespace
+
+INITIALIZE_PASS(SBFMISimplifyPatchable, DEBUG_TYPE,
+                "SBF PreEmit SimplifyPatchable", false, false)
+
+char SBFMISimplifyPatchable::ID = 0;
+FunctionPass *llvm::createSBFMISimplifyPatchablePass() {
+  return new SBFMISimplifyPatchable();
+}
diff --git a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
new file mode 100644
index 0000000000000..59a7ec2c51d2e
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
@@ -0,0 +1,153 @@
+//===----------- SBFPreserveDIType.cpp - Preserve DebugInfo Types ---------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Preserve Debuginfo types encoded in __builtin_btf_type_id() metadata.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBF.h"
+#include "SBFCORE.h"
+#include "llvm/IR/DebugInfoMetadata.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/User.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Pass.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+
+#define DEBUG_TYPE "sbf-preserve-di-type"
+
+namespace llvm {
+constexpr StringRef SBFCoreSharedInfo::TypeIdAttr;
+} // namespace llvm
+
+using namespace llvm;
+
+namespace {
+
+static bool SBFPreserveDITypeImpl(Function &F) {
+  LLVM_DEBUG(dbgs() << "********** preserve debuginfo type **********\n");
+
+  Module *M = F.getParent();
+
+  // Bail out if no debug info.
+  if (M->debug_compile_units().empty())
+    return false;
+
+  std::vector<CallInst *> PreserveDITypeCalls;
+
+  for (auto &BB : F) {
+    for (auto &I : BB) {
+      auto *Call = dyn_cast<CallInst>(&I);
+      if (!Call)
+        continue;
+
+      const auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
+      if (!GV)
+        continue;
+
+      if (GV->getName().startswith("llvm.bpf.btf.type.id")) {
+        if (!Call->getMetadata(LLVMContext::MD_preserve_access_index))
+          report_fatal_error(
+              "Missing metadata for llvm.bpf.btf.type.id intrinsic");
+        PreserveDITypeCalls.push_back(Call);
+      }
+    }
+  }
+
+  if (PreserveDITypeCalls.empty())
+    return false;
+
+  std::string BaseName = "llvm.btf_type_id.";
+  static int Count = 0;
+  for (auto Call : PreserveDITypeCalls) {
+    const ConstantInt *Flag = dyn_cast<ConstantInt>(Call->getArgOperand(1));
+    assert(Flag);
+    uint64_t FlagValue = Flag->getValue().getZExtValue();
+
+    if (FlagValue >= SBFCoreSharedInfo::MAX_BTF_TYPE_ID_FLAG)
+      report_fatal_error("Incorrect flag for llvm.bpf.btf.type.id intrinsic");
+
+    MDNode *MD = Call->getMetadata(LLVMContext::MD_preserve_access_index);
+
+    uint32_t Reloc;
+    if (FlagValue == SBFCoreSharedInfo::BTF_TYPE_ID_LOCAL_RELOC) {
+      Reloc = SBFCoreSharedInfo::BTF_TYPE_ID_LOCAL;
+    } else {
+      Reloc = SBFCoreSharedInfo::BTF_TYPE_ID_REMOTE;
+      DIType *Ty = cast<DIType>(MD);
+      while (auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
+        unsigned Tag = DTy->getTag();
+        if (Tag != dwarf::DW_TAG_const_type &&
+            Tag != dwarf::DW_TAG_volatile_type)
+          break;
+        Ty = DTy->getBaseType();
+      }
+
+      if (Ty->getName().empty()) {
+        if (isa<DISubroutineType>(Ty))
+          report_fatal_error(
+              "SubroutineType not supported for BTF_TYPE_ID_REMOTE reloc");
+        else
+          report_fatal_error("Empty type name for BTF_TYPE_ID_REMOTE reloc");
+      }
+      MD = Ty;
+    }
+
+    BasicBlock *BB = Call->getParent();
+    IntegerType *VarType = Type::getInt64Ty(BB->getContext());
+    std::string GVName =
+        BaseName + std::to_string(Count) + "$" + std::to_string(Reloc);
+    GlobalVariable *GV = new GlobalVariable(
+        *M, VarType, false, GlobalVariable::ExternalLinkage, nullptr, GVName);
+    GV->addAttribute(SBFCoreSharedInfo::TypeIdAttr);
+    GV->setMetadata(LLVMContext::MD_preserve_access_index, MD);
+
+    // Load the global variable which represents the type info.
+    auto *LDInst =
+        new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+    Instruction *PassThroughInst =
+        SBFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
+    Call->replaceAllUsesWith(PassThroughInst);
+    Call->eraseFromParent();
+    Count++;
+  }
+
+  return true;
+}
+
+class SBFPreserveDIType final : public FunctionPass {
+  bool runOnFunction(Function &F) override;
+
+public:
+  static char ID;
+  SBFPreserveDIType() : FunctionPass(ID) {}
+};
+} // End anonymous namespace
+
+char SBFPreserveDIType::ID = 0;
+INITIALIZE_PASS(SBFPreserveDIType, DEBUG_TYPE, "SBF Preserve Debuginfo Type",
+                false, false)
+
+FunctionPass *llvm::createSBFPreserveDIType() {
+  return new SBFPreserveDIType();
+}
+
+bool SBFPreserveDIType::runOnFunction(Function &F) {
+  return SBFPreserveDITypeImpl(F);
+}
+
+PreservedAnalyses SBFPreserveDITypePass::run(Function &F,
+                                             FunctionAnalysisManager &AM) {
+  return SBFPreserveDITypeImpl(F) ? PreservedAnalyses::none()
+                                  : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
new file mode 100644
index 0000000000000..0cd475a829a90
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -0,0 +1,150 @@
+//===-- SBFRegisterInfo.cpp - SBF Register Information ----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the SBF implementation of the TargetRegisterInfo class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFRegisterInfo.h"
+#include "SBF.h"
+#include "SBFSubtarget.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/RegisterScavenging.h"
+#include "llvm/CodeGen/TargetFrameLowering.h"
+#include "llvm/CodeGen/TargetInstrInfo.h"
+#include "llvm/IR/DiagnosticInfo.h"
+#include "llvm/Support/ErrorHandling.h"
+
+#define GET_REGINFO_TARGET_DESC
+#include "SBFGenRegisterInfo.inc"
+using namespace llvm;
+
+unsigned SBFRegisterInfo::FrameLength = 512;
+
+SBFRegisterInfo::SBFRegisterInfo()
+    : SBFGenRegisterInfo(SBF::R0) {}
+
+const MCPhysReg *
+SBFRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
+  return CSR_SaveList;
+}
+
+BitVector SBFRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
+  BitVector Reserved(getNumRegs());
+  markSuperRegs(Reserved, SBF::W10); // [W|R]10 is read only frame pointer
+  markSuperRegs(Reserved, SBF::W11); // [W|R]11 is pseudo stack pointer
+  return Reserved;
+}
+
+static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
+{
+  static Function *OldMF = nullptr;
+  if (&(MF.getFunction()) == OldMF) {
+    return;
+  }
+  OldMF = &(MF.getFunction());
+  int MaxOffset = -1 * SBFRegisterInfo::FrameLength;
+  if (Offset <= MaxOffset) {
+    if (MF.getSubtarget<SBFSubtarget>().isSolana()) {
+      dbgs() << "Error:";
+      if (DL) {
+        dbgs() << " ";
+        DL.print(dbgs());
+      }
+      dbgs() << " Function " << MF.getFunction().getName()
+             << " Stack offset of " << -Offset << " exceeded max offset of "
+             << -MaxOffset << " by " << MaxOffset - Offset
+             << " bytes, please minimize large stack variables\n";
+    } else {
+      DiagnosticInfoUnsupported DiagStackSize(
+          MF.getFunction(),
+          "SBF stack limit of 512 bytes is exceeded. "
+          "Please move large on stack variables into SBF per-cpu array map.\n",
+          DL, DiagnosticSeverity::DS_Error);
+      MF.getFunction().getContext().diagnose(DiagStackSize);
+    }
+  }
+}
+
+void SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
+                                          int SPAdj, unsigned FIOperandNum,
+                                          RegScavenger *RS) const {
+  assert(SPAdj == 0 && "Unexpected");
+
+  unsigned i = 0;
+  MachineInstr &MI = *II;
+  MachineBasicBlock &MBB = *MI.getParent();
+  MachineFunction &MF = *MBB.getParent();
+  DebugLoc DL = MI.getDebugLoc();
+
+  if (!DL)
+    /* try harder to get some debug loc */
+    for (auto &I : MBB)
+      if (I.getDebugLoc()) {
+        DL = I.getDebugLoc().getFnDebugLoc();
+        break;
+      }
+
+  while (!MI.getOperand(i).isFI()) {
+    ++i;
+    assert(i < MI.getNumOperands() && "Instr doesn't have FrameIndex operand!");
+  }
+
+  Register FrameReg = getFrameRegister(MF);
+  int FrameIndex = MI.getOperand(i).getIndex();
+  const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo();
+
+  if (MI.getOpcode() == SBF::MOV_rr) {
+    int Offset = MF.getFrameInfo().getObjectOffset(FrameIndex);
+
+    if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
+      WarnSize(Offset, MF, DL);
+    }
+    MI.getOperand(i).ChangeToRegister(FrameReg, false);
+    Register reg = MI.getOperand(i - 1).getReg();
+    BuildMI(MBB, ++II, DL, TII.get(SBF::ADD_ri), reg)
+        .addReg(reg)
+        .addImm(Offset);
+    return;
+  }
+
+  int Offset = MF.getFrameInfo().getObjectOffset(FrameIndex) +
+               MI.getOperand(i + 1).getImm();
+
+  if (!isInt<32>(Offset))
+    llvm_unreachable("bug in frame offset");
+
+  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
+    WarnSize(Offset, MF, DL);
+  }
+
+  if (MI.getOpcode() == SBF::FI_ri) {
+    // architecture does not really support FI_ri, replace it with
+    //    MOV_rr <target_reg>, frame_reg
+    //    ADD_ri <target_reg>, imm
+    Register reg = MI.getOperand(i - 1).getReg();
+
+    BuildMI(MBB, ++II, DL, TII.get(SBF::MOV_rr), reg)
+        .addReg(FrameReg);
+    BuildMI(MBB, II, DL, TII.get(SBF::ADD_ri), reg)
+        .addReg(reg)
+        .addImm(Offset);
+
+    // Remove FI_ri instruction
+    MI.eraseFromParent();
+  } else {
+    MI.getOperand(i).ChangeToRegister(FrameReg, false);
+    MI.getOperand(i + 1).ChangeToImmediate(Offset);
+  }
+}
+
+Register SBFRegisterInfo::getFrameRegister(const MachineFunction &MF) const {
+  return SBF::R10;
+}
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.h b/llvm/lib/Target/SBF/SBFRegisterInfo.h
new file mode 100644
index 0000000000000..bfe6741aacf68
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.h
@@ -0,0 +1,40 @@
+//===-- SBFRegisterInfo.h - SBF Register Information Impl -------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the SBF implementation of the TargetRegisterInfo class.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFREGISTERINFO_H
+#define LLVM_LIB_TARGET_SBF_SBFREGISTERINFO_H
+
+#include "llvm/CodeGen/TargetRegisterInfo.h"
+
+#define GET_REGINFO_HEADER
+#include "SBFGenRegisterInfo.inc"
+
+namespace llvm {
+
+struct SBFRegisterInfo : public SBFGenRegisterInfo {
+  static unsigned FrameLength;
+
+  SBFRegisterInfo();
+
+  const MCPhysReg *getCalleeSavedRegs(const MachineFunction *MF) const override;
+
+  BitVector getReservedRegs(const MachineFunction &MF) const override;
+
+  void eliminateFrameIndex(MachineBasicBlock::iterator MI, int SPAdj,
+                           unsigned FIOperandNum,
+                           RegScavenger *RS = nullptr) const override;
+
+  Register getFrameRegister(const MachineFunction &MF) const override;
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.td b/llvm/lib/Target/SBF/SBFRegisterInfo.td
new file mode 100644
index 0000000000000..7696b0b973159
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.td
@@ -0,0 +1,51 @@
+//===-- SBFRegisterInfo.td - SBF Register defs -------------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+//  Declarations that describe the SBF register file
+//===----------------------------------------------------------------------===//
+
+let Namespace = "SBF" in {
+  def sub_32 : SubRegIndex<32>;
+}
+
+class Wi<bits<16> Enc, string n> : Register<n> {
+  let HWEncoding = Enc;
+  let Namespace = "SBF";
+}
+
+// Registers are identified with 4-bit ID numbers.
+// Ri - 64-bit integer registers
+class Ri<bits<16> Enc, string n, list<Register> subregs>
+  : RegisterWithSubRegs<n, subregs> {
+  let HWEncoding = Enc;
+  let Namespace = "SBF";
+  let SubRegIndices = [sub_32];
+}
+
+foreach I = 0-11 in {
+  // 32-bit Integer (alias to low part of 64-bit register).
+  def W#I  : Wi<I,  "w"#I>,  DwarfRegNum<[I]>;
+  // 64-bit Integer registers
+  def R#I  : Ri<I,  "r"#I,  [!cast<Wi>("W"#I)]>,  DwarfRegNum<[I]>;
+}
+
+// Register classes.
+def GPR32 : RegisterClass<"SBF", [i32], 64, (add
+  (sequence "W%u", 1, 9),
+  W0, // Return value
+  W11, // Stack Ptr
+  W10  // Frame Ptr
+)>;
+
+def GPR : RegisterClass<"SBF", [i64], 64, (add
+  (sequence "R%u", 1, 9),
+  R0, // Return value
+  R11, // Stack Ptr
+  R10  // Frame Ptr
+)>;
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
new file mode 100644
index 0000000000000..0a5d3aab10462
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
@@ -0,0 +1,42 @@
+//===-- SBFSelectionDAGInfo.cpp - SBF SelectionDAG Info -------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the SBFSelectionDAGInfo class.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFTargetMachine.h"
+#include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/IR/DerivedTypes.h"
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-selectiondag-info"
+
+SDValue SBFSelectionDAGInfo::EmitTargetCodeForMemcpy(
+    SelectionDAG &DAG, const SDLoc &dl, SDValue Chain, SDValue Dst, SDValue Src,
+    SDValue Size, Align Alignment, bool isVolatile, bool AlwaysInline,
+    MachinePointerInfo DstPtrInfo, MachinePointerInfo SrcPtrInfo) const {
+  // Requires the copy size to be a constant.
+  ConstantSDNode *ConstantSize = dyn_cast<ConstantSDNode>(Size);
+  if (!ConstantSize)
+    return SDValue();
+
+  unsigned CopyLen = ConstantSize->getZExtValue();
+  unsigned StoresNumEstimate = alignTo(CopyLen, Alignment) >> Log2(Alignment);
+  // Impose the same copy length limit as MaxStoresPerMemcpy.
+  if (StoresNumEstimate > getCommonMaxStoresPerMemFunc())
+    return SDValue();
+
+  SDVTList VTs = DAG.getVTList(MVT::Other, MVT::Glue);
+
+  Dst = DAG.getNode(SBFISD::MEMCPY, dl, VTs, Chain, Dst, Src,
+                    DAG.getConstant(CopyLen, dl, MVT::i64),
+                    DAG.getConstant(Alignment.value(), dl, MVT::i64));
+
+  return Dst.getValue(0);
+}
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
new file mode 100644
index 0000000000000..104246c6718b8
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
@@ -0,0 +1,44 @@
+//===-- SBFSelectionDAGInfo.h - SBF SelectionDAG Info -----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the SBF subclass for SelectionDAGTargetInfo.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFSELECTIONDAGINFO_H
+#define LLVM_LIB_TARGET_SBF_SBFSELECTIONDAGINFO_H
+
+#include "llvm/CodeGen/SelectionDAGTargetInfo.h"
+
+namespace llvm {
+
+class SBFSelectionDAGInfo : public SelectionDAGTargetInfo {
+public:
+  SBFSelectionDAGInfo() : isSolana(false) {}
+  SDValue EmitTargetCodeForMemcpy(SelectionDAG &DAG, const SDLoc &dl,
+                                  SDValue Chain, SDValue Dst, SDValue Src,
+                                  SDValue Size, Align Alignment,
+                                  bool isVolatile, bool AlwaysInline,
+                                  MachinePointerInfo DstPtrInfo,
+                                  MachinePointerInfo SrcPtrInfo) const override;
+
+  unsigned getCommonMaxStoresPerMemFunc() const {
+    return isSolana ? 4 : 128;
+  }
+  void setSolanaFlag(bool value) const {
+    isSolana = value;
+  }
+
+private:
+  mutable bool isSolana;
+
+};
+
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
new file mode 100644
index 0000000000000..e49f6a31c7ba1
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -0,0 +1,80 @@
+//===-- SBFSubtarget.cpp - SBF Subtarget Information ----------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the SBF specific subclass of TargetSubtargetInfo.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFSubtarget.h"
+#include "SBF.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/Host.h"
+
+using namespace llvm;
+
+#define DEBUG_TYPE "sbf-subtarget"
+
+#define GET_SUBTARGETINFO_TARGET_DESC
+#define GET_SUBTARGETINFO_CTOR
+#include "SBFGenSubtargetInfo.inc"
+
+void SBFSubtarget::anchor() {}
+
+SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT,
+                                                            StringRef CPU,
+                                                            StringRef FS) {
+  initializeEnvironment(TT);
+  initSubtargetFeatures(CPU, FS);
+  return *this;
+}
+
+void SBFSubtarget::initializeEnvironment(const Triple &TT) {
+  assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
+  IsSolana = true;
+  HasJmpExt = false;
+  HasJmp32 = false;
+  HasAlu32 = false;
+  HasDynamicFrames = false;
+  HasSdiv = false;
+  UseDwarfRIS = false;
+}
+
+void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
+  // TODO: jle: This invokes an x86 linux kernel call to probe the eBPF ISA
+  // revision in use. This doesn't seem to make much sense for SBF where we
+  // execute on a VM inside of the Solana runtime, not the VM in the linux
+  // kernel.
+  if (CPU == "probe")
+    CPU = sys::detail::getHostCPUNameForBPF();
+
+  ParseSubtargetFeatures(CPU, /*TuneCPU*/ CPU, FS);
+
+  if (CPU == "v2") {
+    HasJmpExt = true;
+  }
+
+  if (CPU == "v3") {
+    HasJmpExt = true;
+    HasJmp32 = true;
+    HasAlu32 = true;
+  }
+
+  if (CPU == "sbfv2" && !HasDynamicFrames) {
+    report_fatal_error("sbfv2 requires dynamic-frames\n", false);
+  }
+}
+
+SBFSubtarget::SBFSubtarget(const Triple &TT, const std::string &CPU,
+                           const std::string &FS, const TargetMachine &TM)
+    : SBFGenSubtargetInfo(TT, CPU, /*TuneCPU*/ CPU, FS), InstrInfo(),
+      FrameLowering(initializeSubtargetDependencies(TT, CPU, FS)),
+      TLInfo(TM, *this) {
+  assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
+  IsSolana = true;
+  TSInfo.setSolanaFlag(IsSolana);
+}
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
new file mode 100644
index 0000000000000..2334bbb1bb89b
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -0,0 +1,110 @@
+//===-- SBFSubtarget.h - Define Subtarget for the SBF -----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file declares the SBF specific subclass of TargetSubtargetInfo.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFSUBTARGET_H
+#define LLVM_LIB_TARGET_SBF_SBFSUBTARGET_H
+
+#include "SBFFrameLowering.h"
+#include "SBFISelLowering.h"
+#include "SBFInstrInfo.h"
+#include "SBFSelectionDAGInfo.h"
+#include "llvm/CodeGen/SelectionDAGTargetInfo.h"
+#include "llvm/CodeGen/TargetSubtargetInfo.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/Target/TargetMachine.h"
+
+#define GET_SUBTARGETINFO_HEADER
+#include "SBFGenSubtargetInfo.inc"
+
+namespace llvm {
+class StringRef;
+
+class SBFSubtarget : public SBFGenSubtargetInfo {
+  virtual void anchor();
+  SBFInstrInfo InstrInfo;
+  SBFFrameLowering FrameLowering;
+  SBFTargetLowering TLInfo;
+  SBFSelectionDAGInfo TSInfo;
+
+private:
+  void initializeEnvironment(const Triple &TT);
+  void initSubtargetFeatures(StringRef CPU, StringRef FS);
+  bool probeJmpExt();
+
+protected:
+  // unused
+  bool isDummyMode;
+
+  // whether to enable Solana extensions.
+  bool IsSolana;
+
+  // whether the cpu supports jmp ext
+  bool HasJmpExt;
+
+  // whether the cpu supports jmp32 ext.
+  // NOTE: jmp32 is not enabled when alu32 enabled.
+  bool HasJmp32;
+
+  // whether the cpu supports alu32 instructions.
+  bool HasAlu32;
+
+  // whether we should use fixed or dynamic frames
+  bool HasDynamicFrames;
+
+  // Relocate FK_Data_8 fixups as R_SBF_64_ABS64
+  bool UseRelocAbs64;
+
+  // whether the cpu supports native SBF_SDIV
+  bool HasSdiv;
+
+  // Not used for anything, just set by the static-syscalls marker feature.
+  bool HasStaticSyscalls;
+
+  // whether we should enable MCAsmInfo DwarfUsesRelocationsAcrossSections
+  bool UseDwarfRIS;
+
+public:
+  // This constructor initializes the data members to match that
+  // of the specified triple.
+  SBFSubtarget(const Triple &TT, const std::string &CPU, const std::string &FS,
+               const TargetMachine &TM);
+
+  SBFSubtarget &initializeSubtargetDependencies(const Triple &TT, StringRef CPU, StringRef FS);
+
+  // ParseSubtargetFeatures - Parses features string setting specified
+  // subtarget options.  Definition of function is auto generated by tblgen.
+  void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);
+  bool isSolana() const { return IsSolana; }
+  bool getHasJmpExt() const { return HasJmpExt; }
+  bool getHasJmp32() const { return HasJmp32; }
+  bool getHasAlu32() const { return HasAlu32; }
+  bool getHasDynamicFrames() const { return HasDynamicFrames; }
+  bool getHasSdiv() const { return HasSdiv; }
+  bool getUseDwarfRIS() const { return UseDwarfRIS; }
+
+  const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
+  const SBFFrameLowering *getFrameLowering() const override {
+    return &FrameLowering;
+  }
+  const SBFTargetLowering *getTargetLowering() const override {
+    return &TLInfo;
+  }
+  const SBFSelectionDAGInfo *getSelectionDAGInfo() const override {
+    return &TSInfo;
+  }
+  const TargetRegisterInfo *getRegisterInfo() const override {
+    return &InstrInfo.getRegisterInfo();
+  }
+};
+} // End llvm namespace
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
new file mode 100644
index 0000000000000..2d28f3745d694
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -0,0 +1,184 @@
+//===-- SBFTargetMachine.cpp - Define TargetMachine for SBF ---------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Implements the info about SBF target spec.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFTargetMachine.h"
+#include "SBF.h"
+#include "SBFTargetTransformInfo.h"
+#include "MCTargetDesc/SBFMCAsmInfo.h"
+#include "TargetInfo/SBFTargetInfo.h"
+#include "llvm/CodeGen/Passes.h"
+#include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
+#include "llvm/CodeGen/TargetPassConfig.h"
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Support/FormattedStream.h"
+#include "llvm/Target/TargetOptions.h"
+#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/Scalar/SimplifyCFG.h"
+#include "llvm/Transforms/Utils/SimplifyCFGOptions.h"
+using namespace llvm;
+
+static cl::
+opt<bool> DisableMIPeephole("disable-sbf-peephole", cl::Hidden,
+                            cl::desc("Disable machine peepholes for SBF"));
+
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTarget() {
+  // Register the target.
+  RegisterTargetMachine<SBFTargetMachine> XX(getTheSBFXTarget());
+
+  PassRegistry &PR = *PassRegistry::getPassRegistry();
+  initializeSBFAbstractMemberAccessLegacyPassPass(PR);
+  initializeSBFPreserveDITypePass(PR);
+  initializeSBFIRPeepholePass(PR);
+  initializeSBFAdjustOptPass(PR);
+  initializeSBFCheckAndAdjustIRPass(PR);
+  initializeSBFMIPeepholePass(PR);
+  initializeSBFMIPeepholeTruncElimPass(PR);
+}
+
+// DataLayout: little or big endian
+static std::string computeDataLayout(const Triple &TT, StringRef FS) {
+  // TOOD: jle; specialize this (and elsewhere) to Solana-only once the new
+  // back-end is integrated; e.g. we won't need IsSolana, etc.
+  assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
+  bool IsSolana = true;
+  return "e-m:e-p:64:64-i64:64-n32:64-S128";
+}
+
+static Reloc::Model getEffectiveRelocModel(Optional<Reloc::Model> RM) {
+  return RM.getValueOr(Reloc::PIC_);
+}
+
+SBFTargetMachine::SBFTargetMachine(const Target &T, const Triple &TT,
+                                   StringRef CPU, StringRef FS,
+                                   const TargetOptions &Options,
+                                   Optional<Reloc::Model> RM,
+                                   Optional<CodeModel::Model> CM,
+                                   CodeGenOpt::Level OL, bool JIT)
+    : LLVMTargetMachine(T, computeDataLayout(TT, FS), TT, CPU, FS, Options,
+                        getEffectiveRelocModel(RM),
+                        getEffectiveCodeModel(CM, CodeModel::Small), OL),
+      TLOF(std::make_unique<TargetLoweringObjectFileELF>()),
+      Subtarget(TT, std::string(CPU), std::string(FS), *this) {
+  initAsmInfo();
+
+  SBFMCAsmInfo *MAI =
+      static_cast<SBFMCAsmInfo *>(const_cast<MCAsmInfo *>(AsmInfo.get()));
+  MAI->setDwarfUsesRelocationsAcrossSections(!Subtarget.getUseDwarfRIS());
+  MAI->setSupportsDebugInformation(true);
+}
+
+namespace {
+// SBF Code Generator Pass Configuration Options.
+class SBFPassConfig : public TargetPassConfig {
+public:
+  SBFPassConfig(SBFTargetMachine &TM, PassManagerBase &PM)
+      : TargetPassConfig(TM, PM) {}
+
+  SBFTargetMachine &getSBFTargetMachine() const {
+    return getTM<SBFTargetMachine>();
+  }
+
+  void addIRPasses() override;
+  bool addInstSelector() override;
+  void addMachineSSAOptimization() override;
+  void addPreEmitPass() override;
+};
+}
+
+TargetPassConfig *SBFTargetMachine::createPassConfig(PassManagerBase &PM) {
+  return new SBFPassConfig(*this, PM);
+}
+
+void SBFTargetMachine::adjustPassManager(PassManagerBuilder &Builder) {
+ Builder.addExtension(
+      PassManagerBuilder::EP_EarlyAsPossible,
+      [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
+        PM.add(createSBFAbstractMemberAccess(this));
+        PM.add(createSBFPreserveDIType());
+        PM.add(createSBFIRPeephole());
+      });
+
+  Builder.addExtension(
+      PassManagerBuilder::EP_Peephole,
+      [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
+        PM.add(createCFGSimplificationPass(
+            SimplifyCFGOptions().hoistCommonInsts(true)));
+      });
+  Builder.addExtension(
+      PassManagerBuilder::EP_ModuleOptimizerEarly,
+      [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
+        PM.add(createSBFAdjustOpt());
+      });
+}
+
+void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+  PB.registerPipelineStartEPCallback(
+      [=](ModulePassManager &MPM, OptimizationLevel) {
+        FunctionPassManager FPM;
+        FPM.addPass(SBFAbstractMemberAccessPass(this));
+        FPM.addPass(SBFPreserveDITypePass());
+        FPM.addPass(SBFIRPeepholePass());
+        MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
+      });
+  PB.registerPeepholeEPCallback([=](FunctionPassManager &FPM,
+                                    OptimizationLevel Level) {
+    FPM.addPass(SimplifyCFGPass(SimplifyCFGOptions().hoistCommonInsts(true)));
+  });
+  PB.registerPipelineEarlySimplificationEPCallback(
+      [=](ModulePassManager &MPM, OptimizationLevel) {
+        MPM.addPass(SBFAdjustOptPass());
+      });
+}
+
+void SBFPassConfig::addIRPasses() {
+  addPass(createSBFCheckAndAdjustIR());
+  TargetPassConfig::addIRPasses();
+}
+
+TargetTransformInfo
+SBFTargetMachine::getTargetTransformInfo(const Function &F) {
+  return TargetTransformInfo(SBFTTIImpl(this, F));
+}
+
+// Install an instruction selector pass using
+// the ISelDag to gen SBF code.
+bool SBFPassConfig::addInstSelector() {
+  addPass(createSBFISelDag(getSBFTargetMachine()));
+
+  return false;
+}
+
+void SBFPassConfig::addMachineSSAOptimization() {
+  addPass(createSBFMISimplifyPatchablePass());
+
+  // The default implementation must be called first as we want eBPF
+  // Peephole ran at last.
+  TargetPassConfig::addMachineSSAOptimization();
+
+  const SBFSubtarget *Subtarget = getSBFTargetMachine().getSubtargetImpl();
+  if (!DisableMIPeephole) {
+    if (Subtarget->getHasAlu32())
+      addPass(createSBFMIPeepholePass());
+    addPass(createSBFMIPeepholeTruncElimPass());
+  }
+}
+
+void SBFPassConfig::addPreEmitPass() {
+  addPass(createSBFMIPreEmitCheckingPass());
+  if (getOptLevel() != CodeGenOpt::None)
+    if (!DisableMIPeephole)
+      addPass(createSBFMIPreEmitPeepholePass());
+}
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
new file mode 100644
index 0000000000000..fef53a882d583
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -0,0 +1,48 @@
+//===-- SBFTargetMachine.h - Define TargetMachine for SBF --- C++ ---===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file declares the SBF specific subclass of TargetMachine.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFTARGETMACHINE_H
+#define LLVM_LIB_TARGET_SBF_SBFTARGETMACHINE_H
+
+#include "SBFSubtarget.h"
+#include "llvm/Target/TargetMachine.h"
+
+namespace llvm {
+class SBFTargetMachine : public LLVMTargetMachine {
+  std::unique_ptr<TargetLoweringObjectFile> TLOF;
+  SBFSubtarget Subtarget;
+
+public:
+  SBFTargetMachine(const Target &T, const Triple &TT, StringRef CPU,
+                   StringRef FS, const TargetOptions &Options,
+                   Optional<Reloc::Model> RM, Optional<CodeModel::Model> CM,
+                   CodeGenOpt::Level OL, bool JIT);
+
+  const SBFSubtarget *getSubtargetImpl() const { return &Subtarget; }
+  const SBFSubtarget *getSubtargetImpl(const Function &) const override {
+    return &Subtarget;
+  }
+
+  TargetPassConfig *createPassConfig(PassManagerBase &PM) override;
+
+  TargetTransformInfo getTargetTransformInfo(const Function &F) override;
+
+  TargetLoweringObjectFile *getObjFileLowering() const override {
+    return TLOF.get();
+  }
+
+  void adjustPassManager(PassManagerBuilder &) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+};
+}
+
+#endif
diff --git a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
new file mode 100644
index 0000000000000..649d38d083631
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
@@ -0,0 +1,78 @@
+//===------ SBFTargetTransformInfo.h - SBF specific TTI ---------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file uses the target's specific information to
+// provide more precise answers to certain TTI queries, while letting the
+// target independent and default TTI implementations handle the rest.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_SBFTARGETTRANSFORMINFO_H
+#define LLVM_LIB_TARGET_SBF_SBFTARGETTRANSFORMINFO_H
+
+#include "SBFTargetMachine.h"
+#include "llvm/Analysis/TargetTransformInfo.h"
+#include "llvm/CodeGen/BasicTTIImpl.h"
+#include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
+
+namespace llvm {
+class SBFTTIImpl : public BasicTTIImplBase<SBFTTIImpl> {
+  typedef BasicTTIImplBase<SBFTTIImpl> BaseT;
+  typedef TargetTransformInfo TTI;
+  friend BaseT;
+
+  const SBFSubtarget *ST;
+  const SBFTargetLowering *TLI;
+
+  const SBFSubtarget *getST() const { return ST; }
+  const SBFTargetLowering *getTLI() const { return TLI; }
+
+public:
+  explicit SBFTTIImpl(const SBFTargetMachine *TM, const Function &F)
+      : BaseT(TM, F.getParent()->getDataLayout()), ST(TM->getSubtargetImpl(F)),
+        TLI(ST->getTargetLowering()) {}
+
+  int getIntImmCost(const APInt &Imm, Type *Ty, TTI::TargetCostKind CostKind) {
+    if (Imm.getBitWidth() <= 64 && isInt<32>(Imm.getSExtValue()))
+      return TTI::TCC_Free;
+
+    return TTI::TCC_Basic;
+  }
+
+  InstructionCost getCmpSelInstrCost(unsigned Opcode, Type *ValTy, Type *CondTy,
+                                     CmpInst::Predicate VecPred,
+                                     TTI::TargetCostKind CostKind,
+                                     const llvm::Instruction *I = nullptr) {
+    if (Opcode == Instruction::Select)
+      return SCEVCheapExpansionBudget.getValue();
+
+    return BaseT::getCmpSelInstrCost(Opcode, ValTy, CondTy, VecPred, CostKind,
+                                     I);
+  }
+
+  InstructionCost getArithmeticInstrCost(
+      unsigned Opcode, Type *Ty, TTI::TargetCostKind CostKind,
+      TTI::OperandValueKind Opd1Info = TTI::OK_AnyValue,
+      TTI::OperandValueKind Opd2Info = TTI::OK_AnyValue,
+      TTI::OperandValueProperties Opd1PropInfo = TTI::OP_None,
+      TTI::OperandValueProperties Opd2PropInfo = TTI::OP_None,
+    ArrayRef<const Value *> Args = ArrayRef<const Value *>(),
+    const Instruction *CxtI = nullptr) {
+      int ISD = TLI->InstructionOpcodeToISD(Opcode);
+      if (ISD == ISD::ADD && CostKind == TTI::TCK_RecipThroughput)
+        return SCEVCheapExpansionBudget.getValue() + 1;
+
+      return BaseT::getArithmeticInstrCost(Opcode, Ty, CostKind, Opd1Info,
+                                           Opd2Info, Opd1PropInfo,
+                                           Opd2PropInfo);
+  }
+};
+
+} // end namespace llvm
+
+#endif // LLVM_LIB_TARGET_SBF_SBFTARGETTRANSFORMINFO_H
diff --git a/llvm/lib/Target/SBF/TargetInfo/CMakeLists.txt b/llvm/lib/Target/SBF/TargetInfo/CMakeLists.txt
new file mode 100644
index 0000000000000..899f26fbd2f0a
--- /dev/null
+++ b/llvm/lib/Target/SBF/TargetInfo/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_llvm_component_library(LLVMSBFInfo
+  SBFTargetInfo.cpp
+
+  LINK_COMPONENTS
+  MC
+  Support
+
+  ADD_TO_COMPONENT
+  SBF
+  )
diff --git a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
new file mode 100644
index 0000000000000..0edc2cc2ae612
--- /dev/null
+++ b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
@@ -0,0 +1,22 @@
+//===-- SBFTargetInfo.cpp - SBF Target Implementation ---------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "TargetInfo/SBFTargetInfo.h"
+#include "llvm/MC/TargetRegistry.h"
+
+using namespace llvm;
+
+Target &llvm::getTheSBFXTarget() {
+  static Target TheSBFTarget;
+  return TheSBFTarget;
+}
+
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTargetInfo() {
+  RegisterTarget<Triple::sbf, /*HasJIT=*/true> XX(
+      getTheSBFXTarget(), "sbf", "SBF new (little endian)", "SBF");
+}
diff --git a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h
new file mode 100644
index 0000000000000..5c18b063b83d1
--- /dev/null
+++ b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h
@@ -0,0 +1,19 @@
+//===-- SBFTargetInfo.h - SBF Target Implementation -------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_TARGETINFO_SBFTARGETINFO_H
+#define LLVM_LIB_TARGET_SBF_TARGETINFO_SBFTARGETINFO_H
+
+namespace llvm {
+
+class Target;
+
+Target &getTheSBFXTarget();
+} // namespace llvm
+
+#endif // LLVM_LIB_TARGET_SBF_TARGETINFO_SBFTARGETINFO_H
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index e9e6f130f757c..ae8be17f64c8d 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -1927,6 +1927,7 @@ Triple Triple::getBigEndianArchVariant() const {
   case Triple::renderscript64:
   case Triple::riscv32:
   case Triple::riscv64:
+  case Triple::sbf:
   case Triple::shave:
   case Triple::spir64:
   case Triple::spir:
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
new file mode 100644
index 0000000000000..30eafd6cbf2aa
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
@@ -0,0 +1,299 @@
+; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+;
+; int mov(int a)
+; {
+;   return a;
+; }
+;
+; int mov_ri(void)
+; {
+;   return 0xff;
+; }
+;
+; int add(int a, int b)
+; {
+;   return a + b;
+; }
+;
+; int add_i(int a)
+; {
+;   return a + 0x7fffffff;
+; }
+;
+; int sub(int a, int b)
+; {
+;   return a - b;
+; }
+;
+; int sub_i(int a)
+; {
+;   return a - 0xffffffff;
+; }
+;
+; int mul(int a, int b)
+; {
+;   return a * b;
+; }
+;
+; int mul_i(int a)
+; {
+;   return a * 0xf;
+; }
+;
+; unsigned div(unsigned a, unsigned b)
+; {
+;   return a / b;
+; }
+;
+; unsigned div_i(unsigned a)
+; {
+;   return a / 0xf;
+; }
+;
+; int or(int a, int b)
+; {
+;   return a | b;
+; }
+;
+; int or_i(int a)
+; {
+;   return a | 0xff;
+; }
+;
+; int xor(int a, int b)
+; {
+;   return a ^ b;
+; }
+;
+; int xor_i(int a)
+; {
+;   return a ^ 0xfff;
+; }
+;
+; int and(int a, int b)
+; {
+;   return a & b;
+; }
+;
+; int and_i(int a)
+; {
+;   return a & 0xffff;
+; }
+;
+; int sll(int a, int b)
+; {
+;   return a << b;
+; }
+;
+; int sll_i(int a)
+; {
+;   return a << 17;
+; }
+;
+; unsigned srl(unsigned a, unsigned b)
+; {
+;   return a >> b;
+; }
+;
+; unsigned srl_i(unsigned a, unsigned b)
+; {
+;   return a >> 31;
+; }
+;
+; int sra(int a, int b)
+; {
+;   return a >> b;
+; }
+;
+; int sra_i(int a, int b)
+; {
+;   return a >> 7;
+; }
+;
+; int neg(int a)
+; {
+;   return -a;
+; }
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @mov(i32 returned %a) local_unnamed_addr #0 {
+entry:
+  ret i32 %a
+; CHECK: w{{[0-9]+}} = w{{[0-9]+}}
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @mov_ri() local_unnamed_addr #0 {
+entry:
+  ret i32 255
+; CHECK: w{{[0-9]+}} = 255
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @add(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %add = add nsw i32 %b, %a
+; CHECK: w{{[0-9]+}} += w{{[0-9]+}}
+  ret i32 %add
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @add_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %add = add nsw i32 %a, 2147483647
+; CHECK: w{{[0-9]+}} += 2147483647
+  ret i32 %add
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sub(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %sub = sub nsw i32 %a, %b
+; CHECK: w{{[0-9]+}} -= w{{[0-9]+}}
+  ret i32 %sub
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sub_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %sub = add i32 %a, 1
+; CHECK: w{{[0-9]+}} += 1
+  ret i32 %sub
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @mul(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %mul = mul nsw i32 %b, %a
+; CHECK: w{{[0-9]+}} *= w{{[0-9]+}}
+  ret i32 %mul
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @mul_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %mul = mul nsw i32 %a, 15
+; CHECK: w{{[0-9]+}} *= 15
+  ret i32 %mul
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @div(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %div = udiv i32 %a, %b
+; CHECK: w{{[0-9]+}} /= w{{[0-9]+}}
+  ret i32 %div
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @div_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %div = udiv i32 %a, 15
+; CHECK: w{{[0-9]+}} /= 15
+  ret i32 %div
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @or(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %or = or i32 %b, %a
+; CHECK: w{{[0-9]+}} |= w{{[0-9]+}}
+  ret i32 %or
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @or_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %or = or i32 %a, 255
+; CHECK: w{{[0-9]+}} |= 255
+  ret i32 %or
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @xor(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %xor = xor i32 %b, %a
+; CHECK: w{{[0-9]+}} ^= w{{[0-9]+}}
+  ret i32 %xor
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @xor_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %xor = xor i32 %a, 4095
+; CHECK: w{{[0-9]+}} ^= 4095
+  ret i32 %xor
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @and(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %and = and i32 %b, %a
+; CHECK: w{{[0-9]+}} &= w{{[0-9]+}}
+  ret i32 %and
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @and_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %and = and i32 %a, 65535
+; CHECK: w{{[0-9]+}} &= 65535
+  ret i32 %and
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sll(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %shl = shl i32 %a, %b
+; CHECK: w{{[0-9]+}} <<= w{{[0-9]+}}
+  ret i32 %shl
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sll_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %shl = shl i32 %a, 17
+; CHECK: w{{[0-9]+}} <<= 17
+  ret i32 %shl
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @srl(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %shr = lshr i32 %a, %b
+; CHECK: w{{[0-9]+}} >>= w{{[0-9]+}}
+  ret i32 %shr
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @srl_i(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %shr = lshr i32 %a, 31
+; CHECK: w{{[0-9]+}} >>= 31
+  ret i32 %shr
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sra(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %shr = ashr i32 %a, %b
+; CHECK: w{{[0-9]+}} s>>= w{{[0-9]+}}
+  ret i32 %shr
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sra_i(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %shr = ashr i32 %a, 7
+; CHECK: w{{[0-9]+}} s>>= 7
+  ret i32 %shr
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @neg(i32 %a) local_unnamed_addr #0 {
+entry:
+  %sub = sub nsw i32 0, %a
+; CHECK: w{{[0-9]+}} = -w{{[0-9]+}}
+  ret i32 %sub
+}
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
new file mode 100644
index 0000000000000..9076cda149a34
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
@@ -0,0 +1,117 @@
+; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+;
+; unsigned int select_cc_32 (unsigned a, unsigned b, int c, int d)
+; {
+;   if (a > b)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; long long select_cc_32_64 (unsigned a, unsigned b, long long c, long long d)
+; {
+;   if (a > b)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; int select_cc_64_32 (long long a, long long b, int c, int d)
+; {
+;   if (a > b)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; int selecti_cc_32 (unsigned a, int c, int d)
+; {
+;   if (a > 10)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; long long selecti_cc_32_64 (unsigned a, long long c, long long d)
+; {
+;   if (a > 11)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; int selecti_cc_64_32 (long long a, int c, int d)
+; {
+;   if (a > 12)
+;     return c;
+;   else
+;     return d;
+; }
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @select_cc_32(i32 %a, i32 %b, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+  %cmp = icmp ugt i32 %a, %b
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+  ret i32 %c.d
+}
+; CHECK-LABEL: select_cc_32
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @select_cc_32_64(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
+entry:
+  %cmp = icmp ugt i32 %a, %b
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+  ret i64 %c.d
+}
+; CHECK-LABEL: select_cc_32_64
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @select_cc_64_32(i64 %a, i64 %b, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+  %cmp = icmp sgt i64 %a, %b
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+  ret i32 %c.d
+}
+; CHECK-LABEL: select_cc_64_32
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @selecti_cc_32(i32 %a, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+  %cmp = icmp ugt i32 %a, 10
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+  ret i32 %c.d
+}
+; CHECK-LABEL: selecti_cc_32
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @selecti_cc_32_64(i32 %a, i64 %c, i64 %d) local_unnamed_addr #0 {
+entry:
+  %cmp = icmp ugt i32 %a, 11
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+  ret i64 %c.d
+}
+; CHECK-LABEL: selecti_cc_32_64
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @selecti_cc_64_32(i64 %a, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+  %cmp = icmp sgt i64 %a, 12
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+  ret i32 %c.d
+}
+; CHECK-LABEL: selecti_cc_64_32
+; CHECK-NOT: r{{[0-9]+}} <<= 32
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
new file mode 100644
index 0000000000000..63645383dd06f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
@@ -0,0 +1,107 @@
+; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+;
+; unsigned char loadu8(unsigned char *p)
+; {
+;   return *p;
+; }
+;
+; unsigned short loadu16(unsigned short *p)
+; {
+;   return *p;
+; }
+;
+; unsigned loadu32(unsigned *p)
+; {
+;   return *p;
+; }
+;
+; unsigned long long loadu64(unsigned long long *p)
+; {
+;   return *p;
+; }
+;
+; void storeu8(unsigned char *p, unsigned long long v)
+; {
+;   *p = (unsigned char)v;
+; }
+;
+; void storeu16(unsigned short *p, unsigned long long v)
+; {
+;   *p = (unsigned short)v;
+; }
+;
+; void storeu32(unsigned *p, unsigned long long v)
+; {
+;   *p = (unsigned)v;
+; }
+;
+; void storeu64(unsigned long long *p, unsigned long long v)
+; {
+;   *p = v;
+; }
+; Function Attrs: norecurse nounwind readonly
+define dso_local zeroext i8 @loadu8(i8* nocapture readonly %p) local_unnamed_addr #0 {
+entry:
+  %0 = load i8, i8* %p, align 1
+; CHECK: w{{[0-9]+}} = *(u8 *)(r{{[0-9]+}} + 0)
+  ret i8 %0
+}
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local zeroext i16 @loadu16(i16* nocapture readonly %p) local_unnamed_addr #0 {
+entry:
+  %0 = load i16, i16* %p, align 2
+; CHECK: w{{[0-9]+}} = *(u16 *)(r{{[0-9]+}} + 0)
+  ret i16 %0
+}
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @loadu32(i32* nocapture readonly %p) local_unnamed_addr #0 {
+entry:
+  %0 = load i32, i32* %p, align 4
+; CHECK: w{{[0-9]+}} = *(u32 *)(r{{[0-9]+}} + 0)
+  ret i32 %0
+}
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i64 @loadu64(i64* nocapture readonly %p) local_unnamed_addr #0 {
+entry:
+  %0 = load i64, i64* %p, align 8
+; CHECK: r{{[0-9]+}} = *(u64 *)(r{{[0-9]+}} + 0)
+  ret i64 %0
+}
+
+; Function Attrs: norecurse nounwind
+define dso_local void @storeu8(i8* nocapture %p, i64 %v) local_unnamed_addr #1 {
+entry:
+  %conv = trunc i64 %v to i8
+  store i8 %conv, i8* %p, align 1
+; CHECK: *(u8 *)(r{{[0-9]+}} + 0) = w{{[0-9]+}}
+  ret void
+}
+
+; Function Attrs: norecurse nounwind
+define dso_local void @storeu16(i16* nocapture %p, i64 %v) local_unnamed_addr #1 {
+entry:
+  %conv = trunc i64 %v to i16
+  store i16 %conv, i16* %p, align 2
+; CHECK: *(u16 *)(r{{[0-9]+}} + 0) = w{{[0-9]+}}
+  ret void
+}
+
+; Function Attrs: norecurse nounwind
+define dso_local void @storeu32(i32* nocapture %p, i64 %v) local_unnamed_addr #1 {
+entry:
+  %conv = trunc i64 %v to i32
+  store i32 %conv, i32* %p, align 4
+; CHECK: *(u32 *)(r{{[0-9]+}} + 0) = w{{[0-9]+}}
+  ret void
+}
+
+; Function Attrs: norecurse nounwind
+define dso_local void @storeu64(i64* nocapture %p, i64 %v) local_unnamed_addr #1 {
+entry:
+  store i64 %v, i64* %p, align 8
+; CHECK: *(u64 *)(r{{[0-9]+}} + 0) = r{{[0-9]+}}
+  ret void
+}
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll
new file mode 100644
index 0000000000000..26012d19f0db2
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll
@@ -0,0 +1,34 @@
+; RUN: llc -O2 -march=sbf -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+;
+; For the below test case, 'b' in 'ret == b' needs SLL/SLR.
+; 'ret' in 'ret == b' does not need SLL/SLR as all 'ret' values
+; are assigned through 'w<reg> = <value>' alu32 operations.
+;
+; extern int helper(int);
+; int test(int a, int b, int c, int d) {
+;   int ret;
+;   if (a < b)
+;     ret = (c < d) ? -1 : 0;
+;   else
+;     ret = (c < a) ? 1 : 2;
+;   return helper(ret == b);
+; }
+
+define dso_local i32 @test(i32 %a, i32 %b, i32 %c, i32 %d) local_unnamed_addr {
+entry:
+  %cmp = icmp slt i32 %a, %b
+  %cmp1 = icmp slt i32 %c, %d
+  %cond = sext i1 %cmp1 to i32
+  %cmp2 = icmp slt i32 %c, %a
+  %cond3 = select i1 %cmp2, i32 1, i32 2
+  %ret.0 = select i1 %cmp, i32 %cond, i32 %cond3
+  %cmp4 = icmp eq i32 %ret.0, %b
+  %conv = zext i1 %cmp4 to i32
+  %call = tail call i32 @helper(i32 %conv)
+  ret i32 %call
+}
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: if r{{[0-9]+}} == r{{[0-9]+}} goto
+
+declare dso_local i32 @helper(i32) local_unnamed_addr
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll
new file mode 100644
index 0000000000000..d8f301e70f247
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll
@@ -0,0 +1,34 @@
+; RUN: llc -O2 -march=sbf -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+;
+; For the below test case, both 'ret' and 'b' at 'ret == b'
+; need SLL/SLR. For 'ret', 'ret = a' may receive the value
+; from argument with high 32-bit invalid data.
+;
+; extern int helper(int);
+; int test(int a, int b, int c, int d) {
+;   int ret;
+;   if (a < b)
+;     ret = (c < d) ? a : 0;
+;   else
+;     ret = (c < a) ? 1 : 2;
+;   return helper(ret == b);
+; }
+
+define dso_local i32 @test(i32 %a, i32 %b, i32 %c, i32 %d) local_unnamed_addr {
+entry:
+  %cmp = icmp slt i32 %a, %b
+  %cmp1 = icmp slt i32 %c, %d
+  %cond = select i1 %cmp1, i32 %a, i32 0
+  %cmp2 = icmp slt i32 %c, %a
+  %cond3 = select i1 %cmp2, i32 1, i32 2
+  %ret.0 = select i1 %cmp, i32 %cond, i32 %cond3
+  %cmp4 = icmp eq i32 %ret.0, %b
+  %conv = zext i1 %cmp4 to i32
+  %call = tail call i32 @helper(i32 %conv)
+  ret i32 %call
+}
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK: if r{{[0-9]+}} == r{{[0-9]+}} goto
+
+declare dso_local i32 @helper(i32) local_unnamed_addr
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll
new file mode 100644
index 0000000000000..3c70c3940dcbc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll
@@ -0,0 +1,53 @@
+; RUN: llc -O2 -march=sbf -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+;
+; For the below example, two phi node in the loop may depend on
+; each other. So implementation must handle recursion properly.
+;
+; int test(unsigned long a, unsigned long b, unsigned long c) {
+;   int val = 0;
+;
+;   #pragma clang loop unroll(disable)
+;   for (long i = 0; i < 100; i++) {
+;     if (a > b)
+;       val = 1;
+;     a += b;
+;     if (b > c)
+;       val = 1;
+;     b += c;
+;   }
+;
+;   return val == 0 ? 1 : 0;
+; }
+
+
+define dso_local i32 @test(i64 %a, i64 %b, i64 %c) local_unnamed_addr {
+entry:
+  br label %for.body
+
+for.cond.cleanup:                                 ; preds = %for.body
+  %cmp6 = icmp eq i32 %val.2, 0
+  %cond = zext i1 %cmp6 to i32
+  ret i32 %cond
+
+for.body:                                         ; preds = %for.body, %entry
+  %i.018 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+  %val.017 = phi i32 [ 0, %entry ], [ %val.2, %for.body ]
+  %a.addr.016 = phi i64 [ %a, %entry ], [ %add, %for.body ]
+  %b.addr.015 = phi i64 [ %b, %entry ], [ %add5, %for.body ]
+  %cmp1 = icmp ugt i64 %a.addr.016, %b.addr.015
+  %add = add i64 %a.addr.016, %b.addr.015
+  %cmp2 = icmp ugt i64 %b.addr.015, %c
+  %0 = or i1 %cmp2, %cmp1
+  %val.2 = select i1 %0, i32 1, i32 %val.017
+  %add5 = add i64 %b.addr.015, %c
+  %inc = add nuw nsw i64 %i.018, 1
+  %exitcond = icmp eq i64 %inc, 100
+  br i1 %exitcond, label %for.cond.cleanup, label %for.body, !llvm.loop !2
+}
+; CHECK: [[VAL:r[0-9]+]] = w{{[0-9]+}}
+; CHECK-NOT: [[VAL:r[0-9]+]] <<= 32
+; CHECK-NOT: [[VAL]] >>= 32
+; CHECK: if [[VAL]] == 0 goto
+
+!2 = distinct !{!2, !3}
+!3 = !{!"llvm.loop.unroll.disable"}
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
new file mode 100644
index 0000000000000..b5c7764f9150a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
@@ -0,0 +1,126 @@
+; RUN: llc -O2 -march=sbf -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+;
+; long long select_u(unsigned a, unsigned b, long long c, long long d)
+; {
+;   if (a > b)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; long long select_u_2(unsigned a, unsigned long long b, long long c, long long d)
+; {
+;   if (a > b)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; long long select_s(signed a, signed b, long long c, long long d)
+; {
+;   if (a > b)
+;     return c;
+;   else
+;     return d;
+; }
+;
+; long long bar ();
+;
+; int foo (int b, int c)
+; {
+;   unsigned int i32_val = (unsigned int) bar();
+;
+;   if (i32_val < 10)
+;     return b;
+;   else
+;     return c;
+; }
+;
+; int *inc_p (int *p, unsigned a)
+; {
+;   return p + a;
+; }
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @select_u(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
+; CHECK-LABEL: select_u:
+entry:
+  %cmp = icmp ugt i32 %a, %b
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: if r{{[0-9]+}} {{<|>}} r{{[0-9]+}} goto
+  ret i64 %c.d
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @select_u_2(i32 %a, i64 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
+; CHECK-LABEL: select_u_2:
+entry:
+  %conv = zext i32 %a to i64
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+  %cmp = icmp ugt i64 %conv, %b
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+  ret i64 %c.d
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @select_s(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
+; CHECK-LABEL: select_s:
+entry:
+  %cmp = icmp sgt i32 %a, %b
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+; CHECK: r{{[0-9]+}} <<= 32
+; CHECK-NEXT: r{{[0-9]+}} s>>= 32
+; CHECK: if r{{[0-9]+}} s{{<|>}} r{{[0-9]+}} goto
+  ret i64 %c.d
+}
+
+; Function Attrs: nounwind
+define dso_local i32 @foo(i32 %b, i32 %c) local_unnamed_addr #0 {
+; CHECK-LABEL: foo:
+entry:
+  %call = tail call i64 bitcast (i64 (...)* @bar to i64 ()*)() #2
+  %conv = trunc i64 %call to i32
+  %cmp = icmp ult i32 %conv, 10
+; %call comes from function call returning i64 so the high bits will need
+; to be cleared.
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+  %b.c = select i1 %cmp, i32 %b, i32 %c
+; CHECK: if r{{[0-9]+}} {{<|>}} {{[0-9]+}} goto
+  ret i32 %b.c
+}
+
+declare dso_local i64 @bar(...) local_unnamed_addr #1
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32* @inc_p(i32* readnone %p, i32 %a) local_unnamed_addr #0 {
+; CHECK-LABEL: inc_p:
+entry:
+  %idx.ext = zext i32 %a to i64
+; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
+; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: r{{[0-9]+}} >>= 32
+  %add.ptr = getelementptr inbounds i32, i32* %p, i64 %idx.ext
+  ret i32* %add.ptr
+}
+
+define dso_local i32 @test() local_unnamed_addr {
+; CHECK-LABEL: test:
+entry:
+  %call = tail call i32 bitcast (i32 (...)* @helper to i32 ()*)()
+  %cmp = icmp sgt i32 %call, 6
+; The shifts can't be optimized out because %call comes from function call
+; return i32 so the high bits might be invalid.
+; CHECK: r{{[0-9]+}} <<= 32
+; CHECK-NEXT: r{{[0-9]+}} s>>= 32
+  %cond = zext i1 %cmp to i32
+; CHECK: if r{{[0-9]+}} s{{<|>}} {{[0-9]+}} goto
+  ret i32 %cond
+}
+declare dso_local i32 @helper(...) local_unnamed_addr
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-zext.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-zext.ll
new file mode 100644
index 0000000000000..d6f2f9896aba0
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-zext.ll
@@ -0,0 +1,21 @@
+; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+;
+; long zext(unsigned int a)
+; {
+;   long b = a;
+;   return b;
+; }
+
+; Function Attrs: norecurse nounwind
+define dso_local i64 @zext(i32 %a) local_unnamed_addr #0 {
+entry:
+  %conv = zext i32 %a to i64
+  ; CHECK-NOT: r[[#]] <<= 32
+  ; CHECK-NOT: r[[#]] >>= 32
+  ret i64 %conv
+}
+
+attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/TODO-NOTES b/llvm/test/CodeGen/SBF/TODO-NOTES
new file mode 100644
index 0000000000000..89536f32f2d72
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/TODO-NOTES
@@ -0,0 +1,12 @@
+Note that BTF has been disabled for SBF as of commit
+559ff25f978a675230cc2dbcc18851424ace7fb9.
+
+Moreover, we are tentatively going to completely remove BTF and related
+support from SBF.
+
+We have therefore removed the BTF/ and CORE/ test subdirectories which only
+apply when BTF is available.
+
+Once we determine for certain that BTF will definitely be removed, delete
+this TODO-NOTE. If for some reason BTF is deemed necessary, re-instate the
+test directories mentioned above.
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
new file mode 100644
index 0000000000000..de28abf192b97
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
@@ -0,0 +1,95 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK %s
+; RUN: opt -passes='default<O2>' -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK %s
+; RUN: opt -O2 -mtriple=sbf -sbf-disable-serialize-icmp %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-DISABLE %s
+; RUN: opt -passes='default<O2>' -mtriple=sbf -sbf-disable-serialize-icmp %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-DISABLE %s
+;
+; Source:
+;   int foo();
+;   int bar(int);
+;   int test() {
+;     int ret = foo();
+;     if (ret <= 0 || ret > 7)
+;       return 0;
+;     return bar(ret);
+;   }
+; Compilation flag:
+;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 {
+entry:
+  %retval = alloca i32, align 4
+  %ret = alloca i32, align 4
+  %cleanup.dest.slot = alloca i32, align 4
+  %0 = bitcast i32* %ret to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #3
+  %call = call i32 bitcast (i32 (...)* @foo to i32 ()*)()
+  store i32 %call, i32* %ret, align 4, !tbaa !2
+  %1 = load i32, i32* %ret, align 4, !tbaa !2
+  %cmp = icmp sle i32 %1, 0
+  br i1 %cmp, label %if.then, label %lor.lhs.false
+
+; CHECK:         [[REG1:r[0-9]+]] <<= 32
+; CHECK:         [[REG1]] s>>= 32
+; CHECK:         [[REG2:r[0-9]+]] = 1
+; CHECK:         if [[REG2]] s> [[REG1]] goto
+; CHECK:         if [[REG1]] s> 7 goto
+
+; CHECK-DISABLE: [[REG1:r[0-9]+]] += -8
+; CHECK-DISABLE: [[REG1]] <<= 32
+; CHECK-DISABLE: [[REG1]] >>= 32
+; CHECK-DISABLE: [[REG2:r[0-9]+]] = 4294967289
+; CHECK-DISABLE: if [[REG2]] > [[REG1]] goto
+
+lor.lhs.false:                                    ; preds = %entry
+  %2 = load i32, i32* %ret, align 4, !tbaa !2
+  %cmp1 = icmp sgt i32 %2, 7
+  br i1 %cmp1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %lor.lhs.false, %entry
+  store i32 0, i32* %retval, align 4
+  store i32 1, i32* %cleanup.dest.slot, align 4
+  br label %cleanup
+
+if.end:                                           ; preds = %lor.lhs.false
+  %3 = load i32, i32* %ret, align 4, !tbaa !2
+  %call2 = call i32 @bar(i32 %3)
+  store i32 %call2, i32* %retval, align 4
+  store i32 1, i32* %cleanup.dest.slot, align 4
+  br label %cleanup
+
+cleanup:                                          ; preds = %if.end, %if.then
+  %4 = bitcast i32* %ret to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %4) #3
+  %5 = load i32, i32* %retval, align 4
+  ret i32 %5
+}
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+declare dso_local i32 @foo(...) #2
+
+declare dso_local i32 @bar(i32) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"int", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
new file mode 100644
index 0000000000000..dd3b7eee10c91
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
@@ -0,0 +1,98 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK %s
+; RUN: opt -O2 -mtriple=sbf -sbf-disable-serialize-icmp %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-DISABLE %s
+;
+; Source:
+;   int foo();
+;   int bar(int);
+;   int test() {
+;     int ret = foo();
+;     if (ret <= 0)
+;       return 0;
+;     if (ret > 7)
+;       return 0;
+;     return bar(ret);
+;   }
+; Compilation flag:
+;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 {
+entry:
+  %retval = alloca i32, align 4
+  %ret = alloca i32, align 4
+  %cleanup.dest.slot = alloca i32, align 4
+  %0 = bitcast i32* %ret to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #3
+  %call = call i32 bitcast (i32 (...)* @foo to i32 ()*)()
+  store i32 %call, i32* %ret, align 4, !tbaa !2
+  %1 = load i32, i32* %ret, align 4, !tbaa !2
+  %cmp = icmp sle i32 %1, 0
+  br i1 %cmp, label %if.then, label %if.end
+
+; CHECK:         [[REG1:r[0-9]+]] <<= 32
+; CHECK:         [[REG1]] s>>= 32
+; CHECK:         [[REG2:r[0-9]+]] = 1
+; CHECK:         if [[REG2]] s> [[REG1]] goto
+; CHECK:         if [[REG1]] s> 7 goto
+
+; CHECK-DISABLE: [[REG1:r[0-9]+]] += -8
+; CHECK-DISABLE: [[REG1]] <<= 32
+; CHECK-DISABLE: [[REG1]] >>= 32
+; CHECK-DISABLE: [[REG2:r[0-9]+]] = 4294967289
+; CHECK-DISABLE: if [[REG2]] > [[REG1]] goto
+
+if.then:                                          ; preds = %entry
+  store i32 0, i32* %retval, align 4
+  store i32 1, i32* %cleanup.dest.slot, align 4
+  br label %cleanup
+
+if.end:                                           ; preds = %entry
+  %2 = load i32, i32* %ret, align 4, !tbaa !2
+  %cmp1 = icmp sgt i32 %2, 7
+  br i1 %cmp1, label %if.then2, label %if.end3
+
+if.then2:                                         ; preds = %if.end
+  store i32 0, i32* %retval, align 4
+  store i32 1, i32* %cleanup.dest.slot, align 4
+  br label %cleanup
+
+if.end3:                                          ; preds = %if.end
+  %3 = load i32, i32* %ret, align 4, !tbaa !2
+  %call4 = call i32 @bar(i32 %3)
+  store i32 %call4, i32* %retval, align 4
+  store i32 1, i32* %cleanup.dest.slot, align 4
+  br label %cleanup
+
+cleanup:                                          ; preds = %if.end3, %if.then2, %if.then
+  %4 = bitcast i32* %ret to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %4) #3
+  %5 = load i32, i32* %retval, align 4
+  ret i32 %5
+}
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+declare dso_local i32 @foo(...) #2
+
+declare dso_local i32 @bar(i32) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"int", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
new file mode 100644
index 0000000000000..f7eed6fea77d9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
@@ -0,0 +1,85 @@
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
+;
+; Source:
+;   int test1(unsigned long a) {
+;     if ((unsigned)a <= 3) return 2;
+;     return 3;
+;   }
+;   int test2(unsigned long a) {
+;     if ((unsigned)a < 4) return 2;
+;     return 3;
+;   }
+; Compilation flag:
+;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test1(i64 %a) #0 {
+entry:
+  %retval = alloca i32, align 4
+  %a.addr = alloca i64, align 8
+  store i64 %a, i64* %a.addr, align 8, !tbaa !3
+  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
+  %conv = trunc i64 %0 to i32
+  %cmp = icmp ule i32 %conv, 3
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  store i32 2, i32* %retval, align 4
+  br label %return
+
+if.end:                                           ; preds = %entry
+  store i32 3, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %if.end, %if.then
+  %1 = load i32, i32* %retval, align 4
+  ret i32 %1
+}
+
+; CHECK-LABEL: test1
+; CHECK-V1:    if r[[#]] > r[[#]] goto
+; CHECK-V3:    if w[[#]] < 4 goto
+
+; Function Attrs: nounwind
+define dso_local i32 @test2(i64 %a) #0 {
+entry:
+  %retval = alloca i32, align 4
+  %a.addr = alloca i64, align 8
+  store i64 %a, i64* %a.addr, align 8, !tbaa !3
+  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
+  %conv = trunc i64 %0 to i32
+  %cmp = icmp ult i32 %conv, 4
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  store i32 2, i32* %retval, align 4
+  br label %return
+
+if.end:                                           ; preds = %entry
+  store i32 3, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %if.end, %if.then
+  %1 = load i32, i32* %retval, align 4
+  ret i32 %1
+}
+
+; CHECK-LABEL: test2
+; CHECK-V1:    if r[[#]] > r[[#]] goto
+; CHECK-V3:    if w[[#]] < 4 goto
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git b7892f95881c891032742e0cd81861b845512653)"}
+!3 = !{!4, !4, i64 0}
+!4 = !{!"long", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
new file mode 100644
index 0000000000000..ac079f5dbe533
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
@@ -0,0 +1,85 @@
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
+;
+; Source:
+;   int test1(unsigned long a) {
+;     if ((unsigned)a > 3) return 2;
+;     return 3;
+;   }
+;   int test2(unsigned long a) {
+;     if ((unsigned)a >= 4) return 2;
+;     return 3;
+;   }
+; Compilation flag:
+;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test1(i64 %a) #0 {
+entry:
+  %retval = alloca i32, align 4
+  %a.addr = alloca i64, align 8
+  store i64 %a, i64* %a.addr, align 8, !tbaa !3
+  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
+  %conv = trunc i64 %0 to i32
+  %cmp = icmp ugt i32 %conv, 3
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  store i32 2, i32* %retval, align 4
+  br label %return
+
+if.end:                                           ; preds = %entry
+  store i32 3, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %if.end, %if.then
+  %1 = load i32, i32* %retval, align 4
+  ret i32 %1
+}
+
+; CHECK-LABEL: test1
+; CHECK-V1:    if r[[#]] > 3 goto
+; CHECK-V3:    if w[[#]] > 3 goto
+
+; Function Attrs: nounwind
+define dso_local i32 @test2(i64 %a) #0 {
+entry:
+  %retval = alloca i32, align 4
+  %a.addr = alloca i64, align 8
+  store i64 %a, i64* %a.addr, align 8, !tbaa !3
+  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
+  %conv = trunc i64 %0 to i32
+  %cmp = icmp uge i32 %conv, 4
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  store i32 2, i32* %retval, align 4
+  br label %return
+
+if.end:                                           ; preds = %entry
+  store i32 3, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %if.end, %if.then
+  %1 = load i32, i32* %retval, align 4
+  ret i32 %1
+}
+
+; CHECK-LABEL: test2
+; CHECK-V1:    if r[[#]] > 3 goto
+; CHECK-V3:    if w[[#]] > 3 goto
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 930ccf0191b4a33332d924522e5676fff583f083)"}
+!3 = !{!4, !4, i64 0}
+!4 = !{!"long", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll b/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
new file mode 100644
index 0000000000000..46a39411bedc2
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
@@ -0,0 +1,84 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK %s
+; RUN: opt -O2 -mtriple=sbf -sbf-disable-avoid-speculation %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK-DISABLE %s
+;
+; Source:
+;   unsigned long foo();
+;   void *test(void *p) {
+;     unsigned long ret = foo();
+;     if (ret <= 7)
+;       p += ret;
+;     return p;
+;   }
+; Compilation flag:
+;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i8* @test(i8* %p) #0 {
+entry:
+  %p.addr = alloca i8*, align 8
+  %ret = alloca i64, align 8
+  store i8* %p, i8** %p.addr, align 8, !tbaa !2
+  %0 = bitcast i64* %ret to i8*
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* %0) #3
+  %call = call i64 bitcast (i64 (...)* @foo to i64 ()*)()
+  store i64 %call, i64* %ret, align 8, !tbaa !6
+  %1 = load i64, i64* %ret, align 8, !tbaa !6
+  %cmp = icmp ule i64 %1, 7
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  %2 = load i64, i64* %ret, align 8, !tbaa !6
+  %3 = load i8*, i8** %p.addr, align 8, !tbaa !2
+  %add.ptr = getelementptr i8, i8* %3, i64 %2
+  store i8* %add.ptr, i8** %p.addr, align 8, !tbaa !2
+  br label %if.end
+
+if.end:                                           ; preds = %if.then, %entry
+  %4 = load i8*, i8** %p.addr, align 8, !tbaa !2
+  %5 = bitcast i64* %ret to i8*
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* %5) #3
+  ret i8* %4
+}
+; CHECK-COMMON:  [[REG6:r[0-9]+]] = r1
+; CHECK-COMMON:  call foo
+
+; CHECK:         if r0 > 7 goto [[LABEL:.*]]
+; CHECK:         [[REG6]] += r0
+; CHECK:         [[LABEL]]:
+; CHECK:         r0 = [[REG6]]
+
+; CHECK-DISABLE: [[REG1:r[0-9]+]] = 8
+; CHECK-DISABLE: if [[REG1]] > r0 goto [[LABEL:.*]]
+; CHECK-DISABLE: r0 = 0
+; CHECK-DISABLE: [[LABEL]]:
+; CHECK-DISABLE: [[REG6]] += r0
+; CHECK-DISABLE: r0 = [[REG6]]
+
+; CHECK-COMMON:  exit
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+declare dso_local i64 @foo(...) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"any pointer", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
+!6 = !{!7, !7, i64 0}
+!7 = !{!"long", !4, i64 0}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll b/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
new file mode 100644
index 0000000000000..8f663160dd7f9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
@@ -0,0 +1,93 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK %s
+; RUN: opt -O2 -mtriple=sbf -sbf-disable-avoid-speculation %s | llvm-dis > %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK-DISABLE %s
+;
+; Source:
+;   unsigned foo();
+;   void *test(void *p) {
+;     unsigned ret = foo();
+;     if (ret <= 7)
+;       p += ret;
+;     return p;
+;   }
+; Compilation flag:
+;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i8* @test(i8* %p) #0 {
+entry:
+  %p.addr = alloca i8*, align 8
+  %ret = alloca i32, align 4
+  store i8* %p, i8** %p.addr, align 8, !tbaa !2
+  %0 = bitcast i32* %ret to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #3
+  %call = call i32 bitcast (i32 (...)* @foo to i32 ()*)()
+  store i32 %call, i32* %ret, align 4, !tbaa !6
+  %1 = load i32, i32* %ret, align 4, !tbaa !6
+  %cmp = icmp ule i32 %1, 7
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  %2 = load i32, i32* %ret, align 4, !tbaa !6
+  %3 = load i8*, i8** %p.addr, align 8, !tbaa !2
+  %idx.ext = zext i32 %2 to i64
+  %add.ptr = getelementptr i8, i8* %3, i64 %idx.ext
+  store i8* %add.ptr, i8** %p.addr, align 8, !tbaa !2
+  br label %if.end
+
+if.end:                                           ; preds = %if.then, %entry
+  %4 = load i8*, i8** %p.addr, align 8, !tbaa !2
+  %5 = bitcast i32* %ret to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %5) #3
+  ret i8* %4
+}
+
+; CHECK-COMMON:  [[REG6:r[0-9]+]] = r1
+; CHECK-COMMON:  call foo
+
+; CHECK:         r0 <<= 32
+; CHECK:         r0 >>= 32
+; CHECK:         if r0 > 7 goto [[LABEL:.*]]
+; CHECK:         [[REG6]] += r0
+; CHECK:         [[LABEL]]:
+; CHECK:         r0 = [[REG6]]
+
+; CHECK-DISABLE: [[REG1:r[0-9]+]] = r0
+; CHECK-DISABLE: [[REG1]] <<= 32
+; CHECK-DISABLE: [[REG1]] >>= 32
+; CHECK-DISABLE: [[REG2:r[0-9]+]] = 8
+; CHECK-DISABLE: if [[REG2]] > [[REG1]] goto [[LABEL:.*]]
+; CHECK-DISABLE: r0 = 0
+; CHECK-DISABLE: [[LABEL]]:
+; CHECK-DISABLE: r0 <<= 32
+; CHECK-DISABLE: r0 >>= 32
+; CHECK-DISABLE: [[REG6]] += r0
+; CHECK-DISABLE: r0 = [[REG6]]
+
+; CHECK-COMMON:  exit
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+declare dso_local i32 @foo(...) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"any pointer", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
+!6 = !{!7, !7, i64 0}
+!7 = !{!"int", !4, i64 0}
diff --git a/llvm/test/CodeGen/SBF/alu8.ll b/llvm/test/CodeGen/SBF/alu8.ll
new file mode 100644
index 0000000000000..35e5f7e63dcb3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/alu8.ll
@@ -0,0 +1,45 @@
+; RUN: llc -march=sbf -show-mc-encoding < %s | FileCheck %s
+
+define i8 @mov(i8 %a, i8 %b) nounwind {
+; CHECK-LABEL: mov:
+; CHECK: r0 = r2 # encoding: [0xbf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: exit # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+  ret i8 %b
+}
+
+define i8 @add(i8 %a, i8 %b) nounwind {
+; CHECK-LABEL: add:
+; CHECK: r0 = r1 # encoding: [0xbf,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: r0 += r2 # encoding: [0x0f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %1 = add i8 %a, %b
+  ret i8 %1
+}
+
+define i8 @and(i8 %a, i8 %b) nounwind {
+; CHECK-LABEL: and:
+; CHECK: r0 &= r2 # encoding: [0x5f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %1 = and i8 %a, %b
+  ret i8 %1
+}
+
+define i8 @bis(i8 %a, i8 %b) nounwind {
+; CHECK-LABEL: bis:
+; CHECK: r0 |= r2 # encoding: [0x4f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %1 = or i8 %a, %b
+  ret i8 %1
+}
+
+define i8 @xorand(i8 %a, i8 %b) nounwind {
+; CHECK-LABEL: xorand:
+; CHECK: r2 ^= -1 # encoding: [0xa7,0x02,0x00,0x00,0xff,0xff,0xff,0xff]
+  %1 = xor i8 %b, -1
+  %2 = and i8 %a, %1
+  ret i8 %2
+}
+
+define i8 @xor(i8 %a, i8 %b) nounwind {
+; CHECK-LABEL: xor:
+; CHECK: r0 ^= r2 # encoding: [0xaf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %1 = xor i8 %a, %b
+  ret i8 %1
+}
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
new file mode 100644
index 0000000000000..8e448e4aba13a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -0,0 +1,276 @@
+; RUN: llc < %s -march=sbf -mcpu=v3 -verify-machineinstrs | tee -i /tmp/log | FileCheck %s
+;
+; CHECK-LABEL: test_load_add_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: w3 += w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_load_add_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw add i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_load_add_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: r3 += r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i32 @test_load_add_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw add i64* %p, i64 %v seq_cst
+  %conv = trunc i64 %0 to i32
+  ret i32 %conv
+}
+
+; CHECK-LABEL: test_load_sub_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: w3 -= w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_load_sub_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw sub i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_load_sub_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: r3 -= r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i32 @test_load_sub_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw sub i64* %p, i64 %v seq_cst
+  %conv = trunc i64 %0 to i32
+  ret i32 %conv
+}
+
+; CHECK-LABEL: test_xchg_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: *(u32 *)(r1 + 0) = w2
+define dso_local i32 @test_xchg_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw xchg i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_xchg_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: *(u64 *)(r1 + 0) = r2
+define dso_local i32 @test_xchg_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw xchg i64* %p, i64 %v seq_cst
+  %conv = trunc i64 %0 to i32
+  ret i32 %conv
+}
+
+; CHECK-LABEL: test_cas_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: if w0 == w2 goto
+; CHECK: w3 = w0
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
+entry:
+  %0 = cmpxchg i32* %p, i32 %old, i32 %new seq_cst seq_cst
+  %1 = extractvalue { i32, i1 } %0, 0
+  ret i32 %1
+}
+
+; CHECK-LABEL: test_cas_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: if r0 == r2 goto
+; CHECK: r3 = r0
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i64 @test_cas_64(i64* nocapture %p, i64 %old, i64 %new) local_unnamed_addr {
+entry:
+  %0 = cmpxchg i64* %p, i64 %old, i64 %new seq_cst seq_cst
+  %1 = extractvalue { i64, i1 } %0, 0
+  ret i64 %1
+}
+
+; CHECK-LABEL: test_load_and_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: w3 &= w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_load_and_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw and i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_load_and_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: r3 &= r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i64 @test_load_and_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw and i64* %p, i64 %v seq_cst
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_load_nand_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: w3 &= w2
+; CHECK: w3 ^= -1
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_load_nand_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw nand i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_load_nand_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: r3 &= r2
+; CHECK: r3 ^= -1
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i64 @test_load_nand_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw nand i64* %p, i64 %v seq_cst
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_load_or_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: w3 |= w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_load_or_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw or i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_load_or_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: r3 |= r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i64 @test_load_or_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw or i64* %p, i64 %v seq_cst
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_load_xor_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: w3 ^= w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_load_xor_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw xor i32* %p, i32 %v seq_cst
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_load_xor_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: r3 ^= r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local i64 @test_load_xor_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
+entry:
+  %0 = atomicrmw xor i64* %p, i64 %v seq_cst
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_min_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: if w0 s< w2 goto
+; CHECK: w3 = w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local i32 @test_min_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw min i32* %ptr, i32 %v release, align 1
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_min_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: if r0 s< r2 goto
+; CHECK: r3 = r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local  i64 @test_min_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw min i64* %ptr, i64 %v release, align 1
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_max_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: if w0 s> w2 goto
+; CHECK: w3 = w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local  i32 @test_max_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw max i32* %ptr, i32 %v release, align 1
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_max_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: if r0 s> r2 goto
+; CHECK: r3 = r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local  i64 @test_max_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw max i64* %ptr, i64 %v release, align 1
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_umin_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: if w0 < w2 goto
+; CHECK: w3 = w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local  i32 @test_umin_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw umin i32* %ptr, i32 %v release, align 1
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_umin_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: if r0 < r2 goto
+; CHECK: r3 = r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local  i64 @test_umin_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw umin i64* %ptr, i64 %v release, align 1
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_umax_32
+; CHECK: w0 = *(u32 *)(r1 + 0)
+; CHECK: w3 = w0
+; CHECK: if w0 > w2 goto
+; CHECK: w3 = w2
+; CHECK: *(u32 *)(r1 + 0) = w3
+define dso_local  i32 @test_umax_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw umax i32* %ptr, i32 %v release, align 1
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_umax_64
+; CHECK: r0 = *(u64 *)(r1 + 0)
+; CHECK: r3 = r0
+; CHECK: if r0 > r2 goto
+; CHECK: r3 = r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define dso_local  i64 @test_umax_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
+entry:
+  %0 = atomicrmw umax i64* %ptr, i64 %v release, align 1
+  ret i64 %0
+}
diff --git a/llvm/test/CodeGen/SBF/basictest.ll b/llvm/test/CodeGen/SBF/basictest.ll
new file mode 100644
index 0000000000000..5cc98bfaf65b8
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/basictest.ll
@@ -0,0 +1,28 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+define i32 @test0(i32 %X) {
+  %tmp.1 = add i32 %X, 1
+  ret i32 %tmp.1
+; CHECK-LABEL: test0:
+; CHECK: r0 += 1
+}
+
+; CHECK-LABEL: store_imm:
+; CHECK: *(u32 *)(r1 + 0) = r{{[03]}}
+; CHECK: *(u32 *)(r2 + 4) = r{{[03]}}
+define i32 @store_imm(i32* %a, i32* %b) {
+entry:
+  store i32 0, i32* %a, align 4
+  %0 = getelementptr inbounds i32, i32* %b, i32 1
+  store i32 0, i32* %0, align 4
+  ret i32 0
+}
+
+@G = external global i8
+define zeroext i8 @loadG() {
+  %tmp = load i8, i8* @G
+  ret i8 %tmp
+; CHECK-LABEL: loadG:
+; CHECK: r1 =
+; CHECK: r0 = *(u8 *)(r1 + 0)
+}
diff --git a/llvm/test/CodeGen/SBF/byval.ll b/llvm/test/CodeGen/SBF/byval.ll
new file mode 100644
index 0000000000000..ba24c7a99aa3a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/byval.ll
@@ -0,0 +1,31 @@
+; RUN: llc -O2 -march=sbf < %s | FileCheck %s
+
+%struct.S = type { [10 x i32] }
+
+; Function Attrs: nounwind uwtable
+define void @bar(i32 %a) #0 {
+; CHECK-LABEL: bar:
+; CHECK: r2 = 8589934593 ll
+; CHECK: *(u64 *)(r10 - 40) = r2
+; CHECK: r2 = r10
+; CHECK: r2 += -40
+; CHECK: call foo
+entry:
+  %.compoundliteral = alloca %struct.S, align 8
+  %arrayinit.begin = getelementptr inbounds %struct.S, %struct.S* %.compoundliteral, i64 0, i32 0, i64 0
+  store i32 1, i32* %arrayinit.begin, align 8
+  %arrayinit.element = getelementptr inbounds %struct.S, %struct.S* %.compoundliteral, i64 0, i32 0, i64 1
+  store i32 2, i32* %arrayinit.element, align 4
+  %arrayinit.element2 = getelementptr inbounds %struct.S, %struct.S* %.compoundliteral, i64 0, i32 0, i64 2
+  store i32 3, i32* %arrayinit.element2, align 8
+  %arrayinit.start = getelementptr inbounds %struct.S, %struct.S* %.compoundliteral, i64 0, i32 0, i64 3
+  %scevgep4 = bitcast i32* %arrayinit.start to i8*
+  call void @llvm.memset.p0i8.i64(i8* align 4 %scevgep4, i8 0, i64 28, i1 false)
+  call void @foo(i32 %a, %struct.S* byval(%struct.S) align 8 %.compoundliteral) #3
+  ret void
+}
+
+declare void @foo(i32, %struct.S* byval(%struct.S) align 8) #1
+
+; Function Attrs: nounwind
+declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i1) #3
diff --git a/llvm/test/CodeGen/SBF/callx.ll b/llvm/test/CodeGen/SBF/callx.ll
new file mode 100644
index 0000000000000..04ab27a09821a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/callx.ll
@@ -0,0 +1,20 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+; source:
+;   int test(int (*f)(void)) { return f(); }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32 ()* nocapture %f) local_unnamed_addr #0 {
+entry:
+  %call = tail call i32 %f() #1
+; CHECK: callx r{{[0-9]+}}
+  ret i32 %call
+}
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 7015a5c54b53d8d2297a3aa38bc32aab167bdcfc)"}
diff --git a/llvm/test/CodeGen/SBF/cc_args.ll b/llvm/test/CodeGen/SBF/cc_args.ll
new file mode 100644
index 0000000000000..5d4a26945b66c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/cc_args.ll
@@ -0,0 +1,93 @@
+; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck %s
+
+define void @test() #0 {
+entry:
+; CHECK: test:
+
+; CHECK: r1 = 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
+; CHECK: call f_i16
+  call void @f_i16(i16 123)
+
+; CHECK: r1 = 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
+; CHECK: call f_i32
+  call void @f_i32(i32 12345678)
+
+; CHECK: r1 = 72623859790382856 ll # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
+; CHECK: call f_i64
+  call void @f_i64(i64 72623859790382856)
+
+; CHECK: r1 = 1234
+; CHECK: r2 = 5678
+; CHECK: call f_i32_i32
+  call void @f_i32_i32(i32 1234, i32 5678)
+
+; CHECK: r1 = 2
+; CHECK: r2 = 3
+; CHECK: r3 = 4
+; CHECK: call f_i16_i32_i16
+  call void @f_i16_i32_i16(i16 2, i32 3, i16 4)
+
+; CHECK: r1 = 5
+; CHECK: r2 = 7262385979038285 ll
+; CHECK: r3 = 6
+; CHECK: call f_i16_i64_i16
+  call void @f_i16_i64_i16(i16 5, i64 7262385979038285, i16 6)
+
+  ret void
+}
+
+@g_i16 = common global i16 0, align 2
+@g_i32 = common global i32 0, align 2
+@g_i64 = common global i64 0, align 4
+
+define void @f_i16(i16 %a) #0 {
+; CHECK: f_i16:
+; CHECK: *(u16 *)(r2 + 0) = r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+  store volatile i16 %a, i16* @g_i16, align 2
+  ret void
+}
+
+define void @f_i32(i32 %a) #0 {
+; CHECK: f_i32:
+; CHECK: *(u32 *)(r2 + 0) = r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+  store volatile i32 %a, i32* @g_i32, align 2
+  ret void
+}
+
+define void @f_i64(i64 %a) #0 {
+; CHECK: f_i64:
+; CHECK: *(u64 *)(r2 + 0) = r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+  store volatile i64 %a, i64* @g_i64, align 2
+  ret void
+}
+
+define void @f_i32_i32(i32 %a, i32 %b) #0 {
+; CHECK: f_i32_i32:
+; CHECK: *(u32 *)(r3 + 0) = r1
+  store volatile i32 %a, i32* @g_i32, align 4
+; CHECK: *(u32 *)(r3 + 0) = r2
+  store volatile i32 %b, i32* @g_i32, align 4
+  ret void
+}
+
+define void @f_i16_i32_i16(i16 %a, i32 %b, i16 %c) #0 {
+; CHECK: f_i16_i32_i16:
+; CHECK: *(u16 *)(r4 + 0) = r1
+  store volatile i16 %a, i16* @g_i16, align 2
+; CHECK: *(u32 *)(r1 + 0) = r2
+  store volatile i32 %b, i32* @g_i32, align 4
+; CHECK: *(u16 *)(r4 + 0) = r3
+  store volatile i16 %c, i16* @g_i16, align 2
+  ret void
+}
+
+define void @f_i16_i64_i16(i16 %a, i64 %b, i16 %c) #0 {
+; CHECK: f_i16_i64_i16:
+; CHECK: *(u16 *)(r4 + 0) = r1
+  store volatile i16 %a, i16* @g_i16, align 2
+; CHECK: *(u64 *)(r1 + 0) = r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
+  store volatile i64 %b, i64* @g_i64, align 8
+; CHECK: *(u16 *)(r4 + 0) = r3
+  store volatile i16 %c, i16* @g_i16, align 2
+  ret void
+}
diff --git a/llvm/test/CodeGen/SBF/cc_ret.ll b/llvm/test/CodeGen/SBF/cc_ret.ll
new file mode 100644
index 0000000000000..8625e548b8ff8
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/cc_ret.ll
@@ -0,0 +1,48 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+define void @test() #0 {
+entry:
+; CHECK: test:
+
+; CHECK: call f_i16
+; CHECK: *(u16 *)(r1 + 0) = r0
+  %0 = call i16 @f_i16()
+  store volatile i16 %0, i16* @g_i16
+
+; CHECK: call f_i32
+; CHECK: *(u32 *)(r1 + 0) = r0
+  %1 = call i32 @f_i32()
+  store volatile i32 %1, i32* @g_i32
+
+; CHECK: call f_i64
+; CHECK: *(u64 *)(r1 + 0) = r0
+  %2 = call i64 @f_i64()
+  store volatile i64 %2, i64* @g_i64
+
+  ret void
+}
+
+@g_i16 = common global i16 0, align 2
+@g_i32 = common global i32 0, align 2
+@g_i64 = common global i64 0, align 2
+
+define i16 @f_i16() #0 {
+; CHECK: f_i16:
+; CHECK: r0 = 1
+; CHECK: exit
+  ret i16 1
+}
+
+define i32 @f_i32() #0 {
+; CHECK: f_i32:
+; CHECK: r0 = 16909060
+; CHECK: exit
+  ret i32 16909060
+}
+
+define i64 @f_i64() #0 {
+; CHECK: f_i64:
+; CHECK: r0 = 72623859790382856 ll
+; CHECK: exit
+  ret i64 72623859790382856
+}
diff --git a/llvm/test/CodeGen/SBF/cmp.ll b/llvm/test/CodeGen/SBF/cmp.ll
new file mode 100644
index 0000000000000..2f90b50bb2b11
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/cmp.ll
@@ -0,0 +1,119 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @foo_cmp1(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp sgt i8 %a, %b
+  br i1 %1, label %2, label %4
+
+; <label>:2                                       ; preds = %0
+  %3 = mul i8 %b, %a
+  br label %6
+
+; <label>:4                                       ; preds = %0
+  %5 = shl i8 %b, 3
+  br label %6
+
+; <label>:6                                       ; preds = %4, %2
+  %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
+  ret i8 %.0
+; CHECK-LABEL:foo_cmp1:
+; CHECK: if r0 s>= r1
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @foo_cmp2(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp slt i8 %a, %b
+  br i1 %1, label %4, label %2
+
+; <label>:2                                       ; preds = %0
+  %3 = mul i8 %b, %a
+  br label %6
+
+; <label>:4                                       ; preds = %0
+  %5 = shl i8 %b, 3
+  br label %6
+
+; <label>:6                                       ; preds = %4, %2
+  %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
+  ret i8 %.0
+; CHECK-LABEL:foo_cmp2:
+; CHECK: if r0 s> r1
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @foo_cmp3(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp slt i8 %a, %b
+  br i1 %1, label %2, label %4
+
+; <label>:2                                       ; preds = %0
+  %3 = mul i8 %b, %a
+  br label %6
+
+; <label>:4                                       ; preds = %0
+  %5 = shl i8 %b, 3
+  br label %6
+
+; <label>:6                                       ; preds = %4, %2
+  %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
+  ret i8 %.0
+; CHECK-LABEL:foo_cmp3:
+; CHECK: if r1 s>= r0
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @foo_cmp4(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp sgt i8 %a, %b
+  br i1 %1, label %4, label %2
+
+; <label>:2                                       ; preds = %0
+  %3 = mul i8 %b, %a
+  br label %6
+
+; <label>:4                                       ; preds = %0
+  %5 = shl i8 %b, 3
+  br label %6
+
+; <label>:6                                       ; preds = %4, %2
+  %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
+  ret i8 %.0
+; CHECK-LABEL:foo_cmp4:
+; CHECK: if r1 s> r0
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @min(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp slt i8 %a, %b
+  %a.b = select i1 %1, i8 %a, i8 %b
+  ret i8 %a.b
+; CHECK-LABEL:min:
+; CHECK: r0 = r1
+; CHECK: if r2 s> r0
+; CHECK: r0 = r2
+}
+
+; Function Attrs: nounwind readnone uwtable
+define zeroext i8 @minu(i8 zeroext %a, i8 zeroext %b) #0 {
+  %1 = icmp ult i8 %a, 100
+  %a.b = select i1 %1, i8 %a, i8 %b
+  ret i8 %a.b
+; CHECK-LABEL:minu:
+; CHECK: if r{{[0-9]+}} {{<|>}} r{{[0-9]+}}
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @max(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp sgt i8 %a, %b
+  %a.b = select i1 %1, i8 %a, i8 %b
+  ret i8 %a.b
+; CHECK-LABEL:max:
+; CHECK: if r0 s> r2
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @meq(i8 signext %a, i8 signext %b, i8 signext %c) #0 {
+  %1 = icmp eq i8 %a, %b
+  %c.a = select i1 %1, i8 %c, i8 %a
+  ret i8 %c.a
+; CHECK-LABEL:meq:
+; CHECK: if r1 == r2
+}
diff --git a/llvm/test/CodeGen/SBF/dwarfdump.ll b/llvm/test/CodeGen/SBF/dwarfdump.ll
new file mode 100644
index 0000000000000..7b7031139c107
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/dwarfdump.ll
@@ -0,0 +1,66 @@
+; RUN: llc -O2 -march=sbf %s -o %t -filetype=obj
+; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
+; RUN: llc -O2 -march=sbf %s -o %t -filetype=obj
+; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
+
+source_filename = "testprog.c"
+target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+target triple = "sbf"
+
+@testprog.myvar_c = internal unnamed_addr global i32 0, align 4, !dbg !0
+
+; Function Attrs: nounwind
+define i32 @testprog(i32, i32) local_unnamed_addr #0 !dbg !2 {
+  tail call void @llvm.dbg.value(metadata i32 %0, i64 0, metadata !11, metadata !16), !dbg !17
+  tail call void @llvm.dbg.value(metadata i32 %1, i64 0, metadata !12, metadata !16), !dbg !18
+  %3 = load i32, i32* @testprog.myvar_c, align 4, !dbg !19, !tbaa !20
+  %4 = add i32 %1, %0, !dbg !24
+  %5 = add i32 %4, %3, !dbg !25
+  store i32 %5, i32* @testprog.myvar_c, align 4, !dbg !26, !tbaa !20
+  ret i32 %5, !dbg !27
+}
+
+; Function Attrs: nounwind readnone
+declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!13, !14}
+!llvm.ident = !{!15}
+
+!0 = distinct !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = !DIGlobalVariable(name: "myvar_c", scope: !2, file: !3, line: 3, type: !6, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "testprog", scope: !3, file: !3, line: 1, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: true, unit: !7, retainedNodes: !10)
+!3 = !DIFile(filename: "testprog.c", directory: "/w/llvm/bld")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6, !6, !6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 4.0.0 (trunk 287518) (llvm/trunk 287520)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9)
+!8 = !{}
+!9 = !{!0}
+!10 = !{!11, !12}
+!11 = !DILocalVariable(name: "myvar_a", arg: 1, scope: !2, file: !3, line: 1, type: !6)
+!12 = !DILocalVariable(name: "myvar_b", arg: 2, scope: !2, file: !3, line: 1, type: !6)
+!13 = !{i32 2, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{!"clang version 4.0.0 (trunk 287518) (llvm/trunk 287520)"}
+!16 = !DIExpression()
+!17 = !DILocation(line: 1, column: 18, scope: !2)
+!18 = !DILocation(line: 1, column: 31, scope: !2)
+!19 = !DILocation(line: 5, column: 19, scope: !2)
+!20 = !{!21, !21, i64 0}
+!21 = !{!"int", !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 5, column: 27, scope: !2)
+!25 = !DILocation(line: 7, column: 27, scope: !2)
+!26 = !DILocation(line: 7, column: 17, scope: !2)
+!27 = !DILocation(line: 9, column: 9, scope: !2)
+
+; CHECK: file_names[  1]:
+; CHECK-NEXT: name: "testprog.c"
+; CHECK-NEXT: dir_index: 0
+; CHECK: 0x0000000000000000      2
+; CHECK: 0x0000000000000028      7
diff --git a/llvm/test/CodeGen/SBF/elf-symbol-information.ll b/llvm/test/CodeGen/SBF/elf-symbol-information.ll
new file mode 100644
index 0000000000000..6057b193a322f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/elf-symbol-information.ll
@@ -0,0 +1,8 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-readelf --symbols - | FileCheck %s
+
+; CHECK: 0 FILE    LOCAL  DEFAULT  ABS elf-symbol-information.ll
+; CHECK: 8 FUNC    GLOBAL DEFAULT    2 test_func
+define void @test_func() {
+entry:
+  ret void
+}
diff --git a/llvm/test/CodeGen/SBF/ex1.ll b/llvm/test/CodeGen/SBF/ex1.ll
new file mode 100644
index 0000000000000..0a0f5f2e6d4f2
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/ex1.ll
@@ -0,0 +1,46 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+%struct.bpf_context = type { i64, i64, i64, i64, i64, i64, i64 }
+%struct.sk_buff = type { i64, i64, i64, i64, i64, i64, i64 }
+%struct.net_device = type { i64, i64, i64, i64, i64, i64, i64 }
+
+@bpf_prog1.devname = private unnamed_addr constant [3 x i8] c"lo\00", align 1
+@bpf_prog1.fmt = private unnamed_addr constant [15 x i8] c"skb %x dev %x\0A\00", align 1
+
+; Function Attrs: nounwind uwtable
+define i32 @bpf_prog1(%struct.bpf_context* nocapture %ctx) #0 section "events/net/netif_receive_skb" {
+  %devname = alloca [3 x i8], align 1
+  %fmt = alloca [15 x i8], align 1
+  %1 = getelementptr inbounds [3 x i8], [3 x i8]* %devname, i64 0, i64 0
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @bpf_prog1.devname, i64 0, i64 0), i64 3, i1 false)
+  %2 = getelementptr inbounds %struct.bpf_context, %struct.bpf_context* %ctx, i64 0, i32 0
+  %3 = load i64, i64* %2, align 8
+  %4 = inttoptr i64 %3 to %struct.sk_buff*
+  %5 = getelementptr inbounds %struct.sk_buff, %struct.sk_buff* %4, i64 0, i32 2
+  %6 = bitcast i64* %5 to i8*
+  %7 = call i8* inttoptr (i64 4 to i8* (i8*)*)(i8* %6) #1
+  %8 = call i32 inttoptr (i64 9 to i32 (i8*, i8*, i32)*)(i8* %7, i8* %1, i32 2) #1
+  %9 = icmp eq i32 %8, 0
+  br i1 %9, label %10, label %13
+
+; <label>:10                                      ; preds = %0
+  %11 = getelementptr inbounds [15 x i8], [15 x i8]* %fmt, i64 0, i64 0
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %11, i8* getelementptr inbounds ([15 x i8], [15 x i8]* @bpf_prog1.fmt, i64 0, i64 0), i64 15, i1 false)
+  %12 = call i32 (i8*, i32, ...) inttoptr (i64 11 to i32 (i8*, i32, ...)*)(i8* %11, i32 15, %struct.sk_buff* %4, i8* %7) #1
+; CHECK-LABEL: bpf_prog1:
+; CHECK: call 4
+; CHECK: call 9
+; CHECK: if r0 != 0
+; CHECK: r1 = 2946850620859748 ll
+; CHECK: r1 = 7214898703899978611 ll
+; CHECK: call 11
+; CHECK: r0 = 0
+; CHECK: exit
+  br label %13
+
+; <label>:13                                      ; preds = %10, %0
+  ret i32 0
+}
+
+; Function Attrs: nounwind
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1) #1
diff --git a/llvm/test/CodeGen/SBF/fi_ri.ll b/llvm/test/CodeGen/SBF/fi_ri.ll
new file mode 100644
index 0000000000000..cb16d3c7448ed
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/fi_ri.ll
@@ -0,0 +1,25 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+%struct.key_t = type { i32, [16 x i8] }
+
+; Function Attrs: nounwind uwtable
+define i32 @test() #0 {
+  %key = alloca %struct.key_t, align 4
+  %1 = bitcast %struct.key_t* %key to i8*
+; CHECK: r1 = 0
+; CHECK: *(u32 *)(r10 - 8) = r1
+; CHECK: *(u64 *)(r10 - 16) = r1
+; CHECK: *(u64 *)(r10 - 24) = r1
+  call void @llvm.memset.p0i8.i64(i8* align 4 %1, i8 0, i64 20, i1 false)
+; CHECK: r1 = r10
+; CHECK: r1 += -20
+  %2 = getelementptr inbounds %struct.key_t, %struct.key_t* %key, i64 0, i32 1, i64 0
+; CHECK: call test1
+  call void @test1(i8* %2) #3
+  ret i32 0
+}
+
+; Function Attrs: nounwind argmemonly
+declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i1) #1
+
+declare void @test1(i8*) #2
diff --git a/llvm/test/CodeGen/SBF/i128.ll b/llvm/test/CodeGen/SBF/i128.ll
new file mode 100644
index 0000000000000..373b89ef62e3d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/i128.ll
@@ -0,0 +1,68 @@
+; RUN: llc -march=sbf -o - %s | FileCheck %s
+; Source code:
+;   struct ipv6_key_t {
+;     unsigned pid;
+;     unsigned __int128 saddr;
+;     unsigned short lport;
+;   };
+;
+;   extern void test1(void *);
+;   int test(int pid) {
+;     struct ipv6_key_t ipv6_key = {.pid = pid};
+;     test1(&ipv6_key);
+;     return 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c
+
+%struct.ipv6_key_t = type { i32, i128, i16 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32 %pid) local_unnamed_addr #0 {
+entry:
+  %ipv6_key = alloca %struct.ipv6_key_t, align 16
+  %0 = bitcast %struct.ipv6_key_t* %ipv6_key to i8*
+  call void @llvm.lifetime.start.p0i8(i64 48, i8* nonnull %0) #4
+  call void @llvm.memset.p0i8.i64(i8* nonnull align 16 dereferenceable(48) %0, i8 0, i64 48, i1 false)
+  %pid1 = getelementptr inbounds %struct.ipv6_key_t, %struct.ipv6_key_t* %ipv6_key, i64 0, i32 0
+  store i32 %pid, i32* %pid1, align 16, !tbaa !2
+  call void @test1(i8* nonnull %0) #4
+  call void @llvm.lifetime.end.p0i8(i64 48, i8* nonnull %0) #4
+  ret i32 0
+}
+
+; CHECK-LABEL: test
+; CHECK:       r7 = r10
+; CHECK:       r7 += -32 
+; CHECK:       r1 = r7
+; CHECK:       *(u32 *)(r10 - 32) = r{{[0-9]+}}
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: argmemonly nounwind willreturn writeonly
+declare void @llvm.memset.p0i8.i64(i8* nocapture writeonly, i8, i64, i1 immarg) #2
+
+declare dso_local void @test1(i8*) local_unnamed_addr #3
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { argmemonly nounwind willreturn writeonly }
+attributes #3 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #4 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 55fc7a47f8f18f84b44ff16f4e7a420c0a42ddf1)"}
+!2 = !{!3, !4, i64 0}
+!3 = !{!"ipv6_key_t", !4, i64 0, !7, i64 16, !8, i64 32}
+!4 = !{!"int", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
+!7 = !{!"__int128", !5, i64 0}
+!8 = !{!"short", !5, i64 0}
diff --git a/llvm/test/CodeGen/SBF/inline_asm.ll b/llvm/test/CodeGen/SBF/inline_asm.ll
new file mode 100644
index 0000000000000..3e7dcd39a9dce
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/inline_asm.ll
@@ -0,0 +1,53 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; int g[2];
+;
+; int test(void *ctx) {
+;   int a = 4, b;
+;   unsigned long long c = 333333333333ULL;
+;   asm volatile("r0 = *(u16 *)skb[%0]" : : "i"(2));
+;   asm volatile("r0 = *(u16 *)skb[%0]" : : "r"(a));
+;   asm volatile("%0 = %1" : "=r"(b) : "i"(4));
+;   asm volatile("%0 = %1 ll" : "=r"(b) : "i"(c));
+;   asm volatile("%0 = *(u16 *) %1" : "=r"(b) : "m"(a));
+;   asm volatile("%0 = *(u32 *) %1" : "=r"(b) : "m"(g[1]));
+;   return b;
+; }
+;
+
+@g = common global [2 x i32] zeroinitializer, align 4
+
+; Function Attrs: nounwind
+define i32 @test(i8* nocapture readnone %ctx) local_unnamed_addr #0 {
+entry:
+  %a = alloca i32, align 4
+  %0 = bitcast i32* %a to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %0) #2
+  store i32 4, i32* %a, align 4
+  tail call void asm sideeffect "r0 = *(u16 *)skb[$0]", "i"(i32 2) #2
+; CHECK: r0 = *(u16 *)skb[2]
+  tail call void asm sideeffect "r0 = *(u16 *)skb[$0]", "r"(i32 4) #2
+; CHECK: r0 = *(u16 *)skb[r1]
+  %1 = tail call i32 asm sideeffect "$0 = $1", "=r,i"(i32 4) #2
+; CHECK: r1 = 4
+  %2 = tail call i32 asm sideeffect "$0 = $1 ll", "=r,i"(i64 333333333333) #2
+; CHECK: r1 = 333333333333 ll
+  %3 = call i32 asm sideeffect "$0 = *(u16 *) $1", "=r,*m"(i32* elementtype(i32) nonnull %a) #2
+; CHECK: r1 = *(u16 *) (r10 - 4)
+  %4 = call i32 asm sideeffect "$0 = *(u32 *) $1", "=r,*m"(i32* elementtype(i32) getelementptr inbounds ([2 x i32], [2 x i32]* @g, i64 0, i64 1)) #2
+; CHECK: r1 = g ll
+; CHECK: r0 = *(u32 *) (r1 + 4)
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %0) #2
+  ret i32 %4
+}
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #1
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind }
diff --git a/llvm/test/CodeGen/SBF/inlineasm-output-template.ll b/llvm/test/CodeGen/SBF/inlineasm-output-template.ll
new file mode 100644
index 0000000000000..505e04659e1a2
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/inlineasm-output-template.ll
@@ -0,0 +1,26 @@
+; RUN: llc -mtriple=sbf < %s | FileCheck %s
+
+; Test that %c works with immediates
+; CHECK-LABEL: test_inlineasm_c_output_template0
+; CHECK: #TEST 42
+define dso_local i32 @test_inlineasm_c_output_template0() {
+  tail call void asm sideeffect "#TEST ${0:c}", "i"(i32 42)
+  ret i32 42
+}
+
+; Test that %c works with global address
+; CHECK-LABEL: test_inlineasm_c_output_template1
+; CHECK: #TEST baz
+@baz = internal global i32 0, align 4
+define dso_local i32 @test_inlineasm_c_output_template1() {
+  tail call void asm sideeffect "#TEST ${0:c}", "i"(i32* nonnull @baz)
+  ret i32 42
+}
+
+; Test that %n works with immediates
+; CHECK-LABEL: test_inlineasm_c_output_template2
+; CHECK: #TEST -42
+define dso_local i32 @test_inlineasm_c_output_template2() {
+  tail call void asm sideeffect "#TEST ${0:n}", "i"(i32 42)
+  ret i32 42
+}
diff --git a/llvm/test/CodeGen/SBF/inlineasm-wreg.ll b/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
new file mode 100644
index 0000000000000..160fbdc16a653
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
@@ -0,0 +1,17 @@
+; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+
+; Test that %w works as input constraint
+; CHECK-LABEL: test_inlineasm_w_input_constraint
+define dso_local i32 @test_inlineasm_w_input_constraint() {
+  tail call void asm sideeffect "w0 = $0", "w"(i32 42)
+; CHECK: w0 = w1
+  ret i32 42
+}
+
+; Test that %w works as output constraint
+; CHECK-LABEL: test_inlineasm_w_output_constraint
+define dso_local i32 @test_inlineasm_w_output_constraint() {
+  %1 = tail call i32 asm sideeffect "$0 = $1", "=w,i"(i32 42)
+; CHECK: w0 = 42
+  ret i32 %1
+}
diff --git a/llvm/test/CodeGen/SBF/intrinsics.ll b/llvm/test/CodeGen/SBF/intrinsics.ll
new file mode 100644
index 0000000000000..b9cd138c5eff0
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/intrinsics.ll
@@ -0,0 +1,100 @@
+; RUN: not --crash llc -march=sbf <%s 2>&1 | FileCheck --check-prefix=CHECK-SBF %s
+
+; CHECK-SBF: LLVM ERROR: llvm.bpf.load.* intrinsics are not supported in SBF
+
+; Function Attrs: nounwind uwtable
+define i32 @ld_b(i64 %foo, i64* nocapture %bar, i8* %ctx, i8* %ctx2) #0 {
+  %1 = tail call i64 @llvm.bpf.load.byte(i8* %ctx, i64 123) #2
+  %2 = add i64 %1, %foo
+  %3 = load volatile i64, i64* %bar, align 8
+  %4 = add i64 %2, %3
+  %5 = tail call i64 @llvm.bpf.load.byte(i8* %ctx2, i64 %foo) #2
+  %6 = add i64 %4, %5
+  %7 = load volatile i64, i64* %bar, align 8
+  %8 = add i64 %6, %7
+  %9 = trunc i64 %8 to i32
+  ret i32 %9
+; CHECK-LABEL: ld_b:
+; CHECK-EL: r0 = *(u8 *)skb[123]
+; CHECK-EL: r0 = *(u8 *)skb[r
+; CHECK-EB: r0 = *(u8 *)skb[123]
+; CHECK-EB: r0 = *(u8 *)skb[r
+}
+
+declare i64 @llvm.bpf.load.byte(i8*, i64) #1
+
+; Function Attrs: nounwind uwtable
+define i32 @ld_h(i8* %ctx, i8* %ctx2, i32 %foo) #0 {
+  %1 = tail call i64 @llvm.bpf.load.half(i8* %ctx, i64 123) #2
+  %2 = sext i32 %foo to i64
+  %3 = tail call i64 @llvm.bpf.load.half(i8* %ctx2, i64 %2) #2
+  %4 = add i64 %3, %1
+  %5 = trunc i64 %4 to i32
+  ret i32 %5
+; CHECK-LABEL: ld_h:
+; CHECK-EL: r0 = *(u16 *)skb[r
+; CHECK-EL: r0 = *(u16 *)skb[123]
+; CHECK-EB: r0 = *(u16 *)skb[r
+; CHECK-EB: r0 = *(u16 *)skb[123]
+}
+
+declare i64 @llvm.bpf.load.half(i8*, i64) #1
+
+; Function Attrs: nounwind uwtable
+define i32 @ld_w(i8* %ctx, i8* %ctx2, i32 %foo) #0 {
+  %1 = tail call i64 @llvm.bpf.load.word(i8* %ctx, i64 123) #2
+  %2 = sext i32 %foo to i64
+  %3 = tail call i64 @llvm.bpf.load.word(i8* %ctx2, i64 %2) #2
+  %4 = add i64 %3, %1
+  %5 = trunc i64 %4 to i32
+  ret i32 %5
+; CHECK-LABEL: ld_w:
+; CHECK-EL: r0 = *(u32 *)skb[r
+; CHECK-EL: r0 = *(u32 *)skb[123]
+; CHECK-EB: r0 = *(u32 *)skb[r
+; CHECK-EB: r0 = *(u32 *)skb[123]
+}
+
+declare i64 @llvm.bpf.load.word(i8*, i64) #1
+
+define i32 @ld_pseudo() #0 {
+entry:
+  %call = tail call i64 @llvm.bpf.pseudo(i64 2, i64 3)
+  tail call void inttoptr (i64 4 to void (i64, i32)*)(i64 %call, i32 4) #2
+  ret i32 0
+; CHECK-LABEL: ld_pseudo:
+; CHECK-EL: ld_pseudo r1, 2, 3 # encoding: [0x18,0x21,0x00,0x00,0x03,0x00,0x00,0x00
+; CHECK-EB: ld_pseudo r1, 2, 3 # encoding: [0x18,0x12,0x00,0x00,0x00,0x00,0x00,0x03
+}
+
+declare i64 @llvm.bpf.pseudo(i64, i64) #2
+
+define i32 @bswap(i64 %a, i64 %b, i64 %c) #0 {
+entry:
+  %0 = tail call i64 @llvm.bswap.i64(i64 %a)
+  %conv = trunc i64 %b to i32
+  %1 = tail call i32 @llvm.bswap.i32(i32 %conv)
+  %conv1 = zext i32 %1 to i64
+  %add = add i64 %conv1, %0
+  %conv2 = trunc i64 %c to i16
+  %2 = tail call i16 @llvm.bswap.i16(i16 %conv2)
+  %conv3 = zext i16 %2 to i64
+  %add4 = add i64 %add, %conv3
+  %conv5 = trunc i64 %add4 to i32
+  ret i32 %conv5
+; CHECK-LABEL: bswap:
+; CHECK-EL: r1 = be64 r1     # encoding: [0xdc,0x01,0x00,0x00,0x40,0x00,0x00,0x00]
+; CHECK-EL: r0 = be32 r0     # encoding: [0xdc,0x00,0x00,0x00,0x20,0x00,0x00,0x00]
+; CHECK-EL: r0 += r1 # encoding: [0x0f,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-EL: r3 = be16 r3     # encoding: [0xdc,0x03,0x00,0x00,0x10,0x00,0x00,0x00]
+; CHECK-EL: r0 += r3 # encoding: [0x0f,0x30,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-EB: r1 = le64 r1     # encoding: [0xd4,0x10,0x00,0x00,0x00,0x00,0x00,0x40]
+; CHECK-EB: r0 = le32 r0     # encoding: [0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x20]
+; CHECK-EB: r0 += r1 # encoding: [0x0f,0x01,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-EB: r3 = le16 r3     # encoding: [0xd4,0x30,0x00,0x00,0x00,0x00,0x00,0x10]
+; CHECK-EB: r0 += r3 # encoding: [0x0f,0x03,0x00,0x00,0x00,0x00,0x00,0x00]
+}
+
+declare i64 @llvm.bswap.i64(i64) #1
+declare i32 @llvm.bswap.i32(i32) #1
+declare i16 @llvm.bswap.i16(i16) #1
diff --git a/llvm/test/CodeGen/SBF/is_trunc_free.ll b/llvm/test/CodeGen/SBF/is_trunc_free.ll
new file mode 100644
index 0000000000000..f5b91089e23b4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/is_trunc_free.ll
@@ -0,0 +1,80 @@
+; RUN: llc -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; Source:
+;   struct env_t {
+;     unsigned data;
+;     unsigned data_end;
+;   };
+;   extern int work(struct env_t *skb, unsigned offset);
+;   int test(struct env_t *skb)
+;   {
+;     void *cursor, *data_end;
+;     struct env_t *srh, *ip;
+;
+;     data_end = (void *)(long)skb->data_end;
+;     cursor = (void *)(long)skb->data;
+;
+;     ip = cursor; cursor += sizeof(*ip);
+;     if ((void *)ip + sizeof(*ip) > data_end)
+;       return 0;
+;
+;     srh = cursor; cursor += sizeof(*srh);
+;     if ((void *)srh + sizeof(*srh) > data_end)
+;       return 0;
+;
+;     return work(skb, (char *)srh - (char *)(long)skb->data);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -emit-llvm -S test.c
+
+%struct.env_t = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.env_t* %skb) local_unnamed_addr #0 {
+entry:
+  %data_end1 = getelementptr inbounds %struct.env_t, %struct.env_t* %skb, i64 0, i32 1
+  %0 = load i32, i32* %data_end1, align 4, !tbaa !2
+  %conv = zext i32 %0 to i64
+  %1 = inttoptr i64 %conv to i8*
+  %data = getelementptr inbounds %struct.env_t, %struct.env_t* %skb, i64 0, i32 0
+  %2 = load i32, i32* %data, align 4, !tbaa !7
+  %conv2 = zext i32 %2 to i64
+  %3 = inttoptr i64 %conv2 to i8*
+  %add.ptr = getelementptr i8, i8* %3, i64 8
+  %cmp = icmp ugt i8* %add.ptr, %1
+  %add.ptr6 = getelementptr i8, i8* %3, i64 16
+  %cmp7 = icmp ugt i8* %add.ptr6, %1
+  %or.cond = or i1 %cmp, %cmp7
+  br i1 %or.cond, label %cleanup, label %if.end10
+
+if.end10:                                         ; preds = %entry
+  %sub.ptr.lhs.cast = ptrtoint i8* %add.ptr to i64
+  %4 = trunc i64 %sub.ptr.lhs.cast to i32
+  %conv13 = sub i32 %4, %2
+  %call = tail call i32 @work(%struct.env_t* nonnull %skb, i32 %conv13) #2
+  br label %cleanup
+
+cleanup:                                          ; preds = %entry, %if.end10
+  %retval.0 = phi i32 [ %call, %if.end10 ], [ 0, %entry ]
+  ret i32 %retval.0
+}
+
+; CHECK: w{{[0-9]+}} = *(u32 *)(r{{[0-9]+}} + 0)
+; CHECK-NOT: w{{[0-9]+}} = w{{[0-9]+}}
+
+declare dso_local i32 @work(%struct.env_t*, i32) local_unnamed_addr #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 016d3ce1f4b07ee3056f7c10fedb24c441c4870f)"}
+!2 = !{!3, !4, i64 4}
+!3 = !{!"env_t", !4, i64 0, !4, i64 4}
+!4 = !{!"int", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
+!7 = !{!3, !4, i64 0}
diff --git a/llvm/test/CodeGen/SBF/is_zext_free.ll b/llvm/test/CodeGen/SBF/is_zext_free.ll
new file mode 100644
index 0000000000000..cd267bc006651
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/is_zext_free.ll
@@ -0,0 +1,26 @@
+; RUN: llc -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; Source:
+;   unsigned test(unsigned long x, unsigned long y) {
+;     return x & y;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -emit-llvm -S test.c
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @test(i64 %x, i64 %y) local_unnamed_addr #0 {
+entry:
+  %and = and i64 %y, %x
+  %conv = trunc i64 %and to i32
+  ret i32 %conv
+}
+
+; CHECK: r[[REG1:[0-9]+]] = r{{[0-9]+}}
+; CHECK: w[[REG1]] &= w{{[0-9]+}}
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git b3ab5b2e7ffe9964ddf75a92fd7a444fe5aaa426)"}
diff --git a/llvm/test/CodeGen/SBF/lit.local.cfg b/llvm/test/CodeGen/SBF/lit.local.cfg
new file mode 100644
index 0000000000000..2efa038798abc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/lit.local.cfg
@@ -0,0 +1,4 @@
+if not 'SBF' in config.root.targets:
+    config.unsupported = True
+if 'system-aix' in config.available_features:
+    config.unsupported = True
diff --git a/llvm/test/CodeGen/SBF/load.ll b/llvm/test/CodeGen/SBF/load.ll
new file mode 100644
index 0000000000000..78b8021bf8a36
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/load.ll
@@ -0,0 +1,43 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+define i16 @am1(i16* %a) nounwind {
+  %1 = load i16, i16* %a
+  ret i16 %1
+}
+; CHECK-LABEL: am1:
+; CHECK: r0 = *(u16 *)(r1 + 0)
+
+@foo = external global i16
+
+define i16 @am2() nounwind {
+  %1 = load i16, i16* @foo
+  ret i16 %1
+}
+; CHECK-LABEL: am2:
+; CHECK: r0 = *(u16 *)(r1 + 0)
+
+define i16 @am4() nounwind {
+  %1 = load volatile i16, i16* inttoptr(i16 32 to i16*)
+  ret i16 %1
+}
+; CHECK-LABEL: am4:
+; CHECK: r1 = 32
+; CHECK: r0 = *(u16 *)(r1 + 0)
+
+define i16 @am5(i16* %a) nounwind {
+  %1 = getelementptr i16, i16* %a, i16 2
+  %2 = load i16, i16* %1
+  ret i16 %2
+}
+; CHECK-LABEL: am5:
+; CHECK: r0 = *(u16 *)(r1 + 4)
+
+%S = type { i16, i16 }
+@baz = common global %S zeroinitializer, align 1
+
+define i16 @am6() nounwind {
+  %1 = load i16, i16* getelementptr (%S, %S* @baz, i32 0, i32 1)
+  ret i16 %1
+}
+; CHECK-LABEL: am6:
+; CHECK: r0 = *(u16 *)(r1 + 2)
diff --git a/llvm/test/CodeGen/SBF/loop-exit-cond.ll b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
new file mode 100644
index 0000000000000..016e7c06e2185
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
@@ -0,0 +1,131 @@
+; RUN: opt -O2 -S -o %t1 < %s
+; RUN: llc -march=sbf -mcpu=v3 %t1 -o - | FileCheck %s
+;
+; Source code:
+;   typedef unsigned long u64;
+;   void foo(char *data, int idx, u64 *);
+;   int test(int len, char *data) {
+;     if (len < 100) {
+;       for (int i = 1; i < len; i++) {
+;         u64 d[1];
+;         d[0] = data[0] ?: '0';
+;         foo("%c", i, d);
+;       }
+;     }
+;   return 0;
+; }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; ModuleID = 'test.c'
+source_filename = "test.c"
+target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
+target triple = "sbf"
+
+@.str = private unnamed_addr constant [3 x i8] c"%c\00", align 1
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32 %len, i8* %data) #0 {
+entry:
+  %len.addr = alloca i32, align 4
+  %data.addr = alloca i8*, align 8
+  %i = alloca i32, align 4
+  %d = alloca [1 x i64], align 8
+  store i32 %len, i32* %len.addr, align 4, !tbaa !3
+  store i8* %data, i8** %data.addr, align 8, !tbaa !7
+  %0 = load i32, i32* %len.addr, align 4, !tbaa !3
+  %cmp = icmp slt i32 %0, 100
+  br i1 %cmp, label %if.then, label %if.end
+
+if.then:                                          ; preds = %entry
+  %1 = bitcast i32* %i to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %1) #3
+  store i32 1, i32* %i, align 4, !tbaa !3
+  br label %for.cond
+
+for.cond:                                         ; preds = %for.inc, %if.then
+  %2 = load i32, i32* %i, align 4, !tbaa !3
+  %3 = load i32, i32* %len.addr, align 4, !tbaa !3
+  %cmp1 = icmp slt i32 %2, %3
+  br i1 %cmp1, label %for.body, label %for.cond.cleanup
+
+; CHECK:      w[[LEN:[0-9]+]] = w1
+; CHECK:      w[[IDX:[0-9]+]] += 1
+; CHECK-NEXT: w[[IDX]] s< w[[LEN]] goto
+
+for.cond.cleanup:                                 ; preds = %for.cond
+  %4 = bitcast i32* %i to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %4) #3
+  br label %for.end
+
+for.body:                                         ; preds = %for.cond
+  %5 = bitcast [1 x i64]* %d to i8*
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* %5) #3
+  %6 = load i8*, i8** %data.addr, align 8, !tbaa !7
+  %arrayidx = getelementptr inbounds i8, i8* %6, i64 0
+  %7 = load i8, i8* %arrayidx, align 1, !tbaa !9
+  %conv = sext i8 %7 to i32
+  %tobool = icmp ne i32 %conv, 0
+  br i1 %tobool, label %cond.true, label %cond.false
+
+cond.true:                                        ; preds = %for.body
+  br label %cond.end
+
+cond.false:                                       ; preds = %for.body
+  br label %cond.end
+
+cond.end:                                         ; preds = %cond.false, %cond.true
+  %cond = phi i32 [ %conv, %cond.true ], [ 48, %cond.false ]
+  %conv2 = sext i32 %cond to i64
+  %arrayidx3 = getelementptr inbounds [1 x i64], [1 x i64]* %d, i64 0, i64 0
+  store i64 %conv2, i64* %arrayidx3, align 8, !tbaa !10
+  %8 = load i32, i32* %i, align 4, !tbaa !3
+  %arraydecay = getelementptr inbounds [1 x i64], [1 x i64]* %d, i64 0, i64 0
+  call void @foo(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i64 0, i64 0), i32 %8, i64* %arraydecay)
+  %9 = bitcast [1 x i64]* %d to i8*
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* %9) #3
+  br label %for.inc
+
+for.inc:                                          ; preds = %cond.end
+  %10 = load i32, i32* %i, align 4, !tbaa !3
+  %inc = add nsw i32 %10, 1
+  store i32 %inc, i32* %i, align 4, !tbaa !3
+  br label %for.cond, !llvm.loop !12
+
+for.end:                                          ; preds = %for.cond.cleanup
+  br label %if.end
+
+if.end:                                           ; preds = %for.end, %entry
+  ret i32 0
+}
+
+; Function Attrs: argmemonly nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+declare dso_local void @foo(i8*, i32, i64*) #2
+
+; Function Attrs: argmemonly nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly nofree nosync nounwind willreturn }
+attributes #2 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #3 = { nounwind }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 8385de118443144518c9fba8b3d831d9076e746b)"}
+!3 = !{!4, !4, i64 0}
+!4 = !{!"int", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
+!7 = !{!8, !8, i64 0}
+!8 = !{!"any pointer", !5, i64 0}
+!9 = !{!5, !5, i64 0}
+!10 = !{!11, !11, i64 0}
+!11 = !{!"long", !5, i64 0}
+!12 = distinct !{!12, !13}
+!13 = !{!"llvm.loop.mustprogress"}
diff --git a/llvm/test/CodeGen/SBF/loops.ll b/llvm/test/CodeGen/SBF/loops.ll
new file mode 100644
index 0000000000000..13b5b46ab480a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/loops.ll
@@ -0,0 +1,111 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+define zeroext i16 @add(i16* nocapture %a, i16 zeroext %n) nounwind readonly {
+entry:
+  %cmp8 = icmp eq i16 %n, 0                       ; <i1> [#uses=1]
+  br i1 %cmp8, label %for.end, label %for.body
+
+for.body:                                         ; preds = %for.body, %entry
+  %i.010 = phi i16 [ 0, %entry ], [ %inc, %for.body ] ; <i16> [#uses=2]
+  %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
+; CHECK-LABEL: add:
+; CHECK: r{{[0-9]+}} += r{{[0-9]+}}
+  %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
+  %add = add i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
+  %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
+  %exitcond = icmp eq i16 %inc, %n                ; <i1> [#uses=1]
+  br i1 %exitcond, label %for.end, label %for.body
+
+for.end:                                          ; preds = %for.body, %entry
+  %sum.0.lcssa = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  ret i16 %sum.0.lcssa
+}
+
+define zeroext i16 @sub(i16* nocapture %a, i16 zeroext %n) nounwind readonly {
+entry:
+  %cmp8 = icmp eq i16 %n, 0                       ; <i1> [#uses=1]
+  br i1 %cmp8, label %for.end, label %for.body
+
+for.body:                                         ; preds = %for.body, %entry
+  %i.010 = phi i16 [ 0, %entry ], [ %inc, %for.body ] ; <i16> [#uses=2]
+  %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
+; CHECK-LABEL: sub:
+; CHECK: r{{[0-9]+}} -= r{{[0-9]+}}
+  %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
+  %add = sub i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
+  %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
+  %exitcond = icmp eq i16 %inc, %n                ; <i1> [#uses=1]
+  br i1 %exitcond, label %for.end, label %for.body
+
+for.end:                                          ; preds = %for.body, %entry
+  %sum.0.lcssa = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  ret i16 %sum.0.lcssa
+}
+
+define zeroext i16 @or(i16* nocapture %a, i16 zeroext %n) nounwind readonly {
+entry:
+  %cmp8 = icmp eq i16 %n, 0                       ; <i1> [#uses=1]
+  br i1 %cmp8, label %for.end, label %for.body
+
+for.body:                                         ; preds = %for.body, %entry
+  %i.010 = phi i16 [ 0, %entry ], [ %inc, %for.body ] ; <i16> [#uses=2]
+  %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
+; CHECK-LABEL: or:
+; CHECK: r{{[0-9]+}} |= r{{[0-9]+}}
+  %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
+  %add = or i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
+  %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
+  %exitcond = icmp eq i16 %inc, %n                ; <i1> [#uses=1]
+  br i1 %exitcond, label %for.end, label %for.body
+
+for.end:                                          ; preds = %for.body, %entry
+  %sum.0.lcssa = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  ret i16 %sum.0.lcssa
+}
+
+define zeroext i16 @xor(i16* nocapture %a, i16 zeroext %n) nounwind readonly {
+entry:
+  %cmp8 = icmp eq i16 %n, 0                       ; <i1> [#uses=1]
+  br i1 %cmp8, label %for.end, label %for.body
+
+for.body:                                         ; preds = %for.body, %entry
+  %i.010 = phi i16 [ 0, %entry ], [ %inc, %for.body ] ; <i16> [#uses=2]
+  %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
+; CHECK-LABEL: xor:
+; CHECK: r{{[0-9]+}} ^= r{{[0-9]+}}
+  %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
+  %add = xor i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
+  %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
+  %exitcond = icmp eq i16 %inc, %n                ; <i1> [#uses=1]
+  br i1 %exitcond, label %for.end, label %for.body
+
+for.end:                                          ; preds = %for.body, %entry
+  %sum.0.lcssa = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  ret i16 %sum.0.lcssa
+}
+
+define zeroext i16 @and(i16* nocapture %a, i16 zeroext %n) nounwind readonly {
+entry:
+  %cmp8 = icmp eq i16 %n, 0                       ; <i1> [#uses=1]
+  br i1 %cmp8, label %for.end, label %for.body
+
+for.body:                                         ; preds = %for.body, %entry
+  %i.010 = phi i16 [ 0, %entry ], [ %inc, %for.body ] ; <i16> [#uses=2]
+  %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
+; CHECK-LABEL: and:
+; CHECK: r{{[0-9]+}} &= r{{[0-9]+}}
+  %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
+  %add = and i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
+  %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
+  %exitcond = icmp eq i16 %inc, %n                ; <i1> [#uses=1]
+  br i1 %exitcond, label %for.end, label %for.body
+
+for.end:                                          ; preds = %for.body, %entry
+  %sum.0.lcssa = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
+  ret i16 %sum.0.lcssa
+}
diff --git a/llvm/test/CodeGen/SBF/many_args1.ll b/llvm/test/CodeGen/SBF/many_args1.ll
new file mode 100644
index 0000000000000..3c6e277fa9424
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/many_args1.ll
@@ -0,0 +1,18 @@
+; RUN: llc -O2 -march=sbf < %s | FileCheck %s
+
+; Function Attrs: nounwind uwtable
+define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
+; CHECK-LABEL: foo:
+; CHECK: r4 = 2
+; CHECK: *(u64 *)(r10 - 4096) = r4
+; CHECK: r4 = 3
+; CHECK: *(u64 *)(r10 - 4088) = r4
+; CHECK: r5 = r10
+; CHECK: r4 = 1
+; CHECK: call bar
+entry:
+  %call = tail call i32 @bar(i32 %a, i32 %b, i32 %c, i32 1, i32 2, i32 3) #3
+  ret i32 %call
+}
+
+declare i32 @bar(i32, i32, i32, i32, i32, i32) #1
diff --git a/llvm/test/CodeGen/SBF/many_args2.ll b/llvm/test/CodeGen/SBF/many_args2.ll
new file mode 100644
index 0000000000000..8db12aa47ba00
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/many_args2.ll
@@ -0,0 +1,17 @@
+; RUN: llc -O2 -march=sbf < %s | FileCheck %s
+
+; Function Attrs: nounwind readnone uwtable
+define i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) #0 {
+; CHECK-LABEL: bar:
+; CHECK: r0 = 1
+entry:
+  ret i32 1
+}
+
+; Function Attrs: nounwind readnone uwtable
+define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
+; CHECK-LABEL: foo:
+; CHECK: r0 = 1
+entry:
+  ret i32 1
+}
diff --git a/llvm/test/CodeGen/SBF/mem_offset.ll b/llvm/test/CodeGen/SBF/mem_offset.ll
new file mode 100644
index 0000000000000..edce3e9975d0a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/mem_offset.ll
@@ -0,0 +1,17 @@
+; RUN: llc -march=sbf -show-mc-encoding < %s | FileCheck %s
+
+; Function Attrs: nounwind
+define i32 @bpf_prog1(i8* nocapture readnone) local_unnamed_addr #0 {
+; CHECK: r1 += -1879113726 # encoding: [0x07,0x01,0x00,0x00,0x02,0x00,0xff,0x8f]
+; CHECK: r0 = *(u64 *)(r1 + 0) # encoding: [0x79,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+  %2 = alloca i64, align 8
+  %3 = bitcast i64* %2 to i8*
+  store volatile i64 590618314553, i64* %2, align 8
+  %4 = load volatile i64, i64* %2, align 8
+  %5 = add i64 %4, -1879113726
+  %6 = inttoptr i64 %5 to i64*
+  %7 = load i64, i64* %6, align 8
+  %8 = trunc i64 %7 to i32
+  ret i32 %8
+}
+
diff --git a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
new file mode 100644
index 0000000000000..bec8bec61b13a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
@@ -0,0 +1,78 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs -sbf-expand-memcpy-in-order | FileCheck %s
+;
+; #define COPY_LEN	9
+;
+; void cal_align1(void *a, void *b)
+; {
+;   __builtin_memcpy(a, b, COPY_LEN);
+; }
+;
+; void cal_align2(short *a, short *b)
+; {
+;   __builtin_memcpy(a, b, COPY_LEN);
+; }
+;
+; #undef COPY_LEN
+; #define COPY_LEN	19
+; void cal_align4(int *a, int *b)
+; {
+;   __builtin_memcpy(a, b, COPY_LEN);
+; }
+;
+; #undef COPY_LEN
+; #define COPY_LEN	27
+; void cal_align8(long long *a, long long *b)
+; {
+;   __builtin_memcpy(a, b, COPY_LEN);
+; }
+
+; Function Attrs: nounwind
+define dso_local void @cal_align1(i8* nocapture %a, i8* nocapture readonly %b) local_unnamed_addr #0 {
+entry:
+  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %a, i8* align 1 %b, i64 9, i1 false)
+  ret void
+}
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
+
+; CHECK: call memcpy
+
+; Function Attrs: nounwind
+define dso_local void @cal_align2(i16* nocapture %a, i16* nocapture readonly %b) local_unnamed_addr #0 {
+entry:
+  %0 = bitcast i16* %a to i8*
+  %1 = bitcast i16* %b to i8*
+  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 2 %0, i8* align 2 %1, i64 9, i1 false)
+  ret void
+}
+; CHECK: call memcpy
+
+; Function Attrs: nounwind
+define dso_local void @cal_align4(i32* nocapture %a, i32* nocapture readonly %b) local_unnamed_addr #0 {
+entry:
+  %0 = bitcast i32* %a to i8*
+  %1 = bitcast i32* %b to i8*
+  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %0, i8* align 4 %1, i64 19, i1 false)
+  ret void
+}
+; CHECK: call memcpy
+
+; Function Attrs: nounwind
+define dso_local void @cal_align8(i64* nocapture %a, i64* nocapture readonly %b) local_unnamed_addr #0 {
+entry:
+  %0 = bitcast i64* %a to i8*
+  %1 = bitcast i64* %b to i8*
+  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 %0, i8* align 8 %1, i64 27, i1 false)
+  ret void
+}
+; CHECK: [[SCRATCH_REG:r[0-9]]] = *(u64 *)([[SRC_REG:r[0-9]]] + 0)
+; CHECK: *(u64 *)([[DST_REG:r[0-9]]] + 0) = [[SCRATCH_REG]]
+; CHECK: [[SCRATCH_REG]] = *(u64 *)([[SRC_REG]] + 8)
+; CHECK: *(u64 *)([[DST_REG]] + 8) = [[SCRATCH_REG]]
+; CHECK: [[SCRATCH_REG]] = *(u64 *)([[SRC_REG]] + 16)
+; CHECK: *(u64 *)([[DST_REG]] + 16) = [[SCRATCH_REG]]
+; CHECK: [[SCRATCH_REG]] = *(u16 *)([[SRC_REG]] + 24)
+; CHECK: *(u16 *)([[DST_REG]] + 24) = [[SCRATCH_REG]]
+; CHECK: [[SCRATCH_REG]] = *(u8 *)([[SRC_REG]] + 26)
+; CHECK: *(u8 *)([[DST_REG]] + 26) = [[SCRATCH_REG]]
diff --git a/llvm/test/CodeGen/SBF/objdump_atomics.ll b/llvm/test/CodeGen/SBF/objdump_atomics.ll
new file mode 100644
index 0000000000000..b87a3ae25a7e9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_atomics.ll
@@ -0,0 +1,21 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+
+; CHECK-LABEL: test_load_add_32
+; CHECK: r3 = *(u32 *)(r1 + 0)
+; CHECK: r3 += r2
+; CHECK: *(u32 *)(r1 + 0) = r3
+define void @test_load_add_32(i32* %p, i32 zeroext %v) {
+entry:
+  atomicrmw add i32* %p, i32 %v seq_cst
+  ret void
+}
+
+; CHECK-LABEL: test_load_add_64
+; CHECK: r3 = *(u64 *)(r1 + 0)
+; CHECK: r3 += r2
+; CHECK: *(u64 *)(r1 + 0) = r3
+define void @test_load_add_64(i64* %p, i64 zeroext %v) {
+entry:
+  atomicrmw add i64* %p, i64 %v seq_cst
+  ret void
+}
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
new file mode 100644
index 0000000000000..dab1dfb9d1c18
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -0,0 +1,69 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+
+; Source Code:
+; int gbl;
+; int test(int a, int b) {
+;   if (a == 2) {
+;     gbl = gbl * gbl * 2;
+;     goto out;
+;   }
+;   if (a != b) {
+;     gbl = gbl * 4;
+;   }
+; out:
+;   return gbl;
+; }
+
+@gbl = common local_unnamed_addr global i32 0, align 4
+
+define i32 @test(i32, i32) local_unnamed_addr #0 {
+  %3 = icmp eq i32 %0, 2
+  br i1 %3, label %4, label %8
+
+; <label>:4:                                      ; preds = %2
+  %5 = load i32, i32* @gbl, align 4
+  %6 = shl i32 %5, 1
+  %7 = mul i32 %6, %5
+  br label %13
+; CHECK: r1 <<= 32
+; CHECK: r1 >>= 32
+; CHECK: if r1 != 2 goto +6 <LBB0_2>
+
+; <label>:8:                                      ; preds = %2
+  %9 = icmp eq i32 %0, %1
+  %10 = load i32, i32* @gbl, align 4
+  br i1 %9, label %15, label %11
+
+; CHECK: r1 = 0 ll
+; CHECK: r0 = *(u32 *)(r1 + 0)
+; CHECK: r0 *= r0
+; CHECK: r0 <<= 1
+; CHECK: goto +7 <LBB0_4>
+
+; <label>:11:                                     ; preds = %8
+  %12 = shl nsw i32 %10, 2
+  br label %13
+
+; CHECK-LABEL: <LBB0_2>:
+; CHECK: r3 = 0 ll
+; CHECK: r0 = *(u32 *)(r3 + 0)
+; CHECK: r2 <<= 32
+; CHECK: r2 >>= 32
+; CHECK: if r1 == r2 goto +4 <LBB0_5>
+; CHECK: r0 <<= 2
+
+; <label>:13:                                     ; preds = %4, %11
+  %14 = phi i32 [ %12, %11 ], [ %7, %4 ]
+  store i32 %14, i32* @gbl, align 4
+  br label %15
+; CHECK-LABEL: <LBB0_4>:
+; CHECK: r1 = 0 ll
+; CHECK: *(u32 *)(r1 + 0) = r0
+
+; <label>:15:                                     ; preds = %8, %13
+  %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
+  ret i32 %16
+; CHECK-LABEL: <LBB0_5>:
+; CHECK: exit
+}
+attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
new file mode 100644
index 0000000000000..3f6655f637b4b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -0,0 +1,39 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+
+; Source Code:
+; int test(int a, int b) {
+;   int s = 0;
+;   while (a < b) { s++; a += s; b -= s; }
+;   return s;
+; }
+
+define i32 @test(i32, i32) local_unnamed_addr #0 {
+; CHECK-LABEL: <test>:
+  %3 = icmp slt i32 %0, %1
+  br i1 %3, label %4, label %13
+
+; <label>:4:                                      ; preds = %2
+  br label %5
+; CHECK: if r4 s>= r3 goto +11 <LBB0_3>
+; CHECK: r0 = 0
+; CHECK-LABEL: <LBB0_2>:
+
+; <label>:5:                                      ; preds = %4, %5
+  %6 = phi i32 [ %9, %5 ], [ 0, %4 ]
+  %7 = phi i32 [ %11, %5 ], [ %1, %4 ]
+  %8 = phi i32 [ %10, %5 ], [ %0, %4 ]
+  %9 = add nuw nsw i32 %6, 1
+  %10 = add nsw i32 %9, %8
+  %11 = sub nsw i32 %7, %9
+  %12 = icmp slt i32 %10, %11
+  br i1 %12, label %5, label %13
+; CHECK: r1 = r3
+; CHECK: if r2 s> r3 goto -10 <LBB0_2>
+
+; <label>:13:                                     ; preds = %5, %2
+  %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
+  ret i32 %14
+; CHECK-LABEL: <LBB0_3>:
+; CHECK: exit
+}
+attributes #0 = { norecurse nounwind readnone }
diff --git a/llvm/test/CodeGen/SBF/objdump_dis_all.ll b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
new file mode 100644
index 0000000000000..67155013145a9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
@@ -0,0 +1,26 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -D - | FileCheck %s
+;
+; Source:
+;   /* *(u64 *)(r10 - 16) = r1 */
+;   unsigned long long g = 0x00000000fff01a7bULL;
+;   /* *(u64 *)(r15 - 16) = r1 */
+;   unsigned long long h = 0x00000000fff01f7bULL;
+;   int test() {
+;     return 0;
+;   }
+; Compilation flag:
+;  clang -target sbf -O2 -S -emit-llvm t.c
+
+@g = dso_local local_unnamed_addr global i64 4293925499, align 8
+@h = dso_local local_unnamed_addr global i64 4293926779, align 8
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @test() local_unnamed_addr {
+entry:
+  ret i32 0
+}
+; CHECK-LABEL: section .data
+; CHECK-LABEL: g
+; CHECK:       *(u64 *)(r10 - 16) = r1
+; CHECK-LABEL: h
+; CHECK:       <unknown>
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
new file mode 100644
index 0000000000000..57c87da92c870
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -0,0 +1,65 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-DEC %s
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d --print-imm-hex - | FileCheck --check-prefix=CHECK-HEX %s
+
+; Source Code:
+; int gbl;
+; int test(unsigned long long a, unsigned long long b) {
+;   int ret = 0;
+;   if (a == 0xABCDABCDabcdabcdULL) {
+;     gbl = gbl * gbl * 2;
+;     ret = 1;
+;     goto out;
+;   }
+;   if (b == 0xABCDabcdabcdULL) {
+;     gbl = gbl * 4;
+;     ret = 2;
+;   }
+;  out:
+;   return ret;
+; }
+
+@gbl = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind
+define i32 @test(i64, i64) local_unnamed_addr #0 {
+; CHECK-LABEL: test
+  %3 = icmp eq i64 %0, -6067004223159161907
+  br i1 %3, label %4, label %8
+; CHECK-DEC: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         r3 = -6067004223159161907 ll
+; CHECK-DEC: 5d 31 07 00 00 00 00 00         if r1 != r3 goto +7
+; CHECK-HEX: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         r3 = -0x5432543254325433 ll
+; CHECK-HEX: 5d 31 07 00 00 00 00 00         if r1 != r3 goto +0x7
+
+; <label>:4:                                      ; preds = %2
+  %5 = load i32, i32* @gbl, align 4
+  %6 = shl i32 %5, 1
+; CHECK-DEC: 67 01 00 00 01 00 00 00         r1 <<= 1
+; CHECK-HEX: 67 01 00 00 01 00 00 00         r1 <<= 0x1
+  %7 = mul i32 %6, %5
+  br label %13
+
+; <label>:8:                                      ; preds = %2
+  %9 = icmp eq i64 %1, 188899839028173
+; CHECK-DEC: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         r1 = 188899839028173 ll
+; CHECK-HEX: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         r1 = 0xabcdabcdabcd ll
+  br i1 %9, label %10, label %16
+
+; <label>:10:                                     ; preds = %8
+  %11 = load i32, i32* @gbl, align 4
+  %12 = shl nsw i32 %11, 2
+  br label %13
+
+; <label>:13:                                     ; preds = %4, %10
+  %14 = phi i32 [ %12, %10 ], [ %7, %4 ]
+  %15 = phi i32 [ 2, %10 ], [ 1, %4 ]
+  store i32 %14, i32* @gbl, align 4
+; CHECK-DEC: 63 12 00 00 00 00 00 00         *(u32 *)(r2 + 0) = r1
+; CHECK-HEX: 63 12 00 00 00 00 00 00         *(u32 *)(r2 + 0x0) = r1
+  br label %16
+
+; <label>:16:                                     ; preds = %13, %8
+  %17 = phi i32 [ 0, %8 ], [ %15, %13 ]
+  ret i32 %17
+}
+
+attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
new file mode 100644
index 0000000000000..40b5096a67ff8
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
@@ -0,0 +1,37 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-EL %s
+
+define i32 @ld_pseudo() #0 {
+entry:
+  %call = tail call i64 @llvm.bpf.pseudo(i64 2, i64 3)
+  tail call void inttoptr (i64 4 to void (i64, i32)*)(i64 %call, i32 4) #2
+  ret i32 0
+; CHECK-LABEL: ld_pseudo:
+; CHECK-EL: ld_pseudo r1, 2, 3
+}
+
+declare i64 @llvm.bpf.pseudo(i64, i64) #2
+
+define i32 @bswap(i64 %a, i64 %b, i64 %c) #0 {
+entry:
+  %0 = tail call i64 @llvm.bswap.i64(i64 %a)
+  %conv = trunc i64 %b to i32
+  %1 = tail call i32 @llvm.bswap.i32(i32 %conv)
+  %conv1 = zext i32 %1 to i64
+  %add = add i64 %conv1, %0
+  %conv2 = trunc i64 %c to i16
+  %2 = tail call i16 @llvm.bswap.i16(i16 %conv2)
+  %conv3 = zext i16 %2 to i64
+  %add4 = add i64 %add, %conv3
+  %conv5 = trunc i64 %add4 to i32
+  ret i32 %conv5
+; CHECK-LABEL: bswap:
+; CHECK-EL: r1 = be64 r1
+; CHECK-EL: r0 = be32 r0
+; CHECK-EL: r0 += r1
+; CHECK-EL: r3 = be16 r3
+; CHECK-EL: r0 += r3
+}
+
+declare i64 @llvm.bswap.i64(i64) #1
+declare i32 @llvm.bswap.i32(i32) #1
+declare i16 @llvm.bswap.i16(i16) #1
diff --git a/llvm/test/CodeGen/SBF/objdump_nop.ll b/llvm/test/CodeGen/SBF/objdump_nop.ll
new file mode 100644
index 0000000000000..e90d481e3badc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_nop.ll
@@ -0,0 +1,19 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+;
+; Source:
+;   int test() {
+;     asm volatile("r0 = r0" ::);
+;     return 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr {
+entry:
+  tail call void asm sideeffect "r0 = r0", ""()
+  ret i32 0
+}
+; CHECK-LABEL: test
+; CHECK:       r0 = r0
+; CHECK:       r0 = 0
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
new file mode 100644
index 0000000000000..8f20d2ae83d51
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -0,0 +1,39 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK %s
+
+; src:
+;   static volatile long a = 2;
+;   static volatile int b = 3;
+;   int test() { return a + b; }
+@a = internal global i64 2, align 8
+@b = internal global i32 3, align 4
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @test() local_unnamed_addr #0 {
+  %1 = load volatile i64, i64* @a, align 8, !tbaa !2
+; CHECK: r1 = 0 ll
+; CHECK: R_SBF_64_64	a
+; CHECK: r1 = *(u64 *)(r1 + 0)
+  %2 = load volatile i32, i32* @b, align 4, !tbaa !6
+; CHECK: r2 = 0 ll
+; CHECK: R_SBF_64_64	b
+; CHECK: r0 = *(u32 *)(r2 + 0)
+  %3 = trunc i64 %1 to i32
+  %4 = add i32 %2, %3
+; CHECK: r0 += r1
+  ret i32 %4
+; CHECK: exit
+}
+
+attributes #0 = { norecurse nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 8.0.20181009 "}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"long", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
+!6 = !{!7, !7, i64 0}
+!7 = !{!"int", !4, i64 0}
diff --git a/llvm/test/CodeGen/SBF/objdump_trivial.ll b/llvm/test/CodeGen/SBF/objdump_trivial.ll
new file mode 100644
index 0000000000000..0e634d9aa23a3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_trivial.ll
@@ -0,0 +1,18 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+
+; CHECK: if r2 s> r1 goto
+; CHECK: call 1
+; CHECK: exit
+; CHECK: call 2
+; CHECK: exit
+
+define void @foo(i32 %a) {
+%b = icmp sgt i32 %a, -1
+br i1 %b, label %x, label %y
+x:
+call void inttoptr (i64 1 to void ()*)()
+ret void
+y:
+call void inttoptr (i64 2 to void ()*)()
+ret void
+}
diff --git a/llvm/test/CodeGen/SBF/objdump_two_funcs.ll b/llvm/test/CodeGen/SBF/objdump_two_funcs.ll
new file mode 100644
index 0000000000000..6e8bec1d1d6b3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/objdump_two_funcs.ll
@@ -0,0 +1,68 @@
+; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -S - | FileCheck %s
+;
+; Source code:
+;   __attribute__((section("s1")))
+;   int func1(int a) {
+;       return a * a;
+;   }
+;   __attribute__((section("s2")))
+;   int func2(int a) {
+;       return a * a * a;
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -gdwarf-5 -gembed-source -emit-llvm -g -O2 bug.c
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @func1(i32 %a) local_unnamed_addr #0 section "s1" !dbg !7 {
+entry:
+; CHECK: <func1>:
+  call void @llvm.dbg.value(metadata i32 %a, metadata !12, metadata !DIExpression()), !dbg !13
+  %mul = mul nsw i32 %a, %a, !dbg !14
+  ret i32 %mul, !dbg !15
+; CHECK: ; return a * a;
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @func2(i32 %a) local_unnamed_addr #0 section "s2" !dbg !16 {
+entry:
+; CHECK: <func2>:
+  call void @llvm.dbg.value(metadata i32 %a, metadata !18, metadata !DIExpression()), !dbg !19
+  %mul = mul nsw i32 %a, %a, !dbg !20
+  %mul1 = mul nsw i32 %mul, %a, !dbg !21
+  ret i32 %mul1, !dbg !22
+; CHECK: ; return a * a * a;
+}
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 366422) (llvm/trunk 366423)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "bug.c", directory: "/tmp/home/yhs/work/tests/llvm/reloc", checksumkind: CSK_MD5, checksum: "c7c9938d4e6989ca33db748213aab194", source: "__attribute__((section(\22s1\22)))\0Aint func1(int a) {\0A    return a * a;\0A}\0A__attribute__((section(\22s2\22)))\0Aint func2(int a) {\0A    return a * a * a;\0A}\0A")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 5}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 9.0.0 (trunk 366422) (llvm/trunk 366423)"}
+!7 = distinct !DISubprogram(name: "func1", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 2, type: !10)
+!13 = !DILocation(line: 0, scope: !7)
+!14 = !DILocation(line: 3, column: 14, scope: !7)
+!15 = !DILocation(line: 3, column: 5, scope: !7)
+!16 = distinct !DISubprogram(name: "func2", scope: !1, file: !1, line: 6, type: !8, scopeLine: 6, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !17)
+!17 = !{!18}
+!18 = !DILocalVariable(name: "a", arg: 1, scope: !16, file: !1, line: 6, type: !10)
+!19 = !DILocation(line: 0, scope: !16)
+!20 = !DILocation(line: 7, column: 14, scope: !16)
+!21 = !DILocation(line: 7, column: 18, scope: !16)
+!22 = !DILocation(line: 7, column: 5, scope: !16)
diff --git a/llvm/test/CodeGen/SBF/optnone-1.ll b/llvm/test/CodeGen/SBF/optnone-1.ll
new file mode 100644
index 0000000000000..5f0044eb0f4bc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/optnone-1.ll
@@ -0,0 +1,52 @@
+; RUN: llc -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; Source Code:
+;   int test(int a, int b) { return a + b; }
+; Compilation flag:
+;   clang -target sbf -g -S -emit-llvm test.c
+
+; Function Attrs: noinline nounwind optnone
+define dso_local i32 @test(i32 %a, i32 %b) #0 !dbg !7 {
+entry:
+  %a.addr = alloca i32, align 4
+  %b.addr = alloca i32, align 4
+  store i32 %a, i32* %a.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %a.addr, metadata !11, metadata !DIExpression()), !dbg !12
+  store i32 %b, i32* %b.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %b.addr, metadata !13, metadata !DIExpression()), !dbg !14
+  %0 = load i32, i32* %a.addr, align 4, !dbg !15
+  %1 = load i32, i32* %b.addr, align 4, !dbg !16
+  %add = add nsw i32 %0, %1, !dbg !17
+  ret i32 %add, !dbg !18
+}
+
+; CHECK-LABEL: test
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { noinline nounwind optnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 7f49dc496682e38335b204bbae371a0ca5057719)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 7f49dc496682e38335b204bbae371a0ca5057719)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !10, !10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 1, type: !10)
+!12 = !DILocation(line: 1, column: 14, scope: !7)
+!13 = !DILocalVariable(name: "b", arg: 2, scope: !7, file: !1, line: 1, type: !10)
+!14 = !DILocation(line: 1, column: 21, scope: !7)
+!15 = !DILocation(line: 1, column: 33, scope: !7)
+!16 = !DILocation(line: 1, column: 37, scope: !7)
+!17 = !DILocation(line: 1, column: 35, scope: !7)
+!18 = !DILocation(line: 1, column: 26, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/optnone-2.ll b/llvm/test/CodeGen/SBF/optnone-2.ll
new file mode 100644
index 0000000000000..37beff400dfc1
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/optnone-2.ll
@@ -0,0 +1,53 @@
+; RUN: opt < %s -passes='default<O2>' | llc -march=sbf -filetype=asm -o /dev/null -
+; RUN: opt < %s -passes='default<O0>' | llc -march=sbf -filetype=asm -o /dev/null -
+
+; IR generated by
+; $ cat /tmp/a.c
+; struct ss { int a; };
+; int foo() { return __builtin_btf_type_id(0, 0) + __builtin_preserve_type_info(*(struct ss *)0, 0); }
+; $ clang -target bpf -g -S -emit-llvm t.c -Xclang -disable-llvm-passes /tmp/a.c
+
+target triple = "sbf"
+
+; Function Attrs: noinline nounwind optnone
+define dso_local i32 @foo() #0 !dbg !9 {
+entry:
+  %0 = call i64 @llvm.bpf.btf.type.id(i32 0, i64 0), !dbg !11, !llvm.preserve.access.index !4
+  %1 = call i32 @llvm.bpf.preserve.type.info(i32 1, i64 0), !dbg !12, !llvm.preserve.access.index !13
+  %conv = zext i32 %1 to i64, !dbg !12
+  %add = add i64 %0, %conv, !dbg !16
+  %conv1 = trunc i64 %add to i32, !dbg !11
+  ret i32 %conv1, !dbg !17
+}
+
+; Function Attrs: nounwind readnone
+declare i64 @llvm.bpf.btf.type.id(i32, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.type.info(i32, i64) #1
+
+attributes #0 = { noinline nounwind optnone }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!5, !6, !7}
+!llvm.ident = !{!8}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "C:/src/tmp\\a.c", directory: "C:\\src\\llvm-project")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!5 = !{i32 7, !"Dwarf Version", i32 4}
+!6 = !{i32 2, !"Debug Info Version", i32 3}
+!7 = !{i32 1, !"wchar_size", i32 4}
+!8 = !{!"clang version 12.0.0"}
+!9 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !10, scopeLine: 2, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!10 = !DISubroutineType(types: !3)
+!11 = !DILocation(line: 2, column: 20, scope: !9)
+!12 = !DILocation(line: 2, column: 50, scope: !9)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "ss", file: !1, line: 1, size: 32, elements: !14)
+!14 = !{!15}
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !1, line: 1, baseType: !4, size: 32)
+!16 = !DILocation(line: 2, column: 48, scope: !9)
+!17 = !DILocation(line: 2, column: 13, scope: !9)
diff --git a/llvm/test/CodeGen/SBF/preprocess-loads.ll b/llvm/test/CodeGen/SBF/preprocess-loads.ll
new file mode 100644
index 0000000000000..6267916236511
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/preprocess-loads.ll
@@ -0,0 +1,35 @@
+; RUN: llc -O2 -march=sbf -filetype=asm < %s | FileCheck --check-prefix=CHECK %s
+
+%Pool = type <{ [0 x i8], [32 x i8], [0 x i8], i8, [0 x i8], [10 x %Decimal], [0 x i8] }>
+%Decimal = type { [0 x i32], i32, [0 x i32], i32, [0 x i32], i32, [0 x i32], i32, [0 x i32] }
+
+@0 = private unnamed_addr constant <{ [16 x i8] }> <{ [16 x i8] c"\00\00\00\00\FF\FF\FF\FF\FF\FF\FF\FF\FF\FF\FF\FF" }>, align 4
+
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* noalias nocapture writeonly, i8* noalias nocapture readonly, i64, i1 immarg) #5
+
+; optbug::Pool::initialize
+; Function Attrs: nofree noinline nounwind willreturn
+define internal fastcc void @_ZN6optbug4Pool10initialize17h656ab4e5f05591beE(%Pool* noalias nocapture align 1 dereferenceable(193) %self, [32 x i8]* noalias nocapture readonly align 1 dereferenceable(32) %seed, i8 %bump) unnamed_addr #2 {
+start:
+  %0 = getelementptr inbounds [32 x i8], [32 x i8]* %seed, i64 0, i64 0
+  %self56 = getelementptr inbounds %Pool, %Pool* %self, i64 0, i32 0, i64 0
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 1 dereferenceable(32) %self56, i8* nonnull align 1 dereferenceable(32) %0, i64 32, i1 false)
+  %1 = getelementptr inbounds %Pool, %Pool* %self, i64 0, i32 3
+  store i8 %bump, i8* %1, align 1
+  %2 = getelementptr inbounds %Pool, %Pool* %self, i64 0, i32 5, i64 1
+  %3 = bitcast %Decimal* %2 to i8*
+  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 1 dereferenceable(16) %3, i8* nonnull align 4 dereferenceable(16) getelementptr inbounds (<{ [16 x i8] }>, <{ [16 x i8] }>* @0, i64 0, i32 0, i64 0), i64 16, i1 false)
+  ret void
+}
+
+; CHECK: *(u64 *)(r1 + 24) = r4
+; CHECK: *(u64 *)(r1 + 16) = r4
+; CHECK: *(u64 *)(r1 + 8) = r4
+; CHECK: *(u64 *)(r1 + 0) = r2
+; CHECK: *(u8 *)(r1 + 32) = r3
+
+attributes #2 = { nofree noinline nounwind willreturn "target-cpu"="generic" }
+
+!llvm.module.flags = !{!0}
+
+!0 = !{i32 7, !"PIC Level", i32 2}
diff --git a/llvm/test/CodeGen/SBF/reloc-2.ll b/llvm/test/CodeGen/SBF/reloc-2.ll
new file mode 100644
index 0000000000000..8dc3f3b3ae7f5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/reloc-2.ll
@@ -0,0 +1,58 @@
+; RUN: llc -march=sbf -filetype=obj -o %t.el < %s
+; RUN: llvm-objdump -r %t.el | FileCheck --check-prefix=RELOC %s
+; RUN: llvm-objdump -d --no-show-raw-insn %t.el | FileCheck --check-prefix=DUMP %s
+
+; source code:
+;   static __attribute__((noinline)) __attribute__((section("sec1")))
+;   int add(int a, int b) {
+;     return a + b;
+;   }
+;   static __attribute__((noinline))
+;   int sub(int a, int b) {
+;     return a - b;
+;   }
+;   int test(int a, int b) {
+;     return add(a, b) + sub(a, b);
+;   }
+; compilation flag:
+;   clang -target bpf -O2 -emit-llvm -S test.c
+
+define dso_local i32 @test(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %call = tail call fastcc i32 @add(i32 %a, i32 %b)
+  %call1 = tail call fastcc i32 @sub(i32 %a, i32 %b)
+  %add = add nsw i32 %call1, %call
+  ret i32 %add
+}
+
+define internal fastcc i32 @add(i32 %a, i32 %b) unnamed_addr #1 section "sec1" {
+entry:
+  %add = add nsw i32 %b, %a
+  ret i32 %add
+}
+
+; Function Attrs: nofree noinline norecurse nosync nounwind readnone willreturn mustprogress
+define internal fastcc i32 @sub(i32 %a, i32 %b) unnamed_addr #1 {
+entry:
+  %sub = sub nsw i32 %a, %b
+  ret i32 %sub
+}
+
+; DUMP:       .text:
+; DUMP-EMPTY:
+; DUMP-NEXT:  <test>
+; DUMP-NEXT:  r[[#]] = r[[#]]
+; DUMP-NEXT:  r[[#]] = r[[#]]
+; DUMP-NEXT:  call -1
+
+; DUMP:       sec1:
+; DUMP-EMPTY:
+; DUMP-NEXT:  <add>
+
+; RELOC:      RELOCATION RECORDS FOR [.text]:
+; RELOC:      R_SBF_64_32            add 
+; RELOC-NOT:  R_SBF_64_32            sec1
+; RELOC-NOT:  R_SBF_64_32
+
+attributes #0 = { nofree norecurse nosync nounwind readnone willreturn mustprogress "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nofree noinline norecurse nosync nounwind readnone willreturn mustprogress "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
diff --git a/llvm/test/CodeGen/SBF/reloc-3.ll b/llvm/test/CodeGen/SBF/reloc-3.ll
new file mode 100644
index 0000000000000..3aee4338278b6
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/reloc-3.ll
@@ -0,0 +1,23 @@
+; RUN: llc -march=sbf -filetype=obj -o %t.el < %s
+; RUN: llvm-readelf -r %t.el | FileCheck %s
+
+; source code:
+;   int g() { return 0; }
+;   struct t { void *p; } gbl = { g };
+; compilation flag:
+;   clang -target bpf -O2 -emit-llvm -S test.c
+
+%struct.t = type { i8* }
+
+@gbl = dso_local local_unnamed_addr global %struct.t { i8* bitcast (i32 ()* @g to i8*) }, align 8
+
+; CHECK: '.rel.data'
+; CHECK: 0000000000000000 0000000200000001 R_SBF_64_64 0000000000000000 g
+
+; Function Attrs: nofree norecurse nosync nounwind readnone willreturn mustprogress
+define dso_local i32 @g() #0 {
+entry:
+  ret i32 0
+}
+
+attributes #0 = { nofree norecurse nosync nounwind readnone willreturn mustprogress "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
diff --git a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
new file mode 100644
index 0000000000000..86ab005ad62f4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
@@ -0,0 +1,20 @@
+; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBF %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBFv2 %s
+
+@.str = private unnamed_addr constant [25 x i8] c"reloc_64_relative_data.c\00", align 1
+@FILE = dso_local constant i64 ptrtoint ([25 x i8]* @.str to i64), align 8
+
+; Function Attrs: noinline nounwind optnone
+define dso_local i64 @entrypoint(i8* %input) #0 {
+entry:
+  %input.addr = alloca i8*, align 8
+  store i8* %input, i8** %input.addr, align 8
+  %0 = load volatile i64, i64* @FILE, align 8
+  ret i64 %0
+}
+
+; CHECK-RELOC-SBF:   RELOCATION RECORDS FOR [.data.rel.ro]:
+; CHECK-RELOC-SBF:   0000000000000000 R_SBF_64_64 .L.str
+
+; CHECK-RELOC-SBFv2: RELOCATION RECORDS FOR [.data.rel.ro]:
+; CHECK-RELOC-SBFv2: 0000000000000000 R_SBF_64_ABS64 .L.str
diff --git a/llvm/test/CodeGen/SBF/reloc-btf-2.ll b/llvm/test/CodeGen/SBF/reloc-btf-2.ll
new file mode 100644
index 0000000000000..121c930dc759d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/reloc-btf-2.ll
@@ -0,0 +1,63 @@
+; RUN: llc -march=bpfel -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -march=bpfeb -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+: TODO: BTF disabled for sbf as of 559ff25f978a675230cc2dbcc18851424ace7fb9.
+: TODO: Remove this test when we know BTF is gone for good.
+: XFAIL: *
+
+; source code:
+;   int g __attribute__((section("ids"))) = 4;
+;   static volatile int s = 0;
+;   int test() {
+;     return g + s;
+;   }
+; compilation flag:
+;   clang -target bpf -g -O2 -emit-llvm -S test.c
+
+@g = dso_local local_unnamed_addr global i32 4, section "ids", align 4, !dbg !0
+@s = internal global i32 0, align 4, !dbg !6
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !14 {
+  %1 = load i32, i32* @g, align 4, !dbg !17, !tbaa !18
+  %2 = load volatile i32, i32* @s, align 4, !dbg !22, !tbaa !18
+  %3 = add nsw i32 %2, %1, !dbg !23
+  ret i32 %3, !dbg !24
+}
+
+; CHECK-RELOC: file format elf64-bpf
+; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF]:
+; CHECK-RELOC: R_BPF_64_NODYLD32 .bss
+; CHECK-RELOC: R_BPF_64_NODYLD32 g
+; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF.ext]:
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 1, type: !9, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/relocation")
+!4 = !{}
+!5 = !{!0, !6}
+!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
+!7 = distinct !DIGlobalVariable(name: "s", scope: !2, file: !3, line: 2, type: !8, isLocal: true, isDefinition: true)
+!8 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !9)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)"}
+!14 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 3, type: !15, scopeLine: 3, isLocal: false, isDefinition: true, isOptimized: true, unit: !2, retainedNodes: !4)
+!15 = !DISubroutineType(types: !16)
+!16 = !{!9}
+!17 = !DILocation(line: 4, column: 10, scope: !14)
+!18 = !{!19, !19, i64 0}
+!19 = !{!"int", !20, i64 0}
+!20 = !{!"omnipotent char", !21, i64 0}
+!21 = !{!"Simple C/C++ TBAA"}
+!22 = !DILocation(line: 4, column: 14, scope: !14)
+!23 = !DILocation(line: 4, column: 12, scope: !14)
+!24 = !DILocation(line: 4, column: 3, scope: !14)
diff --git a/llvm/test/CodeGen/SBF/reloc-btf.ll b/llvm/test/CodeGen/SBF/reloc-btf.ll
new file mode 100644
index 0000000000000..aa929257e0399
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/reloc-btf.ll
@@ -0,0 +1,33 @@
+; RUN: llc -march=bpfel -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
+entry:
+  ret i32 0, !dbg !11
+}
+
+; CHECK-RELOC: file format elf64-bpf
+; CHECK-RELOC: RELOCATION RECORDS FOR [.debug_info]:
+; CHECK-RELOC: R_BPF_64_ABS32 .debug_abbrev
+; CHECK-RELOC: R_BPF_64_ABS64 .text
+; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF.ext]:
+; CHECK-RELOC: R_BPF_64_NODYLD32 .text
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "tt.c", directory: "/home/yhs/tmp")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 350573) (llvm/trunk 350569)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DILocation(line: 1, column: 14, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/reloc.ll b/llvm/test/CodeGen/SBF/reloc.ll
new file mode 100644
index 0000000000000..13082600c9834
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/reloc.ll
@@ -0,0 +1,43 @@
+; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+
+%struct.bpf_context = type { i64, i64, i64, i64, i64, i64, i64 }
+%struct.sk_buff = type { i64, i64, i64, i64, i64, i64, i64 }
+%struct.net_device = type { i64, i64, i64, i64, i64, i64, i64 }
+
+@bpf_prog1.devname = private unnamed_addr constant [3 x i8] c"lo\00", align 1
+@bpf_prog1.fmt = private unnamed_addr constant [15 x i8] c"skb %x dev %x\0A\00", align 1
+
+; Function Attrs: norecurse
+define i32 @bpf_prog1(%struct.bpf_context* nocapture %ctx) #0 section "events/net/netif_receive_skb" {
+  %devname = alloca [3 x i8], align 1
+  %fmt = alloca [15 x i8], align 1
+  %1 = getelementptr inbounds [3 x i8], [3 x i8]* %devname, i64 0, i64 0
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @bpf_prog1.devname, i64 0, i64 0), i64 3, i1 false)
+  %2 = getelementptr inbounds %struct.bpf_context, %struct.bpf_context* %ctx, i64 0, i32 0
+  %3 = load i64, i64* %2, align 8
+  %4 = inttoptr i64 %3 to %struct.sk_buff*
+  %5 = getelementptr inbounds %struct.sk_buff, %struct.sk_buff* %4, i64 0, i32 2
+  %6 = bitcast i64* %5 to i8*
+  %7 = call i8* inttoptr (i64 4 to i8* (i8*)*)(i8* %6) #1
+  %8 = call i32 inttoptr (i64 9 to i32 (i8*, i8*, i32)*)(i8* %7, i8* %1, i32 2) #1
+  %9 = icmp eq i32 %8, 0
+  br i1 %9, label %10, label %13
+
+; <label>:10                                      ; preds = %0
+  %11 = getelementptr inbounds [15 x i8], [15 x i8]* %fmt, i64 0, i64 0
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %11, i8* getelementptr inbounds ([15 x i8], [15 x i8]* @bpf_prog1.fmt, i64 0, i64 0), i64 15, i1 false)
+  %12 = call i32 (i8*, i32, ...) inttoptr (i64 11 to i32 (i8*, i32, ...)*)(i8* %11, i32 15, %struct.sk_buff* %4, i8* %7) #1
+  br label %13
+
+; <label>:13                                      ; preds = %10, %0
+  ret i32 0
+
+; CHECK-RELOC: file format elf64-sbf
+; CHECK-RELOC: RELOCATION RECORDS FOR [.eh_frame]:
+; CHECK-RELOC: 00000000000001c R_SBF_64_64
+}
+
+; Function Attrs: nounwind
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1) #1
+
+attributes #0 = { norecurse }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_1.ll b/llvm/test/CodeGen/SBF/remove_truncate_1.ll
new file mode 100644
index 0000000000000..55555c491b046
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_1.ll
@@ -0,0 +1,87 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; struct xdp_md {
+;   unsigned data;
+;   unsigned data_end;
+; };
+;
+; int gbl;
+; int xdp_dummy(struct xdp_md *xdp)
+; {
+;   char tmp;
+;   long addr;
+;
+;   if (gbl) {
+;     long addr1 = (long)xdp->data;
+;     tmp = *(char *)addr1;
+;     if (tmp == 1)
+;       return 3;
+;   } else {
+;     tmp = *(volatile char *)(long)xdp->data_end;
+;     if (tmp == 1)
+;       return 2;
+;   }
+;   addr = (long)xdp->data;
+;   tmp = *(volatile char *)addr;
+;   if (tmp == 0)
+;     return 1;
+;   return 0;
+; }
+
+%struct.xdp_md = type { i32, i32 }
+
+@gbl = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind
+define i32 @xdp_dummy(%struct.xdp_md* nocapture readonly %xdp) local_unnamed_addr #0 {
+entry:
+  %0 = load i32, i32* @gbl, align 4
+  %tobool = icmp eq i32 %0, 0
+  br i1 %tobool, label %if.else, label %if.then
+
+if.then:                                          ; preds = %entry
+  %data = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %xdp, i64 0, i32 0
+  %1 = load i32, i32* %data, align 4
+  %conv = zext i32 %1 to i64
+  %2 = inttoptr i64 %conv to i8*
+  %3 = load i8, i8* %2, align 1
+  %cmp = icmp eq i8 %3, 1
+  br i1 %cmp, label %cleanup20, label %if.end12
+; CHECK:  r1 = *(u32 *)(r1 + 0)
+; CHECK:  r2 = *(u8 *)(r1 + 0)
+
+if.else:                                          ; preds = %entry
+  %data_end = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %xdp, i64 0, i32 1
+  %4 = load i32, i32* %data_end, align 4
+  %conv6 = zext i32 %4 to i64
+; CHECK:  r2 = *(u32 *)(r1 + 4)
+  %5 = inttoptr i64 %conv6 to i8*
+  %6 = load volatile i8, i8* %5, align 1
+  %cmp8 = icmp eq i8 %6, 1
+  br i1 %cmp8, label %cleanup20, label %if.else.if.end12_crit_edge
+
+if.else.if.end12_crit_edge:                       ; preds = %if.else
+  %data13.phi.trans.insert = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %xdp, i64 0, i32 0
+  %.pre = load i32, i32* %data13.phi.trans.insert, align 4
+  br label %if.end12
+; CHECK: r1 = *(u32 *)(r1 + 0)
+
+if.end12:                                         ; preds = %if.else.if.end12_crit_edge, %if.then
+  %7 = phi i32 [ %.pre, %if.else.if.end12_crit_edge ], [ %1, %if.then ]
+  %conv14 = zext i32 %7 to i64
+; CHECK-NOT: r1 <<= 32
+; CHECK-NOT: r1 >>= 32
+  %8 = inttoptr i64 %conv14 to i8*
+  %9 = load volatile i8, i8* %8, align 1
+; CHECK:  r1 = *(u8 *)(r1 + 0)
+  %cmp16 = icmp eq i8 %9, 0
+  %.28 = zext i1 %cmp16 to i32
+  br label %cleanup20
+
+cleanup20:                                        ; preds = %if.then, %if.end12, %if.else
+  %retval.1 = phi i32 [ 3, %if.then ], [ 2, %if.else ], [ %.28, %if.end12 ]
+  ret i32 %retval.1
+}
+
+attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_2.ll b/llvm/test/CodeGen/SBF/remove_truncate_2.ll
new file mode 100644
index 0000000000000..ece436ea663ed
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_2.ll
@@ -0,0 +1,65 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; struct xdp_md {
+;   unsigned data;
+;   unsigned data_end;
+; };
+;
+; int gbl;
+; int xdp_dummy(struct xdp_md *xdp)
+; {
+;   char addr = *(char *)(long)xdp->data;
+;   if (gbl) {
+;     if (gbl == 1)
+;       return 1;
+;     if (addr == 1)
+;       return 3;
+;   } else if (addr == 0)
+;     return 2;
+;   return 0;
+; }
+
+%struct.xdp_md = type { i32, i32 }
+
+@gbl = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind readonly
+define i32 @xdp_dummy(%struct.xdp_md* nocapture readonly %xdp) local_unnamed_addr #0 {
+entry:
+  %data = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %xdp, i64 0, i32 0
+  %0 = load i32, i32* %data, align 4
+  %conv = zext i32 %0 to i64
+  %1 = inttoptr i64 %conv to i8*
+  %2 = load i8, i8* %1, align 1
+; CHECK:  r1 = *(u32 *)(r1 + 0)
+; CHECK:  r1 = *(u8 *)(r1 + 0)
+  %3 = load i32, i32* @gbl, align 4
+  switch i32 %3, label %if.end [
+    i32 0, label %if.else
+    i32 1, label %cleanup
+  ]
+
+if.end:                                           ; preds = %entry
+  %cmp4 = icmp eq i8 %2, 1
+; CHECK:  r0 = 3
+; CHECK-NOT:  r1 &= 255
+; CHECK:  if r1 == 1 goto
+  br i1 %cmp4, label %cleanup, label %if.end13
+
+if.else:                                          ; preds = %entry
+  %cmp9 = icmp eq i8 %2, 0
+; CHECK:  r0 = 2
+; CHECK-NOT:  r1 &= 255
+; CHECK:  if r1 == 0 goto
+  br i1 %cmp9, label %cleanup, label %if.end13
+
+if.end13:                                         ; preds = %if.else, %if.end
+  br label %cleanup
+
+cleanup:                                          ; preds = %if.else, %if.end, %entry, %if.end13
+  %retval.0 = phi i32 [ 0, %if.end13 ], [ 1, %entry ], [ 3, %if.end ], [ 2, %if.else ]
+  ret i32 %retval.0
+}
+
+attributes #0 = { norecurse nounwind readonly }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_3.ll b/llvm/test/CodeGen/SBF/remove_truncate_3.ll
new file mode 100644
index 0000000000000..c1393fbefe4bd
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_3.ll
@@ -0,0 +1,106 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; struct xdp_md {
+;   unsigned data;
+;   unsigned data_end;
+; };
+;
+; int gbl;
+; int xdp_dummy(struct xdp_md *xdp)
+; {
+;   char tmp;
+;   long addr;
+;
+;   if (gbl) {
+;     long addr1 = (long)xdp->data;
+;     tmp = *(char *)addr1;
+;     if (tmp == 1)
+;       return 3;
+;   } else {
+;     tmp = *(volatile char *)(long)xdp->data_end;
+;     if (tmp == 1)
+;       return 2;
+;   }
+;   addr = (long)xdp->data;
+;   tmp = *(volatile char *)addr;
+;   if (tmp == 0)
+;     return 1;
+;   return 0;
+; }
+;
+; unsigned int rol32(unsigned int word, unsigned int shift)
+; {
+;   return (word << shift) | (word >> ((-shift) & 31));
+; }
+%struct.xdp_md = type { i32, i32 }
+
+@gbl = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind
+define i32 @xdp_dummy(%struct.xdp_md* nocapture readonly) local_unnamed_addr #0 {
+  %2 = load i32, i32* @gbl, align 4
+  %3 = icmp eq i32 %2, 0
+  br i1 %3, label %11, label %4
+
+; <label>:4:                                      ; preds = %1
+  %5 = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %0, i64 0, i32 0
+  %6 = load i32, i32* %5, align 4
+  %7 = zext i32 %6 to i64
+  %8 = inttoptr i64 %7 to i8*
+  %9 = load i8, i8* %8, align 1
+  %10 = icmp eq i8 %9, 1
+  br i1 %10, label %28, label %23
+; CHECK:  r1 = *(u32 *)(r1 + 0)
+; CHECK:  r2 = *(u8 *)(r1 + 0)
+
+; <label>:11:                                     ; preds = %1
+  %12 = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %0, i64 0, i32 1
+  %13 = load i32, i32* %12, align 4
+  %14 = zext i32 %13 to i64
+; CHECK:  r2 = *(u32 *)(r1 + 4)
+  %15 = inttoptr i64 %14 to i8*
+  %16 = load volatile i8, i8* %15, align 1
+; CHECK:  r2 = *(u8 *)(r2 + 0)
+  %17 = icmp eq i8 %16, 1
+  br i1 %17, label %28, label %18
+
+; <label>:18:                                     ; preds = %11
+  %19 = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %0, i64 0, i32 0
+  %20 = load i32, i32* %19, align 4
+  %21 = zext i32 %20 to i64
+  %22 = inttoptr i64 %21 to i8*
+  br label %23
+; CHECK: r1 = *(u32 *)(r1 + 0)
+
+; <label>:23:                                     ; preds = %18, %4
+  %24 = phi i8* [ %22, %18 ], [ %8, %4 ]
+; CHECK-NOT: r1 <<= 32
+; CHECK-NOT: r1 >>= 32
+  %25 = load volatile i8, i8* %24, align 1
+; CHECK:  r1 = *(u8 *)(r1 + 0)
+  %26 = icmp eq i8 %25, 0
+  %27 = zext i1 %26 to i32
+  br label %28
+
+; <label>:28:                                     ; preds = %4, %23, %11
+  %29 = phi i32 [ 3, %4 ], [ 2, %11 ], [ %27, %23 ]
+  ret i32 %29
+}
+
+; Function Attrs: norecurse nounwind readnone
+define i32 @rol32(i32, i32) local_unnamed_addr #1 {
+  %3 = shl i32 %0, %1
+; CHECK: r1 <<= 32
+; CHECK: r1 >>= 32
+  %4 = sub i32 0, %1
+  %5 = and i32 %4, 31
+  %6 = lshr i32 %0, %5
+; CHECK: r0 <<= 32
+; CHECK: r0 >>= 32
+  %7 = or i32 %6, %3
+  ret i32 %7
+}
+
+attributes #0 = { norecurse nounwind }
+attributes #1 = { norecurse nounwind readnone }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_5.ll b/llvm/test/CodeGen/SBF/remove_truncate_5.ll
new file mode 100644
index 0000000000000..d9160bd3b44a6
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_5.ll
@@ -0,0 +1,50 @@
+; RUN: llc < %s -march=sbf | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+; struct test_t {
+;       int a;
+;       char b;
+;       int c;
+;       char d;
+; };
+; void foo(void *);
+; void test() {
+;       struct test_t t = {.a = 5};
+;       foo(&t);
+; }
+
+%struct.test_t = type { i32, i8, i32, i8 }
+
+@test.t = private unnamed_addr constant %struct.test_t { i32 5, i8 0, i32 0, i8 0 }, align 4
+
+; Function Attrs: nounwind
+define dso_local void @test() local_unnamed_addr #0 {
+; CHECK-LABEL: test:
+  %1 = alloca %struct.test_t, align 4
+  %2 = bitcast %struct.test_t* %1 to i8*
+  call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %2) #3
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 4 %2, i8* align 4 bitcast (%struct.test_t* @test.t to i8*), i64 16, i1 false)
+; CHECK: r1 = 0
+; CHECK: *(u64 *)(r10 - 8) = r1
+; CHECK: r1 = 5
+; CHECK: *(u64 *)(r10 - 16) = r1
+  call void @foo(i8* nonnull %2) #3
+; CHECK: call foo
+  call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %2) #3
+  ret void
+}
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #1
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
+
+declare dso_local void @foo(i8*) local_unnamed_addr
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
+attributes #3 = { nounwind }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_6.ll b/llvm/test/CodeGen/SBF/remove_truncate_6.ll
new file mode 100644
index 0000000000000..3b984edc1b50d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_6.ll
@@ -0,0 +1,80 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck --check-prefix=CHECK-32 %s
+;
+; void cal1(unsigned short *a, unsigned long *b, unsigned int k)
+; {
+;   unsigned short e;
+;
+;   e = *a;
+;   for (unsigned int i = 0; i < k; i++) {
+;     b[i] = e;
+;     e = ~e;
+;   }
+; }
+;
+; void cal2(unsigned short *a, unsigned int *b, unsigned int k)
+; {
+;   unsigned short e;
+;
+;   e = *a;
+;   for (unsigned int i = 0; i < k; i++) {
+;     b[i] = e;
+;     e = ~e;
+;   }
+; }
+
+; Function Attrs: nofree norecurse nounwind optsize
+define dso_local void @cal1(i16* nocapture readonly %a, i64* nocapture %b, i32 %k) local_unnamed_addr #0 {
+entry:
+  %cmp8 = icmp eq i32 %k, 0
+  br i1 %cmp8, label %for.cond.cleanup, label %for.body.preheader
+
+for.body.preheader:                               ; preds = %entry
+  %0 = load i16, i16* %a, align 2
+  %wide.trip.count = zext i32 %k to i64
+  br label %for.body
+
+for.cond.cleanup:                                 ; preds = %for.body, %entry
+  ret void
+
+for.body:                                         ; preds = %for.body, %for.body.preheader
+  %indvars.iv = phi i64 [ 0, %for.body.preheader ], [ %indvars.iv.next, %for.body ]
+  %e.09 = phi i16 [ %0, %for.body.preheader ], [ %neg, %for.body ]
+  %conv = zext i16 %e.09 to i64
+  %arrayidx = getelementptr inbounds i64, i64* %b, i64 %indvars.iv
+; CHECK: r{{[0-9]+}} &= 65535
+; CHECK-32: r{{[0-9]+}} &= 65535
+  store i64 %conv, i64* %arrayidx, align 8
+  %neg = xor i16 %e.09, -1
+  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
+  %exitcond = icmp eq i64 %indvars.iv.next, %wide.trip.count
+  br i1 %exitcond, label %for.cond.cleanup, label %for.body
+}
+
+; Function Attrs: nofree norecurse nounwind optsize
+define dso_local void @cal2(i16* nocapture readonly %a, i32* nocapture %b, i32 %k) local_unnamed_addr #0 {
+entry:
+  %cmp8 = icmp eq i32 %k, 0
+  br i1 %cmp8, label %for.cond.cleanup, label %for.body.preheader
+
+for.body.preheader:                               ; preds = %entry
+  %0 = load i16, i16* %a, align 2
+  %wide.trip.count = zext i32 %k to i64
+  br label %for.body
+
+for.cond.cleanup:                                 ; preds = %for.body, %entry
+  ret void
+
+for.body:                                         ; preds = %for.body, %for.body.preheader
+  %indvars.iv = phi i64 [ 0, %for.body.preheader ], [ %indvars.iv.next, %for.body ]
+  %e.09 = phi i16 [ %0, %for.body.preheader ], [ %neg, %for.body ]
+  %conv = zext i16 %e.09 to i32
+  %arrayidx = getelementptr inbounds i32, i32* %b, i64 %indvars.iv
+; CHECK: r{{[0-9]+}} &= 65535
+; CHECK-32: w{{[0-9]+}} &= 65535
+  store i32 %conv, i32* %arrayidx, align 4
+  %neg = xor i16 %e.09, -1
+  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
+  %exitcond = icmp eq i64 %indvars.iv.next, %wide.trip.count
+  br i1 %exitcond, label %for.cond.cleanup, label %for.body
+}
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_7.ll b/llvm/test/CodeGen/SBF/remove_truncate_7.ll
new file mode 100644
index 0000000000000..1a451d75ab833
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_7.ll
@@ -0,0 +1,55 @@
+; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+;
+; Source:
+;  struct __sk_buff {
+;    unsigned data;
+;    unsigned data_end;
+;  };
+;
+;  void * test(int flag, struct __sk_buff *skb)
+;  {
+;    void *p;
+;
+;    if (flag) {
+;      p = (void *)(long)skb->data;
+;      __asm__ __volatile__("": : :"memory");
+;    } else {
+;      p = (void *)(long)skb->data_end;
+;      __asm__ __volatile__("": : :"memory");
+;    }
+;
+;    return p;
+;  }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c
+
+%struct.__sk_buff = type { i32, i32 }
+
+define dso_local i8* @test(i32 %flag, %struct.__sk_buff* nocapture readonly %skb) local_unnamed_addr {
+entry:
+  %tobool = icmp eq i32 %flag, 0
+  br i1 %tobool, label %if.else, label %if.then
+
+if.then:
+  %data = getelementptr inbounds %struct.__sk_buff, %struct.__sk_buff* %skb, i64 0, i32 0
+  %0 = load i32, i32* %data, align 4
+  tail call void asm sideeffect "", "~{memory}"()
+  br label %if.end
+
+if.else:
+  %data_end = getelementptr inbounds %struct.__sk_buff, %struct.__sk_buff* %skb, i64 0, i32 1
+  %1 = load i32, i32* %data_end, align 4
+  tail call void asm sideeffect "", "~{memory}"()
+  br label %if.end
+
+if.end:
+  %p.0.in.in = phi i32 [ %0, %if.then ], [ %1, %if.else ]
+  %p.0.in = zext i32 %p.0.in.in to i64
+  %p.0 = inttoptr i64 %p.0.in to i8*
+  ret i8* %p.0
+}
+
+; CHECK:       w0 = *(u32 *)(r2 + 0)
+; CHECK:       w0 = *(u32 *)(r2 + 4)
+; CHECK-NOT:   r[[#]] = w[[#]]
+; CHECK:       exit
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_8.ll b/llvm/test/CodeGen/SBF/remove_truncate_8.ll
new file mode 100644
index 0000000000000..19558b719b5a9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/remove_truncate_8.ll
@@ -0,0 +1,41 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+; Source Code:
+;   struct loc_prog {
+;     unsigned int ip;
+;     int len;
+;   };
+;   int exec_prog(struct loc_prog *prog) {
+;     if (prog->ip < prog->len) {
+;       int x = prog->ip;
+;       if (x < 3)
+;         prog->ip += 2;
+;     }
+;     return 3;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c
+
+%struct.loc_prog = type { i32, i32 }
+
+; Function Attrs: nofree norecurse nounwind willreturn
+define dso_local i32 @exec_prog(%struct.loc_prog* nocapture %prog) local_unnamed_addr {
+entry:
+  %ip = getelementptr inbounds %struct.loc_prog, %struct.loc_prog* %prog, i64 0, i32 0
+  %0 = load i32, i32* %ip, align 4
+  %len = getelementptr inbounds %struct.loc_prog, %struct.loc_prog* %prog, i64 0, i32 1
+  %1 = load i32, i32* %len, align 4
+  %cmp = icmp ult i32 %0, %1
+  %cmp2 = icmp slt i32 %0, 3
+  %or.cond = and i1 %cmp2, %cmp
+; CHECK: r{{[0-9]+}} <<= 32
+; CHECK: r{{[0-9]+}} s>>= 32
+  br i1 %or.cond, label %if.then3, label %if.end5
+
+if.then3:                                         ; preds = %entry
+  %add = add nsw i32 %0, 2
+  store i32 %add, i32* %ip, align 4
+  br label %if.end5
+
+if.end5:                                          ; preds = %if.then3, %entry
+  ret i32 3
+}
diff --git a/llvm/test/CodeGen/SBF/rodata_1.ll b/llvm/test/CodeGen/SBF/rodata_1.ll
new file mode 100644
index 0000000000000..af93306d2acec
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_1.ll
@@ -0,0 +1,55 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; struct test_t1 {
+;   char a, b, c;
+; };
+; struct test_t2 {
+;   int a, b, c, d, e;
+; };
+;
+; struct test_t1 g1;
+; struct test_t2 g2;
+; int test()
+; {
+;   struct test_t1 t1 = {.c = 1};
+;   struct test_t2 t2 = {.c = 1};
+;   g1 = t1;
+;   g2 = t2;
+;   return 0;
+; }
+
+%struct.test_t1 = type { i8, i8, i8 }
+%struct.test_t2 = type { i32, i32, i32, i32, i32 }
+
+@test.t1 = private unnamed_addr constant %struct.test_t1 { i8 0, i8 0, i8 1 }, align 1
+@test.t2 = private unnamed_addr constant %struct.test_t2 { i32 0, i32 0, i32 1, i32 0, i32 0 }, align 4
+@g1 = common local_unnamed_addr global %struct.test_t1 zeroinitializer, align 1
+@g2 = common local_unnamed_addr global %struct.test_t2 zeroinitializer, align 4
+
+; Function Attrs: nounwind
+define i32 @test() local_unnamed_addr #0 {
+; CHECK-LABEL: test:
+
+entry:
+    tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* getelementptr inbounds (%struct.test_t1, %struct.test_t1* @g1, i64 0, i32 0), i8* getelementptr inbounds (%struct.test_t1, %struct.test_t1* @test.t1, i64 0, i32 0), i64 3, i1 false)
+    tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 bitcast (%struct.test_t2* @g2 to i8*), i8* align 4 bitcast (%struct.test_t2* @test.t2 to i8*), i64 20, i1 false)
+; CHECK: r1 = g1 ll
+; CHECK: r2 = 1
+; CHECK: *(u8 *)(r1 + 2) = r2
+; CHECK: r3 = 0
+; CHECK: *(u16 *)(r1 + 0) = r3
+
+; CHECK: r1 = g2 ll
+; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: *(u64 *)(r1 + 8) = r2
+; CHECK: *(u32 *)(r1 + 16) = r3
+
+    ret i32 0
+}
+; CHECK: .section  .rodata,"a",@progbits
+
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
diff --git a/llvm/test/CodeGen/SBF/rodata_2.ll b/llvm/test/CodeGen/SBF/rodata_2.ll
new file mode 100644
index 0000000000000..3be522ac100a3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_2.ll
@@ -0,0 +1,51 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; struct test_t1 {
+;   char a;
+;   int  b;
+; };
+; struct test_t2 {
+;   char a, b;
+;   struct test_t1 c[2];
+;   int d[2];
+;   int e;
+; };
+; struct test_t2 g;
+; int test()
+; {
+;    struct test_t2 t2 = {.c = {{}, {.b = 1}}, .d = {2, 3}};
+;    g = t2;
+;    return 0;
+; }
+
+%struct.test_t2 = type { i8, i8, [2 x %struct.test_t1], [2 x i32], i32 }
+%struct.test_t1 = type { i8, i32 }
+
+@test.t2 = private unnamed_addr constant %struct.test_t2 { i8 0, i8 0, [2 x %struct.test_t1] [%struct.test_t1 zeroinitializer, %struct.test_t1 { i8 0, i32 1 }], [2 x i32] [i32 2, i32 3], i32 0 }, align 4
+@g = common local_unnamed_addr global %struct.test_t2 zeroinitializer, align 4
+
+; Function Attrs: nounwind
+define i32 @test() local_unnamed_addr #0 {
+; CHECK-LABEL: test:
+
+entry:
+    tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 getelementptr inbounds (%struct.test_t2, %struct.test_t2* @g, i64 0, i32 0), i8* align 4 getelementptr inbounds (%struct.test_t2, %struct.test_t2* @test.t2, i64 0, i32 0), i64 32, i1 false)
+; CHECK: r1 = g ll
+; CHECK: r2 = 3
+; CHECK: *(u64 *)(r1 + 24) = r2
+; CHECK: r2 = 8589934593 ll   
+; CHECK: *(u64 *)(r1 + 16) = r2
+; CHECK: r2 = 0
+; CHECK: *(u64 *)(r1 + 8) = r2
+; CHECK: *(u64 *)(r1 + 0) = r2
+; CHECK: r0 = 0
+
+      ret i32 0
+}
+; CHECK: .section  .rodata.cst32,"aM",@progbits,32
+
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
diff --git a/llvm/test/CodeGen/SBF/rodata_3.ll b/llvm/test/CodeGen/SBF/rodata_3.ll
new file mode 100644
index 0000000000000..578bb5eea7835
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_3.ll
@@ -0,0 +1,40 @@
+; REQUIRES: x86_64-linux
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck --check-prefix=CHECK-EL %s
+;
+; This test requires little-endian host, so we specific x86_64-linux here.
+; Source code:
+; struct test_t1 {
+;   char a;
+;   int b, c, d;
+; };
+;
+; struct test_t1 g;
+; int test()
+; {
+;   struct test_t1 t1 = {.a = 1};
+;   g = t1;
+;   return 0;
+; }
+
+%struct.test_t1 = type { i8, i32, i32, i32 }
+
+@test.t1 = private unnamed_addr constant %struct.test_t1 { i8 1, i32 0, i32 0, i32 0 }, align 4
+@g = common local_unnamed_addr global %struct.test_t1 zeroinitializer, align 4
+
+; Function Attrs: nounwind
+define i32 @test() local_unnamed_addr #0 {
+entry:
+    tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 getelementptr inbounds (%struct.test_t1, %struct.test_t1* @g, i64 0, i32 0), i8* align 4 getelementptr inbounds (%struct.test_t1, %struct.test_t1* @test.t1, i64 0, i32 0), i64 16, i1 false)
+; CHECK-EL: r1 = g ll
+; CHECK-EL: r2 = 0
+; CHECK-EL: *(u64 *)(r1 + 8) = r2
+; CHECK-EL: r2 = 1
+; CHECK-EL: *(u64 *)(r1 + 0) = r2
+    ret i32 0
+}
+; CHECK-EL:  .section .rodata.cst16,"aM",@progbits,16
+
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
diff --git a/llvm/test/CodeGen/SBF/rodata_4.ll b/llvm/test/CodeGen/SBF/rodata_4.ll
new file mode 100644
index 0000000000000..e438dcb8f56d4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_4.ll
@@ -0,0 +1,43 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+; Source code:
+; struct test_t1
+; {
+;   short a;
+;   short b;
+;   char c;
+; };
+;
+; struct test_t1 g;
+; int test()
+; {
+;   struct test_t1 t1[] = {{50, 500, 5}, {60, 600, 6}, {70, 700, 7}, {80, 800, 8} };
+;
+;   g = t1[1];
+;   return 0;
+; }
+
+%struct.test_t1 = type { i16, i16, i8 }
+
+@test.t1 = private unnamed_addr constant [4 x %struct.test_t1] [%struct.test_t1 { i16 50, i16 500, i8 5 }, %struct.test_t1 { i16 60, i16 600, i8 6 }, %struct.test_t1 { i16 70, i16 700, i8 7 }, %struct.test_t1 { i16 80, i16 800, i8 8 }], align 2
+@g = common local_unnamed_addr global %struct.test_t1 zeroinitializer, align 2
+
+; Function Attrs: nounwind
+define i32 @test() local_unnamed_addr #0 {
+; CHECK-LABEL: test:
+entry:
+  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 2 bitcast (%struct.test_t1* @g to i8*), i8* align 2 bitcast (%struct.test_t1* getelementptr inbounds ([4 x %struct.test_t1], [4 x %struct.test_t1]* @test.t1, i64 0, i64 1) to i8*), i64 6, i1 false)
+; CHECK: r1 = g ll
+; CHECK: r2 = 6
+; CHECK: *(u16 *)(r1 + 4) = r2
+; CHECK: r2 = 39321660
+; CHECK: *(u32 *)(r1 + 0) = r2
+  ret i32 0
+}
+; CHECK:  .section  .rodata,"a",@progbits
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
diff --git a/llvm/test/CodeGen/SBF/rodata_5.ll b/llvm/test/CodeGen/SBF/rodata_5.ll
new file mode 100644
index 0000000000000..8a88dc077c0bc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_5.ll
@@ -0,0 +1,49 @@
+; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+;
+; Source Code:
+;   struct t {
+;     unsigned char a;
+;     unsigned char b;
+;     unsigned char c;
+;   };
+;   extern void foo(void *);
+;   int test() {
+;     struct t v = {
+;       .b = 2,
+;     };
+;     foo(&v);
+;     return 0;
+;   }
+; Compilation flag:
+;  clang -target bpf -O2 -S -emit-llvm t.c
+
+%struct.t = type { i8, i8, i8 }
+
+@__const.test.v = private unnamed_addr constant %struct.t { i8 0, i8 2, i8 0 }, align 1
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr {
+entry:
+  %v1 = alloca [3 x i8], align 1
+  %v1.sub = getelementptr inbounds [3 x i8], [3 x i8]* %v1, i64 0, i64 0
+  call void @llvm.lifetime.start.p0i8(i64 3, i8* nonnull %v1.sub)
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 1 dereferenceable(3) %v1.sub, i8* nonnull align 1 dereferenceable(3) getelementptr inbounds (%struct.t, %struct.t* @__const.test.v, i64 0, i32 0), i64 3, i1 false)
+  call void @foo(i8* nonnull %v1.sub)
+  call void @llvm.lifetime.end.p0i8(i64 3, i8* nonnull %v1.sub)
+  ret i32 0
+}
+; CHECK-NOT:    w{{[0-9]+}} = *(u16 *)
+; CHECK-NOT:    w{{[0-9]+}} = *(u8 *)
+; CHECK:        *(u8 *)(r10 - 2) = w{{[0-9]+}}
+; CHECK:        *(u16 *)(r10 - 4) = w{{[0-9]+}}
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture)
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* noalias nocapture writeonly, i8* noalias nocapture readonly, i64, i1 immarg)
+
+declare dso_local void @foo(i8*) local_unnamed_addr
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture)
diff --git a/llvm/test/CodeGen/SBF/rodata_6.ll b/llvm/test/CodeGen/SBF/rodata_6.ll
new file mode 100644
index 0000000000000..fa4d690f730a6
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_6.ll
@@ -0,0 +1,25 @@
+; RUN: llc -march=sbf < %s | FileCheck %s
+;
+; Source code:
+;   struct t1 { int a; };
+;   struct t1 data = { .a = 3 };
+;   int foo(void) {
+;     return data.a + 20;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm test.c
+
+%struct.t1 = type { i32 }
+
+@data = dso_local local_unnamed_addr global %struct.t1 { i32 3 }, align 4
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @foo() local_unnamed_addr {
+entry:
+  %0 = load i32, i32* getelementptr inbounds (%struct.t1, %struct.t1* @data, i64 0, i32 0), align 4
+  %add = add nsw i32 %0, 20
+; CHECK:   [[REG1:r[0-9]+]] = data ll
+; CHECK:   r0 = *(u32 *)([[REG1]] + 0)
+; CHECK:   r0 += 20
+  ret i32 %add
+}
diff --git a/llvm/test/CodeGen/SBF/rodata_7.ll b/llvm/test/CodeGen/SBF/rodata_7.ll
new file mode 100644
index 0000000000000..9945f397b3508
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/rodata_7.ll
@@ -0,0 +1,25 @@
+; RUN: llc -march=sbf < %s | FileCheck %s
+;
+; Source code:
+;   struct t1 { int a; };
+;   volatile const struct t1 data = { .a = 3 };
+;   int foo(void) {
+;     return data.a + 20;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm test.c
+
+%struct.t1 = type { i32 }
+
+@data = dso_local constant %struct.t1 { i32 3 }, align 4
+
+; Function Attrs: nofree norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr {
+entry:
+  %0 = load volatile i32, i32* getelementptr inbounds (%struct.t1, %struct.t1* @data, i64 0, i32 0), align 4
+  %add = add nsw i32 %0, 20
+; CHECK:   [[REG1:r[0-9]+]] = data ll
+; CHECK:   r0 = *(u32 *)([[REG1]] + 0)
+; CHECK:   r0 += 20
+  ret i32 %add
+}
diff --git a/llvm/test/CodeGen/SBF/sanity.ll b/llvm/test/CodeGen/SBF/sanity.ll
new file mode 100644
index 0000000000000..e1f9449598b07
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/sanity.ll
@@ -0,0 +1,117 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+@foo_printf.fmt = private unnamed_addr constant [9 x i8] c"hello  \0A\00", align 1
+
+; Function Attrs: nounwind readnone uwtable
+define i32 @foo_int(i32 %a, i32 %b) #0 {
+  %1 = add nsw i32 %b, %a
+  ret i32 %1
+; CHECK-LABEL: foo_int:
+; CHECK: r0 += r1
+}
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @foo_char(i8 signext %a, i8 signext %b) #0 {
+  %1 = add i8 %b, %a
+  ret i8 %1
+; CHECK-LABEL: foo_char:
+; CHECK: r0 += r1
+; CHECK: r0 <<= 56
+; CHECK: r0 s>>= 56
+}
+
+; Function Attrs: nounwind readnone uwtable
+define i64 @foo_ll(i64 %a, i64 %b, i64 %c) #0 {
+  %1 = add nsw i64 %b, %a
+  %2 = sub i64 %1, %c
+  ret i64 %2
+; CHECK-LABEL: foo_ll:
+; CHECK: r0 = r2
+; CHECK: r0 += r1
+; CHECK: r0 -= r3
+}
+
+; Function Attrs: nounwind uwtable
+define void @foo_call2(i32 %a, i32 %b) #1 {
+  %1 = trunc i32 %b to i8
+  tail call void @foo_2arg(i8 signext %1, i32 %a) #3
+  ret void
+; CHECK-LABEL: foo_call2:
+; CHECK: r2 <<= 56
+; CHECK: r2 s>>= 56
+; CHECK: r1 = r2
+}
+
+declare void @foo_2arg(i8 signext, i32) #2
+
+; Function Attrs: nounwind uwtable
+define i32 @foo_call5(i8 signext %a, i16 signext %b, i32 %c, i64 %d) #1 {
+  %1 = tail call i32 @bar(i8 signext %a, i16 signext %b, i32 %c, i64 %d) #3
+  ret i32 0
+; CHECK-LABEL: foo_call5:
+; CHECK: call bar
+}
+
+declare i32 @bar(i8 signext, i16 signext, i32, i64) #2
+
+; Function Attrs: nounwind readnone uwtable
+define signext i8 @foo_cmp(i8 signext %a, i8 signext %b) #0 {
+  %1 = icmp slt i8 %a, %b
+  %a.b = select i1 %1, i8 %a, i8 %b
+  ret i8 %a.b
+; CHECK-LABEL: foo_cmp:
+; CHECK: if r2 s> r0
+}
+
+; Function Attrs: nounwind readnone uwtable
+define i32 @foo_muldiv(i8 signext %a, i16 signext %b, i32 %c, i64 %d) #0 {
+  %1 = icmp eq i8 %a, 0
+  br i1 %1, label %5, label %2
+
+; <label>:2                                       ; preds = %0
+  %3 = sext i16 %b to i32
+  %4 = mul nsw i32 %3, %c
+  br label %8
+
+; <label>:5                                       ; preds = %0
+  %6 = trunc i64 %d to i32
+  %7 = udiv i32 %6, %c
+  br label %8
+
+; <label>:8                                       ; preds = %5, %2
+  %.0 = phi i32 [ %4, %2 ], [ %7, %5 ]
+  ret i32 %.0
+; CHECK-LABEL: foo_muldiv:
+; CHECK: r0 *= r3
+}
+
+; Function Attrs: nounwind uwtable
+define i32 @foo_optimized() #1 {
+  %1 = tail call i32 @manyarg(i32 1, i32 2, i32 3, i32 4, i32 5) #3
+  ret i32 %1
+; CHECK-LABEL: foo_optimized:
+; CHECK: r1 = 1
+; CHECK: r2 = 2
+; CHECK: r3 = 3
+; CHECK: r4 = 4
+; CHECK: r5 = 5
+}
+
+declare i32 @manyarg(i32, i32, i32, i32, i32) #2
+
+; Function Attrs: nounwind uwtable
+define void @foo_printf() #1 {
+  %fmt = alloca [9 x i8], align 1
+  %1 = getelementptr inbounds [9 x i8], [9 x i8]* %fmt, i64 0, i64 0
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* getelementptr inbounds ([9 x i8], [9 x i8]* @foo_printf.fmt, i64 0, i64 0), i64 9, i1 false)
+; CHECK-LABEL: foo_printf:
+; CHECK: r1 = 729618802566522216 ll
+  %2 = call i32 (i8*, ...) @printf(i8* %1) #3
+  ret void
+}
+
+; Function Attrs: nounwind
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1) #3
+
+; Function Attrs: nounwind
+declare i32 @printf(i8* nocapture, ...) #4
diff --git a/llvm/test/CodeGen/SBF/sdiv.ll b/llvm/test/CodeGen/SBF/sdiv.ll
new file mode 100644
index 0000000000000..120fcada9bfa7
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/sdiv.ll
@@ -0,0 +1,10 @@
+; RUN: llc -march=sbf < %s | FileCheck %s -check-prefixes=CHECK-SBF
+; RUN: llc -march=sbf -mcpu=sbfv2 < %s | FileCheck %s -check-prefixes=CHECK-SBFV2
+
+; Function Attrs: norecurse nounwind readnone
+define i32 @test(i32 %len) #0 {
+  %1 = sdiv i32 %len, 15
+; CHECK-SBF: call __divdi3
+; CHECK-SBFV2: r0 s/= 15
+  ret i32 %1
+}
diff --git a/llvm/test/CodeGen/SBF/select_ri.ll b/llvm/test/CodeGen/SBF/select_ri.ll
new file mode 100644
index 0000000000000..cd23574c1bd8a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/select_ri.ll
@@ -0,0 +1,66 @@
+; RUN: llc < %s -march=sbf -mcpu=v2 -verify-machineinstrs | FileCheck %s
+;
+; Source file:
+; int b, c;
+; int test() {
+;   int a = b;
+;   if (a)
+;     a = c;
+;   return a;
+; }
+@b = common local_unnamed_addr global i32 0, align 4
+@c = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind readonly
+define i32 @test() local_unnamed_addr #0 {
+entry:
+  %0 = load i32, i32* @b, align 4
+  %tobool = icmp eq i32 %0, 0
+  %1 = load i32, i32* @c, align 4
+  %. = select i1 %tobool, i32 0, i32 %1
+; CHECK:  r1 = b
+; CHECK:  r1 = *(u32 *)(r1 + 0)
+; CHECK:  if r1 == 0 goto
+  ret i32 %.
+}
+
+attributes #0 = { norecurse nounwind readonly }
+
+; Function Attrs: nounwind readonly
+define i32 @foo(i64*) local_unnamed_addr #0 {
+  %2 = load i64, i64* %0, align 8
+  %3 = load i64, i64* %0, align 8
+  %4 = add i64 %3, %2
+  %5 = icmp ne i64 %4, 8589934591
+; CHECK:  r{{[0-9]+}} = 8589934591 ll
+  %6 = sext i1 %5 to i32
+  ret i32 %6
+}
+
+; Function Attrs: nounwind readonly
+declare i64 @llvm.bpf.load.word(i8*, i64) #1
+
+; Source file:
+; int m, n;
+; int test2() {
+;   int a = m;
+;   if (a < 6)
+;     a = n;
+;   return a;
+; }
+
+@m = common local_unnamed_addr global i32 0, align 4
+@n = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind readonly
+define i32 @test2() local_unnamed_addr #0 {
+entry:
+  %0 = load i32, i32* @m, align 4
+  %cmp = icmp slt i32 %0, 6
+; CHECK:  if r{{[0-9]+}} s{{<|>}} 6 goto
+  %1 = load i32, i32* @n, align 4
+  %spec.select = select i1 %cmp, i32 %1, i32 %0
+  ret i32 %spec.select
+}
+
+attributes #0 = { norecurse nounwind readonly }
diff --git a/llvm/test/CodeGen/SBF/selectiondag-bug.ll b/llvm/test/CodeGen/SBF/selectiondag-bug.ll
new file mode 100644
index 0000000000000..c1d1a7c791cfe
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/selectiondag-bug.ll
@@ -0,0 +1,82 @@
+; RUN: llc -march=sbf < %s | FileCheck %s
+;
+; The IR is generated from a bpftrace script (https://github.com/iovisor/bpftrace/issues/1305)
+; and then slightly adapted for easy unit testing.
+; The llvm bugzilla link: https://bugs.llvm.org/show_bug.cgi?id=47591
+
+%printf_t = type { i64, i64 }
+
+define i64 @"kprobe:blk_update_request"(i8* %0) local_unnamed_addr section "s_kprobe:blk_update_request_1" {
+entry:
+  %"struct kernfs_node.parent" = alloca i64, align 8
+  %printf_args = alloca %printf_t, align 8
+  %"struct cgroup.kn" = alloca i64, align 8
+  %"struct cgroup_subsys_state.cgroup" = alloca i64, align 8
+  %"struct blkcg_gq.blkcg" = alloca i64, align 8
+  %"struct bio.bi_blkg" = alloca i64, align 8
+  %"struct request.bio" = alloca i64, align 8
+  %1 = getelementptr i8, i8* %0, i64 112
+  %2 = bitcast i8* %1 to i64*
+  %arg0 = load volatile i64, i64* %2, align 8
+  %3 = add i64 %arg0, 56
+  %4 = bitcast i64* %"struct request.bio" to i8*
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %4)
+  %probe_read = call i64 inttoptr (i64 4 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct request.bio", i32 8, i64 %3)
+  %5 = load i64, i64* %"struct request.bio", align 8
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %4)
+  %6 = add i64 %5, 72
+  %7 = bitcast i64* %"struct bio.bi_blkg" to i8*
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %7)
+  %probe_read1 = call i64 inttoptr (i64 5 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct bio.bi_blkg", i32 8, i64 %6)
+  %8 = load i64, i64* %"struct bio.bi_blkg", align 8
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %7)
+  %9 = add i64 %8, 40
+  %10 = bitcast i64* %"struct blkcg_gq.blkcg" to i8*
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %10)
+  %probe_read2 = call i64 inttoptr (i64 6 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct blkcg_gq.blkcg", i32 8, i64 %9)
+  %11 = load i64, i64* %"struct blkcg_gq.blkcg", align 8
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %10)
+  %12 = bitcast i64* %"struct cgroup_subsys_state.cgroup" to i8*
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %12)
+  %probe_read3 = call i64 inttoptr (i64 7 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct cgroup_subsys_state.cgroup", i32 8, i64 %11)
+  %13 = load i64, i64* %"struct cgroup_subsys_state.cgroup", align 8
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %12)
+  %14 = add i64 %13, 288
+  %15 = bitcast i64* %"struct cgroup.kn" to i8*
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %15)
+  %probe_read4 = call i64 inttoptr (i64 8 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct cgroup.kn", i32 8, i64 %14)
+  %16 = load i64, i64* %"struct cgroup.kn", align 8
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %15)
+  %17 = bitcast %printf_t* %printf_args to i8*
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %17)
+  %18 = add i64 %16, 8
+  %19 = bitcast i64* %"struct kernfs_node.parent" to i8*
+  %20 = getelementptr inbounds %printf_t, %printf_t* %printf_args, i64 0, i32 0
+  store i64 0, i64* %20, align 8
+  call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %19)
+
+; CHECK:        call 8
+; CHECK-NOT:    r{{[0-9]+}} = 0
+; CHECK:        [[REG3:r[0-9]+]] = *(u64 *)(r10 - 24)
+; CHECK:        [[REG1:r[0-9]+]] = 0
+; CHECK:        *(u64 *)(r10 - 24) = [[REG1]]
+
+  %probe_read5 = call i64 inttoptr (i64 9 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct kernfs_node.parent", i32 8, i64 %18)
+  %21 = load i64, i64* %"struct kernfs_node.parent", align 8
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %19)
+  %22 = getelementptr inbounds %printf_t, %printf_t* %printf_args, i64 0, i32 1
+  store i64 %21, i64* %22, align 8
+  %get_cpu_id = call i64 inttoptr (i64 18 to i64 ()*)()
+  %perf_event_output = call i64 inttoptr (i64 10 to i64 (i8*, i64, i64, %printf_t*, i64)*)(i8* %0, i64 2, i64 %get_cpu_id, %printf_t* nonnull %printf_args, i64 16)
+  call void @llvm.lifetime.end.p0i8(i64 -1, i8* nonnull %17)
+  ret i64 0
+}
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg %0, i8* nocapture %1) #1
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg %0, i8* nocapture %1) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind willreturn }
diff --git a/llvm/test/CodeGen/SBF/setcc.ll b/llvm/test/CodeGen/SBF/setcc.ll
new file mode 100644
index 0000000000000..dce3a69f9c498
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/setcc.ll
@@ -0,0 +1,112 @@
+; RUN: llc -march=sbf < %s | FileCheck --check-prefix=CHECK-V1 %s
+; RUN: llc -march=sbf -mcpu=v2 < %s | FileCheck --check-prefix=CHECK-V2 %s
+
+define i16 @sccweqand(i16 %a, i16 %b) nounwind {
+  %t1 = and i16 %a, %b
+  %t2 = icmp eq i16 %t1, 0
+  %t3 = zext i1 %t2 to i16
+  ret i16 %t3
+}
+; CHECK-LABEL: sccweqand:
+; CHECK-V1: if r1 == 0
+; CHECK-V2: if r1 == 0
+
+define i16 @sccwneand(i16 %a, i16 %b) nounwind {
+  %t1 = and i16 %a, %b
+  %t2 = icmp ne i16 %t1, 0
+  %t3 = zext i1 %t2 to i16
+  ret i16 %t3
+}
+; CHECK-LABEL: sccwneand:
+; CHECK-V1: if r1 != 0
+; CHECK-V2: if r1 != 0
+
+define i16 @sccwne(i16 %a, i16 %b) nounwind {
+  %t1 = icmp ne i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwne:
+; CHECK-V1: if r1 != r2
+; CHECK-V2: if r1 != r2
+
+define i16 @sccweq(i16 %a, i16 %b) nounwind {
+  %t1 = icmp eq i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccweq:
+; CHECK-V1: if r1 == r2
+; CHECK-V2: if r1 == r2
+
+define i16 @sccwugt(i16 %a, i16 %b) nounwind {
+  %t1 = icmp ugt i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwugt:
+; CHECK-V1: if r1 > r2
+; CHECK-V2: if r1 > r2
+
+define i16 @sccwuge(i16 %a, i16 %b) nounwind {
+  %t1 = icmp uge i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwuge:
+; CHECK-V1: if r1 >= r2
+; CHECK-V2: if r1 >= r2
+
+define i16 @sccwult(i16 %a, i16 %b) nounwind {
+  %t1 = icmp ult i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwult:
+; CHECK-V1: if r2 > r1
+; CHECK-V2: if r1 < r2
+
+define i16 @sccwule(i16 %a, i16 %b) nounwind {
+  %t1 = icmp ule i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwule:
+; CHECK-V1: if r2 >= r1
+; CHECK-V2: if r1 <= r2
+
+define i16 @sccwsgt(i16 %a, i16 %b) nounwind {
+  %t1 = icmp sgt i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwsgt:
+; CHECK-V1: if r1 s> r2
+; CHECK-V2: if r1 s> r2
+
+define i16 @sccwsge(i16 %a, i16 %b) nounwind {
+  %t1 = icmp sge i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwsge:
+; CHECK-V1: if r1 s>= r2
+; CHECK-V2: if r1 s>= r2
+
+define i16 @sccwslt(i16 %a, i16 %b) nounwind {
+  %t1 = icmp slt i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwslt:
+; CHECK-V1: if r2 s> r1
+; CHECK-V2: if r1 s< r2
+
+define i16 @sccwsle(i16 %a, i16 %b) nounwind {
+  %t1 = icmp sle i16 %a, %b
+  %t2 = zext i1 %t1 to i16
+  ret i16 %t2
+}
+; CHECK-LABEL:sccwsle:
+; CHECK-V1: if r2 s>= r1
+; CHECK-V2: if r1 s<= r2
diff --git a/llvm/test/CodeGen/SBF/shifts.ll b/llvm/test/CodeGen/SBF/shifts.ll
new file mode 100644
index 0000000000000..e31991dfedb9b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/shifts.ll
@@ -0,0 +1,100 @@
+; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck %s
+
+define zeroext i8 @lshr8(i8 zeroext %a, i8 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: lshr8:
+; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = lshr i8 %a, %cnt
+  ret i8 %shr
+}
+
+define signext i8 @ashr8(i8 signext %a, i8 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: ashr8:
+; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = ashr i8 %a, %cnt
+  ret i8 %shr
+}
+
+define zeroext i8 @shl8(i8 zeroext %a, i8 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK: shl8
+; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shl = shl i8 %a, %cnt
+  ret i8 %shl
+}
+
+define zeroext i16 @lshr16(i16 zeroext %a, i16 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: lshr16:
+; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00
+  %shr = lshr i16 %a, %cnt
+  ret i16 %shr
+}
+
+define signext i16 @ashr16(i16 signext %a, i16 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: ashr16:
+; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = ashr i16 %a, %cnt
+  ret i16 %shr
+}
+
+define zeroext i16 @shl16(i16 zeroext %a, i16 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: shl16:
+; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shl = shl i16 %a, %cnt
+  ret i16 %shl
+}
+
+define zeroext i32 @lshr32(i32 zeroext %a, i32 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: lshr32:
+; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: exit # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = lshr i32 %a, %cnt
+  ret i32 %shr
+}
+
+define signext i32 @ashr32(i32 signext %a, i32 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: ashr32:
+; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = ashr i32 %a, %cnt
+  ret i32 %shr
+}
+
+define zeroext i32 @shl32(i32 zeroext %a, i32 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: shl32:
+; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shl = shl i32 %a, %cnt
+  ret i32 %shl
+}
+
+define zeroext i64 @lshr64(i64 zeroext %a, i64 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: lshr64:
+; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = lshr i64 %a, %cnt
+  ret i64 %shr
+}
+
+define signext i64 @ashr64(i64 signext %a, i64 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: ashr64:
+; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shr = ashr i64 %a, %cnt
+  ret i64 %shr
+}
+
+define zeroext i64 @shl64(i64 zeroext %a, i64 zeroext %cnt) nounwind readnone {
+entry:
+; CHECK-LABEL: shl64:
+; CHECK: r0 = r1 # encoding: [0xbf,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: exit # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+  %shl = shl i64 %a, %cnt
+  ret i64 %shl
+}
diff --git a/llvm/test/CodeGen/SBF/simplifycfg.ll b/llvm/test/CodeGen/SBF/simplifycfg.ll
new file mode 100644
index 0000000000000..f4ea9ce75da0c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/simplifycfg.ll
@@ -0,0 +1,139 @@
+; RUN: opt -O2 -S < %s | FileCheck %s
+;
+; This test tries to ensure that simplifycfg hoisting common instructions
+; of then/else branch indeed happens. BPF target has added an IR pass
+; before loop optimizations as Commit 1d51dc38d89b
+; ([SimplifyCFG][LoopRotate] SimplifyCFG: disable common instruction
+;  hoisting by default, enable late in pipeline)
+; disabled common instruction hoisting. Due to optimization triggered
+; code changes, later SimplifyCFG may not be able to perform optimization
+; even common inst hoisting is enabled.
+;
+; Source:
+;   typedef struct {
+;     void *f_back;
+;   } FrameData;
+;   extern int get_data(void *, void *);
+;   extern void get_frame_ptr(void *);
+;   int test() {
+;     void *frame_ptr;
+;     FrameData frame;
+;
+;     get_frame_ptr(&frame_ptr);
+;
+;     #pragma nounroll
+;     for (int i = 0; i < 6; i++) {
+;       if (frame_ptr && get_data(frame_ptr, &frame)) {
+;         frame_ptr = frame.f_back;
+;       }
+;     }
+;     return frame_ptr == 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -Xclang -disable-llvm-passes -S -emit-llvm t.c -o t.ll
+
+target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
+target triple = "sbf"
+
+%struct.FrameData = type { i8* }
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 {
+entry:
+  %frame_ptr = alloca i8*, align 8
+  %frame = alloca %struct.FrameData, align 8
+  %i = alloca i32, align 4
+  %0 = bitcast i8** %frame_ptr to i8*
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* %0) #3
+  %1 = bitcast %struct.FrameData* %frame to i8*
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* %1) #3
+  %2 = bitcast i8** %frame_ptr to i8*
+  call void @get_frame_ptr(i8* %2)
+  %3 = bitcast i32* %i to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %3) #3
+  store i32 0, i32* %i, align 4, !tbaa !2
+  br label %for.cond
+
+; CHECK-LABEL:    entry
+; CHECK:          %{{[0-9]+}} = load i8*, i8** %frame_ptr, align 8
+; CHECK:          %{{[0-9a-z.]+}} = icmp eq i8* %2, null
+; CHECK:          br label
+
+for.cond:                                         ; preds = %for.inc, %entry
+  %4 = load i32, i32* %i, align 4, !tbaa !2
+  %cmp = icmp slt i32 %4, 6
+  br i1 %cmp, label %for.body, label %for.cond.cleanup
+
+for.cond.cleanup:                                 ; preds = %for.cond
+  %5 = bitcast i32* %i to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %5) #3
+  br label %for.end
+
+for.body:                                         ; preds = %for.cond
+  %6 = load i8*, i8** %frame_ptr, align 8, !tbaa !6
+  %tobool = icmp ne i8* %6, null
+  br i1 %tobool, label %land.lhs.true, label %if.end
+
+land.lhs.true:                                    ; preds = %for.body
+  %7 = load i8*, i8** %frame_ptr, align 8, !tbaa !6
+  %8 = bitcast %struct.FrameData* %frame to i8*
+  %call = call i32 @get_data(i8* %7, i8* %8)
+  %tobool1 = icmp ne i32 %call, 0
+  br i1 %tobool1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %land.lhs.true
+  %f_back = getelementptr inbounds %struct.FrameData, %struct.FrameData* %frame, i32 0, i32 0
+  %9 = load i8*, i8** %f_back, align 8, !tbaa !8
+  store i8* %9, i8** %frame_ptr, align 8, !tbaa !6
+  br label %if.end
+
+if.end:                                           ; preds = %if.then, %land.lhs.true, %for.body
+  br label %for.inc
+
+for.inc:                                          ; preds = %if.end
+  %10 = load i32, i32* %i, align 4, !tbaa !2
+  %inc = add nsw i32 %10, 1
+  store i32 %inc, i32* %i, align 4, !tbaa !2
+  br label %for.cond, !llvm.loop !10
+
+for.end:                                          ; preds = %for.cond.cleanup
+  %11 = load i8*, i8** %frame_ptr, align 8, !tbaa !6
+  %cmp2 = icmp eq i8* %11, null
+  %conv = zext i1 %cmp2 to i32
+  %12 = bitcast %struct.FrameData* %frame to i8*
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* %12) #3
+  %13 = bitcast i8** %frame_ptr to i8*
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* %13) #3
+  ret i32 %conv
+}
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+declare dso_local void @get_frame_ptr(i8*) #2
+
+declare dso_local i32 @get_data(i8*, i8*) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git 1b3c1c543269da36ae41ab84f646cf98d2e5b1e5)"}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"int", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
+!6 = !{!7, !7, i64 0}
+!7 = !{!"any pointer", !4, i64 0}
+!8 = !{!9, !7, i64 0}
+!9 = !{!"", !7, i64 0}
+!10 = distinct !{!10, !11}
+!11 = !{!"llvm.loop.unroll.disable"}
diff --git a/llvm/test/CodeGen/SBF/spill-alu32.ll b/llvm/test/CodeGen/SBF/spill-alu32.ll
new file mode 100644
index 0000000000000..c9ef67944d79e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/spill-alu32.ll
@@ -0,0 +1,35 @@
+; RUN: llc -march=sbf -mcpu=v3 < %s | FileCheck %s
+;
+; Source code:
+;   void foo(int, int, int, long, int);
+;   int test(int a, int b, int c, long d, int e) {
+;     foo(a, b, c, d, e);
+;     __asm__ __volatile__ ("":::"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "memory");
+;     foo(a, b, c, d, e);
+;     return 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -S -emit-llvm -O2 -mcpu=v3 t.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) local_unnamed_addr #0 {
+entry:
+  tail call void @foo(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) #2
+  tail call void asm sideeffect "", "~{r0},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{memory}"() #2
+
+; CHECK:        *(u32 *)(r10 - 8) = w5
+; CHECK:        *(u64 *)(r10 - 16) = r4
+; CHECK:        *(u32 *)(r10 - 24) = w3
+; CHECK:        *(u32 *)(r10 - 32) = w2
+; CHECK:        *(u32 *)(r10 - 40) = w1
+; CHECK:        call foo
+
+  tail call void @foo(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) #2
+  ret i32 0
+}
+
+declare dso_local void @foo(i32, i32, i32, i64, i32) local_unnamed_addr #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="v3" }
+attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="v3" }
+attributes #2 = { nounwind }
diff --git a/llvm/test/CodeGen/SBF/struct_ret1.ll b/llvm/test/CodeGen/SBF/struct_ret1.ll
new file mode 100644
index 0000000000000..fc919c41788ab
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/struct_ret1.ll
@@ -0,0 +1,21 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+%struct.S = type { i32, i32, i32 }
+
+@s = common global %struct.S zeroinitializer, align 4
+
+; Function Attrs: nounwind readonly uwtable
+define { i64, i32 } @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) #0 {
+; CHECK-LABEL: bar:
+; CHECK: r2 = s ll
+; CHECK: r3 = *(u32 *)(r2 + 8)
+; CHECK: *(u32 *)(r1 + 8) = r3
+; CHECK: r2 = *(u64 *)(r2 + 0)
+; CHECK: *(u64 *)(r1 + 0) = r2
+entry:
+  %retval.sroa.0.0.copyload = load i64, i64* bitcast (%struct.S* @s to i64*), align 4
+  %retval.sroa.2.0.copyload = load i32, i32* getelementptr inbounds (%struct.S, %struct.S* @s, i64 0, i32 2), align 4
+  %.fca.0.insert = insertvalue { i64, i32 } undef, i64 %retval.sroa.0.0.copyload, 0
+  %.fca.1.insert = insertvalue { i64, i32 } %.fca.0.insert, i32 %retval.sroa.2.0.copyload, 1
+  ret { i64, i32 } %.fca.1.insert
+}
diff --git a/llvm/test/CodeGen/SBF/struct_ret2.ll b/llvm/test/CodeGen/SBF/struct_ret2.ll
new file mode 100644
index 0000000000000..1793496b035f1
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/struct_ret2.ll
@@ -0,0 +1,16 @@
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+; Function Attrs: nounwind uwtable
+define { i64, i32 } @foo(i32 %a, i32 %b, i32 %c) #0 {
+; CHECK-LABEL: foo:
+; CHECK: call bar
+; CHECK: r1 = *(u64 *)(r10 - 16)
+; CHECK: r2 = *(u32 *)(r10 - 8)
+; CHECK: *(u32 *)(r6 + 8) = r2
+; CHECK: *(u64 *)(r6 + 0) = r1
+entry:
+  %call = tail call { i64, i32 } @bar(i32 %a, i32 %b, i32 %c, i32 1, i32 2) #3
+  ret { i64, i32 } %call
+}
+
+declare { i64, i32 } @bar(i32, i32, i32, i32, i32) #1
diff --git a/llvm/test/CodeGen/SBF/undef.ll b/llvm/test/CodeGen/SBF/undef.ll
new file mode 100644
index 0000000000000..e9a72cd685097
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/undef.ll
@@ -0,0 +1,55 @@
+; RUN: llc < %s -march=sbf | FileCheck -check-prefixes=CHECK %s
+
+%struct.bpf_map_def = type { i32, i32, i32, i32 }
+%struct.__sk_buff = type opaque
+%struct.routing_key_2 = type { [6 x i8] }
+
+@routing = global %struct.bpf_map_def { i32 1, i32 6, i32 12, i32 1024 }, section "maps", align 4
+@routing_miss_0 = global %struct.bpf_map_def { i32 1, i32 1, i32 12, i32 1 }, section "maps", align 4
+@test1 = global %struct.bpf_map_def { i32 2, i32 4, i32 8, i32 1024 }, section "maps", align 4
+@test1_miss_4 = global %struct.bpf_map_def { i32 2, i32 1, i32 8, i32 1 }, section "maps", align 4
+@_license = global [4 x i8] c"GPL\00", section "license", align 1
+@llvm.used = appending global [6 x i8*] [i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_license, i32 0, i32 0), i8* bitcast (i32 (%struct.__sk_buff*)* @ebpf_filter to i8*), i8* bitcast (%struct.bpf_map_def* @routing to i8*), i8* bitcast (%struct.bpf_map_def* @routing_miss_0 to i8*), i8* bitcast (%struct.bpf_map_def* @test1 to i8*), i8* bitcast (%struct.bpf_map_def* @test1_miss_4 to i8*)], section "llvm.metadata"
+
+; Function Attrs: nounwind uwtable
+define i32 @ebpf_filter(%struct.__sk_buff* nocapture readnone %ebpf_packet) #0 section "socket1" {
+
+; CHECK: r1 = 2569
+; CHECK: *(u16 *)(r10 - 4) = r1
+; CHECK: r1 = 134678021
+; CHECK: *(u32 *)(r10 - 8) = r1
+
+; CHECK: r1 = 0
+; CHECK-DAG:  *(u64 *)(r10 - 2) = r1
+; CHECK-DAG:  *(u64 *)(r10 + 6) = r1
+; CHECK-DAG:  *(u64 *)(r10 + 14) = r1
+; CHECK-DAG:  *(u64 *)(r10 + 20) = r1
+
+; CHECK: r2 = r10
+; CHECK: r2 += -8
+; CHECK: r1 = routing
+; CHECK: call bpf_map_lookup_elem
+; CHECK: exit
+  %key = alloca %struct.routing_key_2, align 1
+  %1 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 0, i32 0, i64 0
+  store i8 5, i8* %1, align 1
+  %2 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 0, i32 0, i64 1
+  store i8 6, i8* %2, align 1
+  %3 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 0, i32 0, i64 2
+  store i8 7, i8* %3, align 1
+  %4 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 0, i32 0, i64 3
+  store i8 8, i8* %4, align 1
+  %5 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 0, i32 0, i64 4
+  store i8 9, i8* %5, align 1
+  %6 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 0, i32 0, i64 5
+  store i8 10, i8* %6, align 1
+  %7 = getelementptr inbounds %struct.routing_key_2, %struct.routing_key_2* %key, i64 1, i32 0, i64 0
+  call void @llvm.memset.p0i8.i64(i8* %7, i8 0, i64 30, i1 false)
+  %8 = call i32 (%struct.bpf_map_def*, %struct.routing_key_2*, ...) bitcast (i32 (...)* @bpf_map_lookup_elem to i32 (%struct.bpf_map_def*, %struct.routing_key_2*, ...)*)(%struct.bpf_map_def* nonnull @routing, %struct.routing_key_2* nonnull %key) #3
+  ret i32 undef
+}
+
+; Function Attrs: nounwind argmemonly
+declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i1) #1
+
+declare i32 @bpf_map_lookup_elem(...) #2
diff --git a/llvm/test/CodeGen/SBF/vararg1.ll b/llvm/test/CodeGen/SBF/vararg1.ll
new file mode 100644
index 0000000000000..34fb3dfc25b1c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/vararg1.ll
@@ -0,0 +1,9 @@
+; RUN: not llc -march=sbf < %s 2> %t1
+; RUN: FileCheck %s < %t1
+; CHECK: with VarArgs
+
+; Function Attrs: nounwind readnone uwtable
+define void @foo(i32 %a, ...) #0 {
+entry:
+  ret void
+}
diff --git a/llvm/test/CodeGen/SBF/vla.ll b/llvm/test/CodeGen/SBF/vla.ll
new file mode 100644
index 0000000000000..9291b61157a79
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/vla.ll
@@ -0,0 +1,115 @@
+; RUN: opt --sbf-ir-peephole -mtriple=sbf -S %s | FileCheck %s
+; Source:
+;   #define AA 40
+;   struct t {
+;     char a[20];
+;   };
+;   void foo(void *);
+;
+;   int test1() {
+;     const int a = 8;
+;     char tmp[AA + sizeof(struct t) + a];
+;     foo(tmp);
+;     return 0;
+;   }
+;
+;   int test2(int b) {
+;     const int a = 8;
+;     char tmp[a + b];
+;     foo(tmp);
+;     return 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c -Xclang -disable-llvm-passes
+
+source_filename = "t.c"
+target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
+target triple = "sbf"
+
+; Function Attrs: nounwind
+define dso_local i32 @test1() #0 {
+entry:
+  %a = alloca i32, align 4
+  %saved_stack = alloca i8*, align 8
+  %0 = bitcast i32* %a to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #4
+  store i32 8, i32* %a, align 4, !tbaa !3
+  %1 = call i8* @llvm.stacksave()
+  store i8* %1, i8** %saved_stack, align 8
+  %vla = alloca i8, i64 68, align 1
+  call void @foo(i8* %vla)
+  %2 = load i8*, i8** %saved_stack, align 8
+  call void @llvm.stackrestore(i8* %2)
+  %3 = bitcast i32* %a to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %3) #4
+  ret i32 0
+}
+
+; CHECK:       define dso_local i32 @test1
+; CHECK-NOT:   %[[#]] = call i8* @llvm.stacksave()
+; CHECK-NOT:   store i8* %[[#]], i8** %saved_stack, align 8
+; CHECK-NOT:   %[[#]] = load i8*, i8** %saved_stack, align 8
+; CHECK-NOT:   call void @llvm.stackrestore(i8* %[[#]])
+
+; Function Attrs: argmemonly nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nofree nosync nounwind willreturn
+declare i8* @llvm.stacksave() #2
+
+declare dso_local void @foo(i8*) #3
+
+; Function Attrs: nofree nosync nounwind willreturn
+declare void @llvm.stackrestore(i8*) #2
+
+; Function Attrs: argmemonly nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind
+define dso_local i32 @test2(i32 %b) #0 {
+entry:
+  %b.addr = alloca i32, align 4
+  %a = alloca i32, align 4
+  %saved_stack = alloca i8*, align 8
+  %__vla_expr0 = alloca i64, align 8
+  store i32 %b, i32* %b.addr, align 4, !tbaa !3
+  %0 = bitcast i32* %a to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #4
+  store i32 8, i32* %a, align 4, !tbaa !3
+  %1 = load i32, i32* %b.addr, align 4, !tbaa !3
+  %add = add nsw i32 8, %1
+  %2 = zext i32 %add to i64
+  %3 = call i8* @llvm.stacksave()
+  store i8* %3, i8** %saved_stack, align 8
+  %vla = alloca i8, i64 %2, align 1
+  store i64 %2, i64* %__vla_expr0, align 8
+  call void @foo(i8* %vla)
+  %4 = load i8*, i8** %saved_stack, align 8
+  call void @llvm.stackrestore(i8* %4)
+  %5 = bitcast i32* %a to i8*
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %5) #4
+  ret i32 0
+}
+
+; CHECK:       define dso_local i32 @test2
+; CHECK-NOT:   %[[#]] = call i8* @llvm.stacksave()
+; CHECK-NOT:   store i8* %[[#]], i8** %saved_stack, align 8
+; CHECK-NOT:   %[[#]] = load i8*, i8** %saved_stack, align 8
+; CHECK-NOT:   call void @llvm.stackrestore(i8* %[[#]])
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly nofree nosync nounwind willreturn }
+attributes #2 = { nofree nosync nounwind willreturn }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #4 = { nounwind }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 64c5d5c671fb5b5f25c464652a4eec2cf743af0d)"}
+!3 = !{!4, !4, i64 0}
+!4 = !{!"int", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/warn-stack.ll b/llvm/test/CodeGen/SBF/warn-stack.ll
new file mode 100644
index 0000000000000..3daf8c7dbefcc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/warn-stack.ll
@@ -0,0 +1,75 @@
+; RUN: llc -march=sbf < %s 2>&1 >/dev/null | FileCheck %s
+
+define void @nowarn() local_unnamed_addr #0 !dbg !6 {
+  %1 = alloca [4096 x i8], align 1
+  %2 = getelementptr inbounds [4096 x i8], [4096 x i8]* %1, i64 0, i64 0, !dbg !15
+  call void @llvm.lifetime.start.p0i8(i64 4096, i8* nonnull %2) #4, !dbg !15
+  tail call void @llvm.dbg.declare(metadata [4096 x i8]* %1, metadata !10, metadata !16), !dbg !17
+  call void @doit(i8* nonnull %2) #4, !dbg !18
+  call void @llvm.lifetime.end.p0i8(i64 4096, i8* nonnull %2) #4, !dbg !19
+  ret void, !dbg !19
+}
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+declare void @doit(i8*) local_unnamed_addr #3
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
+
+; CHECK: Error: warn_stack.c
+; CHECK: please minimize large stack variables 
+define void @warn() local_unnamed_addr #0 !dbg !20 {
+  %1 = alloca [512 x i8], align 1
+  %2 = getelementptr inbounds [512 x i8], [512 x i8]* %1, i64 0, i64 0, !dbg !26
+  call void @llvm.lifetime.start.p0i8(i64 512, i8* nonnull %2) #4, !dbg !26
+  tail call void @llvm.dbg.declare(metadata [512 x i8]* %1, metadata !22, metadata !16), !dbg !27
+  call void @doit(i8* nonnull %2) #4, !dbg !28
+  call void @llvm.lifetime.end.p0i8(i64 512, i8* nonnull %2) #4, !dbg !29
+  ret void, !dbg !29
+}
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind readnone }
+attributes #3 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4}
+!llvm.ident = !{!5}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 5.0.0 (trunk 292141) (llvm/trunk 292156)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+!1 = !DIFile(filename: "warn_stack.c", directory: "/w/llvm/bld")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{!"clang version 5.0.0 (trunk 292141) (llvm/trunk 292156)"}
+!6 = distinct !DISubprogram(name: "nowarn", scope: !1, file: !1, line: 2, type: !7, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !9)
+!7 = !DISubroutineType(types: !8)
+!8 = !{null}
+!9 = !{!10}
+!10 = !DILocalVariable(name: "buf", scope: !6, file: !1, line: 4, type: !11)
+!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 4096, elements: !13)
+!12 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!13 = !{!14}
+!14 = !DISubrange(count: 4096)
+!15 = !DILocation(line: 4, column: 2, scope: !6)
+!16 = !DIExpression()
+!17 = !DILocation(line: 4, column: 7, scope: !6)
+!18 = !DILocation(line: 5, column: 2, scope: !6)
+!19 = !DILocation(line: 6, column: 1, scope: !6)
+!20 = distinct !DISubprogram(name: "warn", scope: !1, file: !1, line: 7, type: !7, isLocal: false, isDefinition: true, scopeLine: 8, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !21)
+!21 = !{!22}
+!22 = !DILocalVariable(name: "buf", scope: !20, file: !1, line: 9, type: !23)
+!23 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 4096, elements: !24)
+!24 = !{!25}
+!25 = !DISubrange(count: 512)
+!26 = !DILocation(line: 9, column: 2, scope: !20)
+!27 = !DILocation(line: 9, column: 7, scope: !20)
+!28 = !DILocation(line: 10, column: 2, scope: !20)
+!29 = !DILocation(line: 11, column: 1, scope: !20)
diff --git a/llvm/test/CodeGen/SBF/xadd.ll b/llvm/test/CodeGen/SBF/xadd.ll
new file mode 100644
index 0000000000000..5b6b27ed7c614
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/xadd.ll
@@ -0,0 +1,60 @@
+; RUN: not --crash llc -march=sbf < %s 2>&1 | FileCheck %s
+; This does not currently apply to SBF, probably should remove it.
+; XFAIL: *
+
+; This file is generated with the source command and source
+; $ clang -target bpf -O2 -g -S -emit-llvm t.c
+; $ cat t.c
+; int test(int *ptr) {
+;    int r;
+;    __sync_fetch_and_add(ptr, 4);
+;    r = __sync_fetch_and_add(ptr, 6);
+;    return r;
+; }
+
+; ModuleID = 't.c'
+source_filename = "t.c"
+target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+target triple = "sbf"
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32* nocapture %ptr) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata i32* %ptr, metadata !13, metadata !DIExpression()), !dbg !15
+  %0 = atomicrmw add i32* %ptr, i32 4 seq_cst, !dbg !16
+  %1 = atomicrmw add i32* %ptr, i32 6 seq_cst, !dbg !17
+; CHECK: line 4: Invalid usage of the XADD return value
+  call void @llvm.dbg.value(metadata i32 %1, metadata !14, metadata !DIExpression()), !dbg !18
+  ret i32 %1, !dbg !19
+}
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 342605) (llvm/trunk 342612)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/home/yhs/work/tests/llvm/sync/test1")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 342605) (llvm/trunk 342612)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !12)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!12 = !{!13, !14}
+!13 = !DILocalVariable(name: "ptr", arg: 1, scope: !7, file: !1, line: 1, type: !11)
+!14 = !DILocalVariable(name: "r", scope: !7, file: !1, line: 2, type: !10)
+!15 = !DILocation(line: 1, column: 15, scope: !7)
+!16 = !DILocation(line: 3, column: 4, scope: !7)
+!17 = !DILocation(line: 4, column: 8, scope: !7)
+!18 = !DILocation(line: 2, column: 8, scope: !7)
+!19 = !DILocation(line: 5, column: 4, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/xadd_legal.ll b/llvm/test/CodeGen/SBF/xadd_legal.ll
new file mode 100644
index 0000000000000..15c080305d5f5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/xadd_legal.ll
@@ -0,0 +1,30 @@
+; RUN: llc -march=sbf < %s 2>&1 | FileCheck --check-prefix=CHECK-64 %s
+; RUN: llc -march=sbf -mattr=+alu32 < %s 2>&1 | FileCheck --check-prefix=CHECK-32 %s
+
+; This file is generated with the source command and source
+; $ clang -target bpf -O2 -S -emit-llvm t.c
+; $ cat t.c
+; int test(int *ptr, unsigned long long a) {
+;    __sync_fetch_and_add(ptr, a);
+;    return *ptr;
+; }
+;
+; NOTE: passing unsigned long long as the second operand of __sync_fetch_and_add
+; could effectively create sub-register reference coming from indexing a full
+; register which could then exerceise hasLivingDefs inside BPFMIChecker.cpp.
+
+define dso_local i32 @test(i32* nocapture %ptr, i64 %a) {
+entry:
+  %conv = trunc i64 %a to i32
+  %0 = atomicrmw add i32* %ptr, i32 %conv seq_cst
+; CHECK-64: r0 = *(u32 *)(r1 + 0)
+; CHECK-64: r0 += r2
+; CHECK-64: *(u32 *)(r1 + 0) = r0
+
+; CHECK-32: w0 = *(u32 *)(r1 + 0)
+; CHECK-32: w0 += w2
+; CHECK-32: *(u32 *)(r1 + 0) = w0
+
+  %1 = load i32, i32* %ptr, align 4
+  ret i32 %1
+}
diff --git a/llvm/test/DebugInfo/SBF/extern-void.ll b/llvm/test/DebugInfo/SBF/extern-void.ll
new file mode 100644
index 0000000000000..67f95465ffa2c
--- /dev/null
+++ b/llvm/test/DebugInfo/SBF/extern-void.ll
@@ -0,0 +1,80 @@
+; RUN: llc -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern void bla1;
+;   void *test1() {
+;     void *x = &bla1;
+;     return x;
+;   }
+;
+;   extern const void bla2;
+;   const void *test2() {
+;     const void *x = &bla2;
+;     return x;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@bla1 = external dso_local global i8, align 1, !dbg !0
+@bla2 = external dso_local constant i8, align 1, !dbg !6
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local nonnull i8* @test1() local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata i8* @bla1, metadata !18, metadata !DIExpression()), !dbg !19
+  ret i8* @bla1, !dbg !20
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local nonnull i8* @test2() local_unnamed_addr #0 !dbg !21 {
+entry:
+  call void @llvm.dbg.value(metadata i8* @bla2, metadata !26, metadata !DIExpression()), !dbg !27
+  ret i8* @bla2, !dbg !28
+}
+
+; CHECK:        .quad bla1
+; CHECK-NEXT:   DW_TAG_variable
+;
+; CHECK:        .quad   bla2
+; CHECK-NEXT:   DW_TAG_const_type
+; CHECK-NEXT:   DW_TAG_subprogram
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "bla1", scope: !2, file: !3, line: 1, isLocal: false, isDefinition: false)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 8a8c6913a931e8bbd119012f4badd81155a0f48a)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp3")
+!4 = !{}
+!5 = !{!0, !6}
+!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
+!7 = distinct !DIGlobalVariable(name: "bla2", scope: !2, file: !3, line: 7, type: !8, isLocal: false, isDefinition: false)
+!8 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 8a8c6913a931e8bbd119012f4badd81155a0f48a)"}
+!13 = distinct !DISubprogram(name: "test1", scope: !3, file: !3, line: 2, type: !14, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !17)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!16}
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!17 = !{!18}
+!18 = !DILocalVariable(name: "x", scope: !13, file: !3, line: 3, type: !16)
+!19 = !DILocation(line: 0, scope: !13)
+!20 = !DILocation(line: 4, column: 3, scope: !13)
+!21 = distinct !DISubprogram(name: "test2", scope: !3, file: !3, line: 8, type: !22, scopeLine: 8, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !25)
+!22 = !DISubroutineType(types: !23)
+!23 = !{!24}
+!24 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64)
+!25 = !{!26}
+!26 = !DILocalVariable(name: "x", scope: !21, file: !3, line: 9, type: !24)
+!27 = !DILocation(line: 0, scope: !21)
+!28 = !DILocation(line: 10, column: 3, scope: !21)
diff --git a/llvm/test/DebugInfo/SBF/lit.local.cfg b/llvm/test/DebugInfo/SBF/lit.local.cfg
new file mode 100644
index 0000000000000..edf638fc61af9
--- /dev/null
+++ b/llvm/test/DebugInfo/SBF/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'SBF' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
new file mode 100644
index 0000000000000..822c0ca125172
--- /dev/null
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -0,0 +1,103 @@
+# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-objdump -d -r %t | FileCheck %s
+# RUN: llvm-objdump --mattr=+alu32 -d -r %t | FileCheck %s
+
+// ======== BPF_ALU Class ========
+  w1 = -w1    // BPF_NEG
+  w0 += w1    // BPF_ADD  | BPF_X
+  w1 -= w2    // BPF_SUB  | BPF_X
+  w2 *= w3    // BPF_MUL  | BPF_X
+  w3 /= w4    // BPF_DIV  | BPF_X
+// CHECK: 84 01 00 00 00 00 00 00      w1 = -w1
+// CHECK: 0c 10 00 00 00 00 00 00      w0 += w1
+// CHECK: 1c 21 00 00 00 00 00 00      w1 -= w2
+// CHECK: 2c 32 00 00 00 00 00 00      w2 *= w3
+// CHECK: 3c 43 00 00 00 00 00 00      w3 /= w4
+
+  w4 |= w5    // BPF_OR   | BPF_X
+  w5 &= w6    // BPF_AND  | BPF_X
+  w6 <<= w7   // BPF_LSH  | BPF_X
+  w7 >>= w8   // BPF_RSH  | BPF_X
+  w8 ^= w9    // BPF_XOR  | BPF_X
+  w9 = w10    // BPF_MOV  | BPF_X
+  w10 s>>= w0 // BPF_ARSH | BPF_X
+// CHECK: 4c 54 00 00 00 00 00 00      w4 |= w5
+// CHECK: 5c 65 00 00 00 00 00 00      w5 &= w6
+// CHECK: 6c 76 00 00 00 00 00 00      w6 <<= w7
+// CHECK: 7c 87 00 00 00 00 00 00      w7 >>= w8
+// CHECK: ac 98 00 00 00 00 00 00      w8 ^= w9
+// CHECK: bc a9 00 00 00 00 00 00      w9 = w10
+// CHECK: cc 0a 00 00 00 00 00 00      w10 s>>= w0
+
+  w0 += 1           // BPF_ADD  | BPF_K
+  w1 -= 0x1         // BPF_SUB  | BPF_K
+  w2 *= -4          // BPF_MUL  | BPF_K
+  w3 /= 5           // BPF_DIV  | BPF_K
+// CHECK: 04 00 00 00 01 00 00 00      w0 += 1
+// CHECK: 14 01 00 00 01 00 00 00      w1 -= 1
+// CHECK: 24 02 00 00 fc ff ff ff      w2 *= -4
+// CHECK: 34 03 00 00 05 00 00 00      w3 /= 5
+
+  w4 |= 0xff        // BPF_OR   | BPF_K
+  w5 &= 0xFF        // BPF_AND  | BPF_K
+  w6 <<= 63         // BPF_LSH  | BPF_K
+  w7 >>= 32         // BPF_RSH  | BPF_K
+  w8 ^= 0           // BPF_XOR  | BPF_K
+  w9 = 1            // BPF_MOV  | BPF_K
+  w9 = 0xffffffff   // BPF_MOV  | BPF_K
+  w10 s>>= 64       // BPF_ARSH | BPF_K
+// CHECK: 44 04 00 00 ff 00 00 00      w4 |= 255
+// CHECK: 54 05 00 00 ff 00 00 00      w5 &= 255
+// CHECK: 64 06 00 00 3f 00 00 00      w6 <<= 63
+// CHECK: 74 07 00 00 20 00 00 00      w7 >>= 32
+// CHECK: a4 08 00 00 00 00 00 00      w8 ^= 0
+// CHECK: b4 09 00 00 01 00 00 00      w9 = 1
+// CHECK: b4 09 00 00 ff ff ff ff      w9 = -1
+// CHECK: c4 0a 00 00 40 00 00 00      w10 s>>= 64
+
+  if w0 == w1 goto Llabel0   // BPF_JEQ  | BPF_X
+  if w3 != w4 goto Llabel0   // BPF_JNE  | BPF_X
+// CHECK: 1e 10 0b 00 00 00 00 00 	if w0 == w1 goto +11
+// CHECK: 5e 43 0a 00 00 00 00 00 	if w3 != w4 goto +10
+
+  if w1 > w2 goto Llabel0    // BPF_JGT  | BPF_X
+  if w2 >= w3 goto Llabel0   // BPF_JGE  | BPF_X
+  if w4 s> w5 goto Llabel0   // BPF_JSGT | BPF_X
+  if w5 s>= w6 goto Llabel0  // BPF_JSGE | BPF_X
+// CHECK: 2e 21 09 00 00 00 00 00 	if w1 > w2 goto +9
+// CHECK: 3e 32 08 00 00 00 00 00 	if w2 >= w3 goto +8
+// CHECK: 6e 54 07 00 00 00 00 00 	if w4 s> w5 goto +7
+// CHECK: 7e 65 06 00 00 00 00 00 	if w5 s>= w6 goto +6
+
+  if w6 < w7 goto Llabel0    // BPF_JLT  | BPF_X
+  if w7 <= w8 goto Llabel0   // BPF_JLE  | BPF_X
+  if w8 s< w9 goto Llabel0   // BPF_JSLT | BPF_X
+  if w9 s<= w10 goto Llabel0 // BPF_JSLE | BPF_X
+// CHECK: ae 76 05 00 00 00 00 00 	if w6 < w7 goto +5
+// CHECK: be 87 04 00 00 00 00 00 	if w7 <= w8 goto +4
+// CHECK: ce 98 03 00 00 00 00 00 	if w8 s< w9 goto +3
+// CHECK: de a9 02 00 00 00 00 00 	if w9 s<= w10 goto +2
+
+  if w0 == 0 goto Llabel0           // BPF_JEQ  | BPF_K
+  if w3 != -1 goto Llabel0          // BPF_JNE  | BPF_K
+// CHECK: 16 00 01 00 00 00 00 00 	if w0 == 0 goto +1
+// CHECK: 56 03 00 00 ff ff ff ff 	if w3 != -1 goto +0
+
+Llabel0 :
+  if w1 > 64 goto Llabel0           // BPF_JGT  | BPF_K
+  if w2 >= 0xffffffff goto Llabel0  // BPF_JGE  | BPF_K
+  if w4 s> 0xffffffff goto Llabel0  // BPF_JSGT | BPF_K
+  if w5 s>= 0x7fffffff goto Llabel0 // BPF_JSGE | BPF_K
+// CHECK: 26 01 ff ff 40 00 00 00 	if w1 > 64 goto -1
+// CHECK: 36 02 fe ff ff ff ff ff 	if w2 >= -1 goto -2
+// CHECK: 66 04 fd ff ff ff ff ff 	if w4 s> -1 goto -3
+// CHECK: 76 05 fc ff ff ff ff 7f 	if w5 s>= 2147483647 goto -4
+
+  if w6 < 0xff goto Llabel0         // BPF_JLT  | BPF_K
+  if w7 <= 0xffff goto Llabel0      // BPF_JLE  | BPF_K
+  if w8 s< 0 goto Llabel0           // BPF_JSLT | BPF_K
+  if w9 s<= -1 goto Llabel0         // BPF_JSLE | BPF_K
+// CHECK: a6 06 fb ff ff 00 00 00 	if w6 < 255 goto -5
+// CHECK: b6 07 fa ff ff ff 00 00 	if w7 <= 65535 goto -6
+// CHECK: c6 08 f9 ff 00 00 00 00 	if w8 s< 0 goto -7
+// CHECK: d6 09 f8 ff ff ff ff ff 	if w9 s<= -1 goto -8
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
new file mode 100644
index 0000000000000..ff1f7a3748354
--- /dev/null
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -0,0 +1,178 @@
+# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-objdump -d -r %t | FileCheck --check-prefixes CHECK,CHECK-64 %s
+# RUN: llvm-objdump --mattr=+alu32 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-32 %s
+
+// ======== BPF_LD Class ========
+// Some extra whitespaces are deliberately added to test the parser.
+
+  r0 = * (u8 *)skb[0]    // BPF_LD | BPF_ABS | BPF_B
+  r0 = *(u16 *)skb[2]    // BPF_LD | BPF_ABS | BPF_H
+  r0 = * (u32*)skb[4]    // BPF_LD | BPF_ABS | BPF_W
+// CHECK: 30 00 00 00 00 00 00 00 	r0 = *(u8 *)skb[0]
+// CHECK: 28 00 00 00 02 00 00 00 	r0 = *(u16 *)skb[2]
+// CHECK: 20 00 00 00 04 00 00 00 	r0 = *(u32 *)skb[4]
+
+  r0 = * (u8 *)skb[r0]   // BPF_LD | BPF_IND | BPF_B
+  r0 = *  (u16 *)skb[r1] // BPF_LD | BPF_IND | BPF_H
+  r0 = *(u32 *)skb[r2]   // BPF_LD | BPF_IND | BPF_W
+// CHECK: 50 00 00 00 00 00 00 00 	r0 = *(u8 *)skb[r0]
+// CHECK: 48 10 00 00 00 00 00 00 	r0 = *(u16 *)skb[r1]
+// CHECK: 40 20 00 00 00 00 00 00 	r0 = *(u32 *)skb[r2]
+
+  r9 = 0xffffffff ll     // BPF_LD | BPF_DW | BPF_IMM
+  r9 = 8589934591 ll     // BPF_LD | BPF_DW | BPF_IMM
+  r9 = 0x1ffffffff ll    // BPF_LD | BPF_DW | BPF_IMM
+  r9 = dummy_map  ll     // BPF_LD | BPF_DW | BPF_IMM
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 00 00 00 00 	r9 = 4294967295 ll
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 8589934591 ll
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 8589934591 ll
+// CHECK: 18 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 	r9 = 0 ll
+// CHECK: 0000000000000060:  R_SBF_64_64	dummy_map
+
+// ======== BPF_LDX Class ========
+  r5 = *(u8 *)(r0 + 0)   // BPF_LDX | BPF_B
+  r6 = *(u16 *)(r1 + 8)  // BPF_LDX | BPF_H
+  r7 = *(u32 *)(r2 + 16) // BPF_LDX | BPF_W
+  r8 = *(u64 *)(r3 - 30) // BPF_LDX | BPF_DW
+// CHECK-64: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0)
+// CHECK-64: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 8)
+// CHECK-64: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 16)
+// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0)
+// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 8)
+// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 16)
+// CHECK: 79 38 e2 ff 00 00 00 00 	r8 = *(u64 *)(r3 - 30)
+
+// ======== BPF_STX Class ========
+  *(u8 *)(r0 + 0) = r7    // BPF_STX | BPF_B
+  *(u16 *)(r1 + 8) = r8   // BPF_STX | BPF_H
+  *(u32 *)(r2 + 16) = r9  // BPF_STX | BPF_W
+  *(u64 *)(r3 - 30) = r10 // BPF_STX | BPF_DW
+// CHECK-64: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = r7
+// CHECK-64: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = r8
+// CHECK-64: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = r9
+// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = w7
+// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = w8
+// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = w9
+// CHECK: 7b a3 e2 ff 00 00 00 00 	*(u64 *)(r3 - 30) = r10
+
+  lock *(u32 *)(r2 + 16) += r9  // BPF_STX | BPF_W | BPF_XADD
+  lock *(u64 *)(r3 - 30) += r10 // BPF_STX | BPF_DW | BPF_XADD
+// CHECK-64: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += r9
+// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += w9
+// CHECK: db a3 e2 ff 00 00 00 00 	lock *(u64 *)(r3 - 30) += r10
+
+// ======== BPF_JMP Class ========
+  goto Llabel0               // BPF_JA
+  call 1                     // BPF_CALL
+  exit                       // BPF_EXIT
+// CHECK: 05 00 1a 00 00 00 00 00 	goto +26
+// CHECK: 85 00 00 00 01 00 00 00 	call 1
+// CHECK: 95 00 00 00 00 00 00 00 	exit
+
+  if r0 == r1 goto Llabel0   // BPF_JEQ  | BPF_X
+  if r3 != r4 goto Llabel0   // BPF_JNE  | BPF_X
+// CHECK: 1d 10 17 00 00 00 00 00 	if r0 == r1 goto +23
+// CHECK: 5d 43 16 00 00 00 00 00 	if r3 != r4 goto +22
+
+  if r1 > r2 goto Llabel0    // BPF_JGT  | BPF_X
+  if r2 >= r3 goto Llabel0   // BPF_JGE  | BPF_X
+  if r4 s> r5 goto Llabel0   // BPF_JSGT | BPF_X
+  if r5 s>= r6 goto Llabel0  // BPF_JSGE | BPF_X
+// CHECK: 2d 21 15 00 00 00 00 00 	if r1 > r2 goto +21
+// CHECK: 3d 32 14 00 00 00 00 00 	if r2 >= r3 goto +20
+// CHECK: 6d 54 13 00 00 00 00 00 	if r4 s> r5 goto +19
+// CHECK: 7d 65 12 00 00 00 00 00 	if r5 s>= r6 goto +18
+
+  if r6 < r7 goto Llabel0    // BPF_JLT  | BPF_X
+  if r7 <= r8 goto Llabel0   // BPF_JLE  | BPF_X
+  if r8 s< r9 goto Llabel0   // BPF_JSLT | BPF_X
+  if r9 s<= r10 goto Llabel0 // BPF_JSLE | BPF_X
+// CHECK: ad 76 11 00 00 00 00 00 	if r6 < r7 goto +17
+// CHECK: bd 87 10 00 00 00 00 00 	if r7 <= r8 goto +16
+// CHECK: cd 98 0f 00 00 00 00 00 	if r8 s< r9 goto +15
+// CHECK: dd a9 0e 00 00 00 00 00 	if r9 s<= r10 goto +14
+
+  if r0 == 0 goto Llabel0           // BPF_JEQ  | BPF_K
+  if r3 != -1 goto Llabel0          // BPF_JNE  | BPF_K
+// CHECK: 15 00 0d 00 00 00 00 00 	if r0 == 0 goto +13
+// CHECK: 55 03 0c 00 ff ff ff ff 	if r3 != -1 goto +12
+
+  if r1 > 64 goto Llabel0           // BPF_JGT  | BPF_K
+  if r2 >= 0xffffffff goto Llabel0  // BPF_JGE  | BPF_K
+  if r4 s> 0xffffffff goto Llabel0  // BPF_JSGT | BPF_K
+  if r5 s>= 0x7fffffff goto Llabel0 // BPF_JSGE | BPF_K
+// CHECK: 25 01 0b 00 40 00 00 00 	if r1 > 64 goto +11
+// CHECK: 35 02 0a 00 ff ff ff ff 	if r2 >= -1 goto +10
+// CHECK: 65 04 09 00 ff ff ff ff 	if r4 s> -1 goto +9
+// CHECK: 75 05 08 00 ff ff ff 7f 	if r5 s>= 2147483647 goto +8
+
+  if r6 < 0xff goto Llabel0         // BPF_JLT  | BPF_K
+  if r7 <= 0xffff goto Llabel0      // BPF_JLE  | BPF_K
+  if r8 s< 0 goto Llabel0           // BPF_JSLT | BPF_K
+  if r9 s<= -1 goto Llabel0         // BPF_JSLE | BPF_K
+// CHECK: a5 06 07 00 ff 00 00 00 	if r6 < 255 goto +7
+// CHECK: b5 07 06 00 ff ff 00 00 	if r7 <= 65535 goto +6
+// CHECK: c5 08 05 00 00 00 00 00 	if r8 s< 0 goto +5
+// CHECK: d5 09 04 00 ff ff ff ff 	if r9 s<= -1 goto +4
+
+// ======== BPF_ALU64 Class ========
+  r0 += r1    // BPF_ADD  | BPF_X
+  r1 -= r2    // BPF_SUB  | BPF_X
+  r2 *= r3    // BPF_MUL  | BPF_X
+  r3 /= r4    // BPF_DIV  | BPF_X
+// CHECK: 0f 10 00 00 00 00 00 00 	r0 += r1
+// CHECK: 1f 21 00 00 00 00 00 00 	r1 -= r2
+// CHECK: 2f 32 00 00 00 00 00 00 	r2 *= r3
+// CHECK: 3f 43 00 00 00 00 00 00 	r3 /= r4
+
+Llabel0 :
+  r2 = -r2    // BPF_NEG
+  r4 |= r5    // BPF_OR   | BPF_X
+  r5 &= r6    // BPF_AND  | BPF_X
+  r6 <<= r7   // BPF_LSH  | BPF_X
+  r7 >>= r8   // BPF_RSH  | BPF_X
+  r8 ^= r9    // BPF_XOR  | BPF_X
+  r9 = r10    // BPF_MOV  | BPF_X
+  r10 s>>= r0 // BPF_ARSH | BPF_X
+// CHECK: <Llabel0>:
+// CHECK: 87 02 00 00 00 00 00 00	r2 = -r2
+// CHECK: 4f 54 00 00 00 00 00 00 	r4 |= r5
+// CHECK: 5f 65 00 00 00 00 00 00 	r5 &= r6
+// CHECK: 6f 76 00 00 00 00 00 00 	r6 <<= r7
+// CHECK: 7f 87 00 00 00 00 00 00 	r7 >>= r8
+// CHECK: af 98 00 00 00 00 00 00 	r8 ^= r9
+// CHECK: bf a9 00 00 00 00 00 00 	r9 = r10
+// CHECK: cf 0a 00 00 00 00 00 00 	r10 s>>= r0
+
+  r1 = be16 r1  // BPF_END  | BPF_TO_BE
+  r2 = be32 r2  // BPF_END  | BPF_TO_BE
+  r3 = be64 r3  // BPF_END  | BPF_TO_BE
+// CHECK: dc 01 00 00 10 00 00 00 	r1 = be16 r1
+// CHECK: dc 02 00 00 20 00 00 00 	r2 = be32 r2
+// CHECK: dc 03 00 00 40 00 00 00 	r3 = be64 r3
+
+  r0 += 1           // BPF_ADD  | BPF_K
+  r1 -= 0x1         // BPF_SUB  | BPF_K
+  r2 *= -4          // BPF_MUL  | BPF_K
+  r3 /= 5           // BPF_DIV  | BPF_K
+// CHECK: 07 00 00 00 01 00 00 00 	r0 += 1
+// CHECK: 17 01 00 00 01 00 00 00 	r1 -= 1
+// CHECK: 27 02 00 00 fc ff ff ff 	r2 *= -4
+// CHECK: 37 03 00 00 05 00 00 00 	r3 /= 5
+
+  r4 |= 0xff        // BPF_OR   | BPF_K
+  r5 &= 0xFF        // BPF_AND  | BPF_K
+  r6 <<= 63         // BPF_LSH  | BPF_K
+  r7 >>= 32         // BPF_RSH  | BPF_K
+  r8 ^= 0           // BPF_XOR  | BPF_K
+  r9 = 1            // BPF_MOV  | BPF_K
+  r9 = 0xffffffff   // BPF_MOV  | BPF_K
+  r10 s>>= 64       // BPF_ARSH | BPF_K
+// CHECK: 47 04 00 00 ff 00 00 00 	r4 |= 255
+// CHECK: 57 05 00 00 ff 00 00 00 	r5 &= 255
+// CHECK: 67 06 00 00 3f 00 00 00 	r6 <<= 63
+// CHECK: 77 07 00 00 20 00 00 00 	r7 >>= 32
+// CHECK: a7 08 00 00 00 00 00 00 	r8 ^= 0
+// CHECK: b7 09 00 00 01 00 00 00 	r9 = 1
+// CHECK: b7 09 00 00 ff ff ff ff 	r9 = -1
+// CHECK: c7 0a 00 00 40 00 00 00 	r10 s>>= 64
diff --git a/llvm/test/MC/SBF/lit.local.cfg b/llvm/test/MC/SBF/lit.local.cfg
new file mode 100644
index 0000000000000..edf638fc61af9
--- /dev/null
+++ b/llvm/test/MC/SBF/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'SBF' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/MC/SBF/load-store-32.s b/llvm/test/MC/SBF/load-store-32.s
new file mode 100644
index 0000000000000..55460fd11f594
--- /dev/null
+++ b/llvm/test/MC/SBF/load-store-32.s
@@ -0,0 +1,28 @@
+# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-objdump --mattr=+alu32 -d -r %t | FileCheck --check-prefix=CHECK-32 %s
+# RUN: llvm-objdump -d -r %t | FileCheck %s
+
+// ======== BPF_LDX Class ========
+  w5 = *(u8 *)(r0 + 0)   // BPF_LDX | BPF_B
+  w6 = *(u16 *)(r1 + 8)  // BPF_LDX | BPF_H
+  w7 = *(u32 *)(r2 + 16) // BPF_LDX | BPF_W
+// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0)
+// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 8)
+// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 16)
+// CHECK: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0)
+// CHECK: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 8)
+// CHECK: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 16)
+
+// ======== BPF_STX Class ========
+  *(u8 *)(r0 + 0) = w7    // BPF_STX | BPF_B
+  *(u16 *)(r1 + 8) = w8   // BPF_STX | BPF_H
+  *(u32 *)(r2 + 16) = w9  // BPF_STX | BPF_W
+  lock *(u32 *)(r2 + 16) += w9  // BPF_STX | BPF_W | BPF_XADD
+// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = w7
+// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = w8
+// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = w9
+// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += w9
+// CHECK: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = r7
+// CHECK: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = r8
+// CHECK: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = r9
+// CHECK: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += r9
diff --git a/llvm/test/MC/SBF/sbf-sdiv.s b/llvm/test/MC/SBF/sbf-sdiv.s
new file mode 100644
index 0000000000000..75dcfeb2e3df4
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-sdiv.s
@@ -0,0 +1,15 @@
+# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-objdump -d -r %t | FileCheck %s
+
+w1 s/= w2   // BPF_SDIV | BPF_X
+// CHECK: ec 21 00 00 00 00 00 00      w1 s/= w2
+
+w3 s/= 6    // BPF_SDIV | BPF_K
+// CHECK: e4 03 00 00 06 00 00 00      w3 s/= 6
+
+
+r4 s/= r5   // BPF_SDIV | BPF_X
+// CHECK: ef 54 00 00 00 00 00 00 	r4 s/= r5
+
+r5 s/= 6    // BPF_SDIV | BPF_K
+// CHECK: e7 05 00 00 06 00 00 00 	r5 s/= 6
diff --git a/llvm/test/Object/SBF/lit.local.cfg b/llvm/test/Object/SBF/lit.local.cfg
new file mode 100644
index 0000000000000..edf638fc61af9
--- /dev/null
+++ b/llvm/test/Object/SBF/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'SBF' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/Object/SBF/yaml2obj-elf-sbf-rel.yaml b/llvm/test/Object/SBF/yaml2obj-elf-sbf-rel.yaml
new file mode 100644
index 0000000000000..87cc3bef8b1e8
--- /dev/null
+++ b/llvm/test/Object/SBF/yaml2obj-elf-sbf-rel.yaml
@@ -0,0 +1,86 @@
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-readobj -r --stack-sizes %t | FileCheck %s
+
+# CHECK:      Relocations [
+# CHECK-NEXT:   Section (3) .rel.text {
+# CHECK-NEXT:     0x0 R_SBF_64_64 g
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section (5) .rel.stack_sizes {
+# CHECK-NEXT:     0x0 R_SBF_64_ABS64 .text
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
+# CHECK:      StackSizes [
+# CHECK-NEXT:   Entry {
+# CHECK-NEXT:     Functions: [test]
+# CHECK-NEXT:     Size: 0x0
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_SBF
+Sections:
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:    0x8
+    Content:         '1801000000000000000000000000000061100000000000009500000000000000'
+  - Name:            .stack_sizes
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_LINK_ORDER ]
+    Link:            .text
+    AddressAlign:    0x1
+    Entries:
+      - Size:            0x0
+  - Name:            .bss
+    Type:            SHT_NOBITS
+    Flags:           [ SHF_WRITE, SHF_ALLOC ]
+    AddressAlign:    0x4
+    Size:            0x4
+  - Name:            .rel.text
+    Type:            SHT_REL
+    Link:            .symtab
+    AddressAlign:    0x8
+    Info:            .text
+    Relocations:
+      - Symbol:          g
+        Type:            R_SBF_64_64
+  - Name:            .rel.stack_sizes
+    Type:            SHT_REL
+    Link:            .symtab
+    AddressAlign:    0x8
+    Info:            .stack_sizes
+    Relocations:
+      - Symbol:          .text
+        Type:            R_SBF_64_ABS64
+  - Type:            SectionHeaderTable
+    Sections:
+      - Name:            .strtab
+      - Name:            .text
+      - Name:            .rel.text
+      - Name:            .stack_sizes
+      - Name:            .rel.stack_sizes
+      - Name:            .bss
+      - Name:            .symtab
+      - Name:            .shstrtab
+Symbols:
+  - Name:            t.c
+    Type:            STT_FILE
+    Index:           SHN_ABS
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            test
+    Type:            STT_FUNC
+    Section:         .text
+    Binding:         STB_GLOBAL
+    Size:            0x20
+  - Name:            g
+    Type:            STT_OBJECT
+    Section:         .bss
+    Binding:         STB_GLOBAL
+    Size:            0x4
+...
diff --git a/llvm/test/tools/llvm-readobj/ELF/file-header-machine-types.test b/llvm/test/tools/llvm-readobj/ELF/file-header-machine-types.test
index 9ba1dff6ec84e..d3a180f32bf89 100644
--- a/llvm/test/tools/llvm-readobj/ELF/file-header-machine-types.test
+++ b/llvm/test/tools/llvm-readobj/ELF/file-header-machine-types.test
@@ -477,6 +477,9 @@
 # RUN: yaml2obj %s -o %t.bpf.o -D MACHINE=EM_BPF
 # RUN: llvm-readelf --file-headers %t.bpf.o | FileCheck %s -DMACHINE="EM_BPF"
 
+# RUN: yaml2obj %s -o %t.sbf.o -D MACHINE=EM_SBF
+# RUN: llvm-readelf --file-headers %t.sbf.o | FileCheck %s -DMACHINE="Solana Bytecode Format"
+
 # RUN: yaml2obj %s -o %t.ve.o -D MACHINE=EM_VE
 # RUN: llvm-readelf --file-headers %t.ve.o | FileCheck %s -DMACHINE="NEC SX-Aurora Vector Engine"
 
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index bfca65aad52b4..2d656671b0821 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -1282,6 +1282,7 @@ const EnumEntry<unsigned> ElfMachineType[] = {
   ENUM_ENT(EM_RISCV,         "RISC-V"),
   ENUM_ENT(EM_LANAI,         "EM_LANAI"),
   ENUM_ENT(EM_BPF,           "EM_BPF"),
+  ENUM_ENT(EM_SBF,           "Solana Bytecode Format"),
   ENUM_ENT(EM_VE,            "NEC SX-Aurora Vector Engine"),
   ENUM_ENT(EM_LOONGARCH,     "LoongArch"),
 };
diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp
index fc8bd665cbbe9..48ad116cb34a5 100644
--- a/llvm/tools/opt/opt.cpp
+++ b/llvm/tools/opt/opt.cpp
@@ -21,5 +21,3 @@ class PassBuilder;
 extern "C" int optMain(int argc, char **argv,
                        llvm::ArrayRef<std::function<void(llvm::PassBuilder &)>>
                            PassBuilderCallbacks);
-
-int main(int argc, char **argv) { return optMain(argc, argv, {}); }
diff --git a/llvm/unittests/Object/ELFObjectFileTest.cpp b/llvm/unittests/Object/ELFObjectFileTest.cpp
index 2a0921690914b..dff8cd3adb7a1 100644
--- a/llvm/unittests/Object/ELFObjectFileTest.cpp
+++ b/llvm/unittests/Object/ELFObjectFileTest.cpp
@@ -232,6 +232,14 @@ TEST(ELFObjectFileTest, MachineTestForBPF) {
     checkFormatAndArch(Data, Formats[Idx], Archs[Idx]);
 }
 
+TEST(ELFObjectFileTest, MachineTestForSBF) {
+  std::array<StringRef, 4> Formats = {"elf32-unknown", "elf32-unknown",
+                                      "elf64-sbf", "elf64-sbf"};
+  size_t I = 0;
+  for (const DataForTest &D : generateData(ELF::EM_SBF))
+    checkFormatAndArch(D, Formats[I++], Triple::sbf);
+}
+
 TEST(ELFObjectFileTest, MachineTestForAVR) {
   std::array<StringRef, 4> Formats = {"elf32-avr", "elf32-avr", "elf64-unknown",
                                       "elf64-unknown"};
diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp
index 61b3637bb48e2..0e298fbe322d9 100644
--- a/llvm/unittests/TargetParser/TripleTest.cpp
+++ b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -751,6 +751,24 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::Linux, T.getOS());
   EXPECT_EQ(Triple::MuslSF, T.getEnvironment());
 
+  T = Triple("sbf-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
+  T = Triple("sbf-unknown-unknown");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::UnknownOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
+  T = Triple("sbf");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::UnknownOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
   T = Triple("riscv32-unknown-unknown");
   EXPECT_EQ(Triple::riscv32, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
@@ -1840,6 +1858,12 @@ TEST(TripleTest, BitWidthChecks) {
   EXPECT_TRUE(T.isArch64Bit());
   EXPECT_TRUE(T.isRISCV());
 
+  T.setArch(Triple::sbf);
+  EXPECT_FALSE(T.isArch16Bit());
+  EXPECT_FALSE(T.isArch32Bit());
+  EXPECT_TRUE(T.isArch64Bit());
+  EXPECT_TRUE(T.isSBF());
+
   T.setArch(Triple::csky);
   EXPECT_FALSE(T.isArch16Bit());
   EXPECT_TRUE(T.isArch32Bit());
@@ -2025,6 +2049,10 @@ TEST(TripleTest, BitWidthArchVariants) {
   EXPECT_EQ(Triple::loongarch32, T.get32BitArchVariant().getArch());
   EXPECT_EQ(Triple::loongarch64, T.get64BitArchVariant().getArch());
 
+  T.setArch(Triple::sbf);
+  EXPECT_EQ(Triple::UnknownArch, T.get32BitArchVariant().getArch());
+  EXPECT_EQ(Triple::sbf, T.get64BitArchVariant().getArch());
+
   T.setArch(Triple::thumbeb);
   EXPECT_EQ(Triple::thumbeb, T.get32BitArchVariant().getArch());
   EXPECT_EQ(Triple::aarch64_be, T.get64BitArchVariant().getArch());
@@ -2115,6 +2143,10 @@ TEST(TripleTest, EndianArchVariants) {
   EXPECT_EQ(Triple::bpfeb, T.getBigEndianArchVariant().getArch());
   EXPECT_EQ(Triple::bpfel, T.getLittleEndianArchVariant().getArch());
 
+  T.setArch(Triple::sbf);
+  EXPECT_EQ(Triple::UnknownArch, T.getBigEndianArchVariant().getArch());
+  EXPECT_EQ(Triple::sbf, T.getLittleEndianArchVariant().getArch());
+
   T.setArch(Triple::mips64);
   EXPECT_EQ(Triple::mips64, T.getBigEndianArchVariant().getArch());
   EXPECT_EQ(Triple::NoSubArch, T.getBigEndianArchVariant().getSubArch());

From 07cdfe9966c9530824ccb917f383cb0085d47bf1 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Sat, 15 Oct 2022 10:51:13 -0500
Subject: [PATCH 002/114] [SOL] Add regression test for
 shouldSignExtendTypeInLibCall fix.

---
 llvm/test/CodeGen/SBF/f64-intrinsics.ll | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 llvm/test/CodeGen/SBF/f64-intrinsics.ll

diff --git a/llvm/test/CodeGen/SBF/f64-intrinsics.ll b/llvm/test/CodeGen/SBF/f64-intrinsics.ll
new file mode 100644
index 0000000000000..f71fb71c81c72
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/f64-intrinsics.ll
@@ -0,0 +1,24 @@
+; RUN: llc -march=sbf -mattr=+alu32 < %s | FileCheck -check-prefix=CHECK32 %s
+; RUN: llc -march=sbf < %s | FileCheck -check-prefix=CHECK64 %s
+
+; TODO: Add much more coverage. Currently this a sign extension regression
+; test (SBFTargetLowering::shouldSignExtendTypeInLibCall).
+
+declare double @llvm.powi.f64.i32(double, i32)
+
+define double @powi_f64(double %a, i32 %b) nounwind {
+; CHECK32-LABEL: powi_f64:
+; CHECK32:       # %bb.0:
+; CHECK32-NEXT:    call __powidf2
+; CHECK32-NEXT:    exit
+;
+; CHECK64-LABEL: powi_f64:
+; CHECK64:       # %bb.0:
+; CHECK64-NEXT:    r2 <<= 32
+; CHECK64-NEXT:    r2 s>>= 32
+; CHECK64-NEXT:    call __powidf2
+; CHECK64-NEXT:    exit
+  %1 = call double @llvm.powi.f64.i32(double %a, i32 %b)
+  ret double %1
+}
+

From 92b1fdb2ce1bd5bf15ca17a6eaa4dcb1deaf242d Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Fri, 21 Oct 2022 14:30:04 -0500
Subject: [PATCH 003/114] [SOL] Add warn_drv_no_solana_with_bpf to
 warning-flags unit test.

---
 clang/test/Misc/warning-flags.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
index 1fd0244083335..41d6ebef3a37f 100644
--- a/clang/test/Misc/warning-flags.c
+++ b/clang/test/Misc/warning-flags.c
@@ -45,6 +45,7 @@ CHECK-NEXT:   warn_double_const_requires_fp64
 CHECK-NEXT:   warn_drv_amdgpu_cov6
 CHECK-NEXT:   warn_drv_assuming_mfloat_abi_is
 CHECK-NEXT:   warn_drv_clang_unsupported
+CHECK-NEXT:   warn_drv_no_solana_with_bpf
 CHECK-NEXT:   warn_drv_pch_not_first_include
 CHECK-NEXT:   warn_expected_qualified_after_typename
 CHECK-NEXT:   warn_fe_backend_unsupported

From 4565c99ea0b4a31d9c28ed2fde219c8a1a2e1188 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Tue, 15 Nov 2022 13:43:46 -0600
Subject: [PATCH 004/114] [SOL] Reworked the SBF textual assembly syntax to
 match the rbpf-style syntax. (#54)

- Update the syntax of every instruction in SBFInstrInfo.td (currently
  using the asm variants feature to temporarily support both).
- Update AsmParser for the new syntax (add new operand, memory,
  instruction, and directive parse routines).
- Add error checking for unresolved 16-bit branch relocations and
  emit error message for graceful exit (the old BPF back-end crashes)
  and corresponding lit unit test.
- Add new lit unit tests in MC/SBF and MC/Disassembler/SBF to cover
  disassembly, object emission, and parsing of every single instruction.
  This is more extensive coverage than existed previously.
- Remaster all CodeGen/SBF unit tests accordingly.
- A minor TableGen patch was needed to support asm strings containing
  '|' within variant strings ('|' happens to be the variant separator).

The patch is a bit more complex than it otherwise might be in that we
currently support both syntaxes to ease the verification (e.g., being
able to see and compare each instruction and object code side-by-side
within each unit test). After some 'soak time' for the new functionality,
I intend to remove the old syntax altogether and otherwise clean-up. We'll
also remove the TableGen patch at that time.
---
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp | 163 ++++++-
 llvm/lib/Target/SBF/CMakeLists.txt            |   1 +
 .../Target/SBF/MCTargetDesc/CMakeLists.txt    |   1 +
 .../SBF/MCTargetDesc/SBFELFObjectWriter.cpp   |   5 +
 .../SBF/MCTargetDesc/SBFInstPrinter.cpp       |   1 +
 .../Target/SBF/MCTargetDesc/SBFInstPrinter.h  |  21 +
 .../Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp  |  46 ++
 .../Target/SBF/MCTargetDesc/SBFMCAsmInfo.h    |  28 +-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |   3 +
 llvm/lib/Target/SBF/SBF.td                    |  33 +-
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |  11 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 268 ++++++-----
 llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll    |  46 +-
 .../CodeGen/SBF/32-bit-subreg-cond-select.ll  |  28 +-
 .../CodeGen/SBF/32-bit-subreg-load-store.ll   |  16 +-
 .../SBF/32-bit-subreg-peephole-phi-1.ll       |   6 +-
 .../SBF/32-bit-subreg-peephole-phi-2.ll       |   6 +-
 .../SBF/32-bit-subreg-peephole-phi-3.ll       |   8 +-
 .../CodeGen/SBF/32-bit-subreg-peephole.ll     |  40 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll     |  20 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll     |  20 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll     |   8 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll     |   8 +-
 .../CodeGen/SBF/adjust-opt-speculative1.ll    |  18 +-
 .../CodeGen/SBF/adjust-opt-speculative2.ll    |  32 +-
 llvm/test/CodeGen/SBF/alu8.ll                 |  14 +-
 llvm/test/CodeGen/SBF/atomics_sbf.ll          | 204 ++++-----
 llvm/test/CodeGen/SBF/basictest.ll            |  10 +-
 llvm/test/CodeGen/SBF/byval.ll                |   8 +-
 llvm/test/CodeGen/SBF/cc_args.ll              |  44 +-
 llvm/test/CodeGen/SBF/cc_ret.ll               |  12 +-
 llvm/test/CodeGen/SBF/cmp.ll                  |  20 +-
 llvm/test/CodeGen/SBF/ex1.ll                  |   8 +-
 llvm/test/CodeGen/SBF/f64-intrinsics.ll       |   4 +-
 llvm/test/CodeGen/SBF/fi_ri.ll                |  12 +-
 llvm/test/CodeGen/SBF/i128.ll                 |   8 +-
 llvm/test/CodeGen/SBF/inline_asm.ll           |  14 +-
 llvm/test/CodeGen/SBF/is_trunc_free.ll        |   4 +-
 llvm/test/CodeGen/SBF/is_zext_free.ll         |   4 +-
 llvm/test/CodeGen/SBF/load.ll                 |  12 +-
 llvm/test/CodeGen/SBF/loop-exit-cond.ll       |   6 +-
 llvm/test/CodeGen/SBF/loops.ll                |  10 +-
 llvm/test/CodeGen/SBF/many_args1.ll           |  12 +-
 llvm/test/CodeGen/SBF/many_args2.ll           |   4 +-
 llvm/test/CodeGen/SBF/mem_offset.ll           |   4 +-
 .../CodeGen/SBF/memcpy-expand-in-order.ll     |  20 +-
 llvm/test/CodeGen/SBF/ninline_asm.ll          |  37 ++
 llvm/test/CodeGen/SBF/objdump_atomics.ll      |  12 +-
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |  32 +-
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll    |   8 +-
 llvm/test/CodeGen/SBF/objdump_dis_all.ll      |   2 +-
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      |  20 +-
 llvm/test/CodeGen/SBF/objdump_intrinsics.ll   |  10 +-
 llvm/test/CodeGen/SBF/objdump_nop.ll          |  10 +-
 llvm/test/CodeGen/SBF/objdump_static_var.ll   |  10 +-
 llvm/test/CodeGen/SBF/objdump_trivial.ll      |   2 +-
 llvm/test/CodeGen/SBF/preprocess-loads.ll     |  10 +-
 llvm/test/CodeGen/SBF/reloc-2.ll              |   4 +-
 llvm/test/CodeGen/SBF/remove_truncate_1.ll    |  14 +-
 llvm/test/CodeGen/SBF/remove_truncate_2.ll    |  16 +-
 llvm/test/CodeGen/SBF/remove_truncate_3.ll    |  24 +-
 llvm/test/CodeGen/SBF/remove_truncate_5.ll    |   8 +-
 llvm/test/CodeGen/SBF/remove_truncate_6.ll    |   8 +-
 llvm/test/CodeGen/SBF/remove_truncate_7.ll    |   6 +-
 llvm/test/CodeGen/SBF/remove_truncate_8.ll    |   4 +-
 llvm/test/CodeGen/SBF/rodata_1.ll             |  20 +-
 llvm/test/CodeGen/SBF/rodata_2.ll             |  18 +-
 llvm/test/CodeGen/SBF/rodata_3.ll             |  10 +-
 llvm/test/CodeGen/SBF/rodata_4.ll             |  10 +-
 llvm/test/CodeGen/SBF/rodata_5.ll             |   8 +-
 llvm/test/CodeGen/SBF/rodata_6.ll             |   6 +-
 llvm/test/CodeGen/SBF/rodata_7.ll             |   6 +-
 llvm/test/CodeGen/SBF/sanity.ll               |  36 +-
 llvm/test/CodeGen/SBF/sdiv.ll                 |   2 +-
 llvm/test/CodeGen/SBF/select_ri.ll            |  10 +-
 llvm/test/CodeGen/SBF/selectiondag-bug.ll     |   8 +-
 llvm/test/CodeGen/SBF/setcc.ll                |  48 +-
 llvm/test/CodeGen/SBF/shifts.ll               |  26 +-
 llvm/test/CodeGen/SBF/spill-alu32.ll          |  10 +-
 llvm/test/CodeGen/SBF/struct_ret1.ll          |  10 +-
 llvm/test/CodeGen/SBF/struct_ret2.ll          |   8 +-
 llvm/test/CodeGen/SBF/undef.ll                |  28 +-
 llvm/test/CodeGen/SBF/xadd_legal.ll           |  12 +-
 llvm/test/MC/Disassembler/SBF/lit.local.cfg   |   2 +
 llvm/test/MC/Disassembler/SBF/sbf-alu.txt     | 348 ++++++++++++++
 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt     | 210 +++++++++
 llvm/test/MC/Disassembler/SBF/sbf-ldst.txt    | 198 ++++++++
 llvm/test/MC/SBF/elf-flags.s                  |  15 +
 llvm/test/MC/SBF/elf-header.s                 |  21 +
 llvm/test/MC/SBF/insn-unit-32.s               |   6 +-
 llvm/test/MC/SBF/insn-unit.s                  |   6 +-
 llvm/test/MC/SBF/load-store-32.s              |   6 +-
 llvm/test/MC/SBF/sbf-alu.s                    | 433 ++++++++++++++++++
 llvm/test/MC/SBF/sbf-invalid-jmp.s            |  10 +
 llvm/test/MC/SBF/sbf-jmp.s                    | 289 ++++++++++++
 llvm/test/MC/SBF/sbf-ldst.s                   | 262 +++++++++++
 llvm/test/MC/SBF/sbf-sdiv.s                   |   4 +-
 llvm/tools/llvm-objdump/ObjdumpOpts.td        |   4 +
 llvm/tools/llvm-objdump/llvm-objdump.cpp      |   6 +
 .../TableGen/Common/CodeGenInstruction.cpp    |  13 +-
 100 files changed, 2868 insertions(+), 749 deletions(-)
 create mode 100644 llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
 create mode 100644 llvm/test/CodeGen/SBF/ninline_asm.ll
 create mode 100644 llvm/test/MC/Disassembler/SBF/lit.local.cfg
 create mode 100644 llvm/test/MC/Disassembler/SBF/sbf-alu.txt
 create mode 100644 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
 create mode 100644 llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
 create mode 100644 llvm/test/MC/SBF/elf-flags.s
 create mode 100644 llvm/test/MC/SBF/elf-header.s
 create mode 100644 llvm/test/MC/SBF/sbf-alu.s
 create mode 100644 llvm/test/MC/SBF/sbf-invalid-jmp.s
 create mode 100644 llvm/test/MC/SBF/sbf-jmp.s
 create mode 100644 llvm/test/MC/SBF/sbf-ldst.s

diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index 927593a749247..4d689b434534a 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "MCTargetDesc/SBFInstPrinter.h"
 #include "TargetInfo/SBFTargetInfo.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -31,6 +32,10 @@ class SBFAsmParser : public MCTargetAsmParser {
 
   SMLoc getLoc() const { return getParser().getTok().getLoc(); }
 
+  bool isNewSyntax() {
+    return getParser().getAssemblerDialect() == 0;
+  }
+
   bool PreMatchCheck(OperandVector &Operands);
 
   bool MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
@@ -45,21 +50,26 @@ class SBFAsmParser : public MCTargetAsmParser {
   bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                         SMLoc NameLoc, OperandVector &Operands) override;
 
+  bool parseOldInstruction(ParseInstructionInfo &Info, StringRef Name,
+                           SMLoc NameLoc, OperandVector &Operands);
+
   bool ParseDirective(AsmToken DirectiveID) override;
 
-  // "=" is used as assignment operator for assembly statment, so can't be used
-  // for symbol assignment.
-  bool equalIsAsmAssignment() override { return false; }
+  // "=" is used as assignment operator for assembly statement, so can't be used
+  // for symbol assignment (old syntax only).
+  bool equalIsAsmAssignment() override { return isNewSyntax(); }
   // "*" is used for dereferencing memory that it will be the start of
-  // statement.
-  bool starIsStartOfStatement() override { return true; }
+  // statement (old syntax only).
+  bool starIsStartOfStatement() override { return !isNewSyntax(); }
 
 #define GET_ASSEMBLER_HEADER
 #include "SBFGenAsmMatcher.inc"
 
+  bool parseOperand(OperandVector &Operands, StringRef Mnemonic);
   OperandMatchResultTy parseImmediate(OperandVector &Operands);
   OperandMatchResultTy parseRegister(OperandVector &Operands);
   OperandMatchResultTy parseOperandAsOperator(OperandVector &Operands);
+  OperandMatchResultTy parseMemOperand(OperandVector &Operands);
 
 public:
   enum SBFMatchResultTy {
@@ -161,13 +171,20 @@ struct SBFOperand : public MCParsedAsmOperand {
   }
 
   void print(raw_ostream &OS) const override {
+    auto RegName = [](unsigned Reg) {
+      if (Reg)
+        return SBFInstPrinter::getRegisterName(Reg);
+      else
+        return "noreg";
+    };
+
     switch (Kind) {
     case Immediate:
       OS << *getImm();
       break;
     case Register:
-      OS << "<register x";
-      OS << getReg() << ">";
+      OS << "<register ";
+      OS << RegName(getReg()) << ">";
       break;
     case Token:
       OS << "'" << getToken() << "'";
@@ -263,6 +280,10 @@ struct SBFOperand : public MCParsedAsmOperand {
 
 bool SBFAsmParser::PreMatchCheck(OperandVector &Operands) {
 
+  // These checks not needed for the new syntax.
+  if (isNewSyntax())
+    return false;
+
   if (Operands.size() == 4) {
     // check "reg1 = -reg2" and "reg1 = be16/be32/be64/le16/le32/le64 reg2",
     // reg1 must be the same as reg2
@@ -293,7 +314,9 @@ bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
   if (PreMatchCheck(Operands))
     return Error(IDLoc, "additional inst constraint not met");
 
-  switch (MatchInstructionImpl(Operands, Inst, ErrorInfo, MatchingInlineAsm)) {
+  unsigned Dialect = getParser().getAssemblerDialect();
+  switch (MatchInstructionImpl(Operands, Inst, ErrorInfo, MatchingInlineAsm,
+                               Dialect)) {
   default:
     break;
   case Match_Success:
@@ -349,6 +372,9 @@ OperandMatchResultTy SBFAsmParser::tryParseRegister(unsigned &RegNo,
 
 OperandMatchResultTy
 SBFAsmParser::parseOperandAsOperator(OperandVector &Operands) {
+  if (isNewSyntax())
+    llvm_unreachable("parseOperandAsOperator called for new syntax");
+
   SMLoc S = getLoc();
 
   if (getLexer().getKind() == AsmToken::Identifier) {
@@ -458,10 +484,108 @@ OperandMatchResultTy SBFAsmParser::parseImmediate(OperandVector &Operands) {
   return MatchOperand_Success;
 }
 
-/// ParseInstruction - Parse an SBF instruction which is in SBF verifier
-/// format.
+OperandMatchResultTy SBFAsmParser::parseMemOperand(OperandVector &Operands) {
+  if (getLexer().isNot(AsmToken::LBrac)) {
+    return MatchOperand_ParseFail;
+  }
+
+  getParser().Lex(); // Eat '['.
+  Operands.push_back(SBFOperand::createToken("[", getLoc()));
+
+  if (parseRegister(Operands) != MatchOperand_Success) {
+    Error(getLoc(), "expected register");
+    return MatchOperand_ParseFail;
+  }
+
+  if (parseImmediate(Operands) != MatchOperand_Success) {
+    Error(getLoc(), "expected immediate offset");
+    return MatchOperand_ParseFail;
+  }
+
+  if (getLexer().isNot(AsmToken::RBrac)) {
+    Error(getLoc(), "expected ']'");
+    return MatchOperand_ParseFail;
+  }
+
+  getParser().Lex(); // Eat ']'.
+  Operands.push_back(SBFOperand::createToken("]", getLoc()));
+
+  return MatchOperand_Success;
+}
+
+/// Looks at a token type and creates the relevant operand from this
+/// information, adding to Operands. If operand was parsed, returns false, else
+/// true.
+bool SBFAsmParser::parseOperand(OperandVector &Operands, StringRef Mnemonic) {
+  if (!isNewSyntax())
+    llvm_unreachable("parseOperand called for old syntax");
+
+  // Attempt to parse token as a register.
+  if (parseRegister(Operands) == MatchOperand_Success)
+    return false;
+
+  // Attempt to parse token as an immediate.
+  if (parseImmediate(Operands) == MatchOperand_Success) {
+    return false;
+  }
+
+  // Attempt to parse token sequence as a memory operand ("[reg+/-offset]").
+  if (parseMemOperand(Operands) == MatchOperand_Success) {
+    return false;
+  }
+
+  // Finally we have exhausted all options and must declare defeat.
+  Error(getLoc(), "unknown operand");
+  return true;
+}
+
+/// Parse an SBF instruction.
 bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                                     SMLoc NameLoc, OperandVector &Operands) {
+  if (!isNewSyntax()) {
+    return parseOldInstruction(Info, Name, NameLoc, Operands);
+  }
+
+  // First operand is token for instruction mnemonic.
+  Operands.push_back(SBFOperand::createToken(Name, NameLoc));
+
+  // If there are no more operands, then finish.
+  if (getLexer().is(AsmToken::EndOfStatement)) {
+    getParser().Lex(); // Consume the EndOfStatement.
+    return false;
+  }
+
+  // Parse first operand.
+  if (parseOperand(Operands, Name))
+    return true;
+
+  // Parse until end of statement, consuming commas between operands.
+  while (getLexer().is(AsmToken::Comma)) {
+    // Consume comma token.
+    getLexer().Lex();
+
+    // Parse next operand.
+    if (parseOperand(Operands, Name))
+      return true;
+  }
+
+  if (getLexer().isNot(AsmToken::EndOfStatement)) {
+    SMLoc Loc = getLexer().getLoc();
+    getParser().eatToEndOfStatement();
+    return Error(Loc, "unexpected token");
+  }
+
+  getParser().Lex(); // Consume the EndOfStatement.
+  return false;
+}
+
+/// Parse an SBF instruction which is in SBF verifier format (old syntax).
+bool SBFAsmParser::parseOldInstruction(ParseInstructionInfo &Info,
+                                       StringRef Name, SMLoc NameLoc,
+                                       OperandVector &Operands) {
+  if (isNewSyntax())
+    llvm_unreachable("parseOldInstruction called for new syntax");
+
   // The first operand could be either register or actually an operator.
   unsigned RegNo = MatchRegisterName(Name);
 
@@ -502,7 +626,24 @@ bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
   return false;
 }
 
-bool SBFAsmParser::ParseDirective(AsmToken DirectiveID) { return true; }
+bool SBFAsmParser::ParseDirective(AsmToken DirectiveID) {
+  // This returns false if this function recognizes the directive
+  // regardless of whether it is successfully handles or reports an
+  // error. Otherwise it returns true to give the generic parser a
+  // chance at recognizing it.
+  StringRef IDVal = DirectiveID.getString();
+
+  if (IDVal == ".syntax_old") {
+    getParser().setAssemblerDialect(1);
+    return false;
+  }
+  if (IDVal == ".syntax_new") {
+    getParser().setAssemblerDialect(0);
+    return false;
+  }
+
+  return true;
+}
 
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFAsmParser() {
   RegisterMCAsmParser<SBFAsmParser> XX(getTheSBFXTarget());
diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index cc8a9c7d1c0e9..c7c1fc870f2fc 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -4,6 +4,7 @@ set(LLVM_TARGET_DEFINITIONS SBF.td)
 
 tablegen(LLVM SBFGenAsmMatcher.inc -gen-asm-matcher)
 tablegen(LLVM SBFGenAsmWriter.inc -gen-asm-writer)
+tablegen(LLVM SBFGenAsmWriter1.inc -gen-asm-writer -asmwriternum=1)
 tablegen(LLVM SBFGenCallingConv.inc -gen-callingconv)
 tablegen(LLVM SBFGenDAGISel.inc -gen-dag-isel)
 tablegen(LLVM SBFGenDisassemblerTables.inc -gen-disassembler)
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
index 23c8c21c548ee..eec1732039fb4 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
@@ -2,6 +2,7 @@ add_llvm_component_library(LLVMSBFDesc
   SBFMCTargetDesc.cpp
   SBFAsmBackend.cpp
   SBFInstPrinter.cpp
+  SBFMCAsmInfo.cpp
   SBFMCCodeEmitter.cpp
   SBFELFObjectWriter.cpp
 
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
index cbd7e3abe592a..1c81fa0e128ca 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
@@ -8,6 +8,7 @@
 
 #include "MCTargetDesc/SBFMCTargetDesc.h"
 #include "llvm/BinaryFormat/ELF.h"
+#include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFObjectWriter.h"
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCObjectWriter.h"
@@ -65,6 +66,10 @@ unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
   case FK_PCRel_4:
     // CALL instruction.
     return ELF::R_SBF_64_32;
+  case FK_PCRel_2:
+    // Branch instruction.
+    Ctx.reportError(Fixup.getLoc(), "2-byte relocations not supported");
+    return ELF::R_SBF_NONE;
   case FK_Data_8:
     return (isSolana && !relocAbs64) ? ELF::R_SBF_64_64 : ELF::R_SBF_64_ABS64;
   case FK_Data_4:
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
index c158bc3101290..5ecf2facc5448 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
@@ -23,6 +23,7 @@ using namespace llvm;
 
 // Include the auto-generated portion of the assembly writer.
 #include "SBFGenAsmWriter.inc"
+#include "SBFGenAsmWriter1.inc"
 
 void SBFInstPrinter::printInst(const MCInst *MI, uint64_t Address,
                                StringRef Annot, const MCSubtargetInfo &STI,
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
index 1f1e069e62d94..1cd4066e98119 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
@@ -36,6 +36,27 @@ class SBFInstPrinter : public MCInstPrinter {
   void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
   static const char *getRegisterName(unsigned RegNo);
 };
+
+class MachineInstr;
+
+class SBFLegacyInstPrinter : public SBFInstPrinter {
+public:
+  SBFLegacyInstPrinter(const MCAsmInfo &MAI, const MCInstrInfo &MII,
+                   const MCRegisterInfo &MRI)
+      : SBFInstPrinter(MAI, MII, MRI) {}
+
+  void printInst(const MCInst *MI, uint64_t Address, StringRef Annot,
+                 const MCSubtargetInfo &STI, raw_ostream &O) override {
+    printInstruction(MI, Address, O);
+    printAnnotation(O, Annot);
+  }
+
+  // Autogenerated by tblgen.
+  std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
+  void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
+  static const char *getRegisterName(unsigned RegNo);
+};
+
 }
 
 #endif
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
new file mode 100644
index 0000000000000..b62248c3151e9
--- /dev/null
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
@@ -0,0 +1,46 @@
+//===-- SBFMCAsmInfo.cpp - SBF Asm properties -----------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the declarations of the SBFMCAsmInfo properties.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFMCAsmInfo.h"
+#include "llvm/BinaryFormat/Dwarf.h"
+#include "llvm/MC/MCStreamer.h"
+#include "llvm/Support/CommandLine.h"
+
+using namespace llvm;
+
+cl::opt<unsigned> SBFAsmWriterVariant(
+    "sbf-output-asm-variant", cl::Hidden, cl::init(0),
+    cl::desc("Choose output assembly variant (0 = sbf[default], 1 = legacy)"));
+
+SBFMCAsmInfo::SBFMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) {
+  AssemblerDialect = SBFAsmWriterVariant;
+
+  PrivateGlobalPrefix = ".L";
+  WeakRefDirective = "\t.weak\t";
+
+  UsesELFSectionDirectiveForBSS = true;
+  HasSingleParameterDotFile = true;
+  HasDotTypeDotSizeDirective = true;
+
+  SupportsDebugInformation = true;
+  ExceptionsType = ExceptionHandling::DwarfCFI;
+  MinInstAlignment = 8;
+
+  // The default is 4 and it only affects dwarf elf output.
+  // If not set correctly, the dwarf data will be
+  // messed up in random places by 4 bytes. .debug_line
+  // section will be parsable, but with odd offsets and
+  // line numbers, etc.
+  CodePointerSize = 8;
+
+  UseIntegratedAssembler = false;
+}
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
index 08261d3aea67e..fe884c622b2f2 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
@@ -18,32 +18,10 @@
 
 namespace llvm {
 
+// TODO: This should likely be subclassing MCAsmInfoELF.
 class SBFMCAsmInfo : public MCAsmInfo {
 public:
-  explicit SBFMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) {
-    if (TT.getArch() == Triple::bpfeb)
-      IsLittleEndian = false;
-
-    PrivateGlobalPrefix = ".L";
-    WeakRefDirective = "\t.weak\t";
-
-    UsesELFSectionDirectiveForBSS = true;
-    HasSingleParameterDotFile = true;
-    HasDotTypeDotSizeDirective = true;
-
-    SupportsDebugInformation = true;
-    ExceptionsType = ExceptionHandling::DwarfCFI;
-    MinInstAlignment = 8;
-
-    // the default is 4 and it only affects dwarf elf output
-    // so if not set correctly, the dwarf data will be
-    // messed up in random places by 4 bytes. .debug_line
-    // section will be parsable, but with odd offsets and
-    // line numbers, etc.
-    CodePointerSize = 8;
-
-    UseIntegratedAssembler = false;
-  }
+  explicit SBFMCAsmInfo(const Triple &TT, const MCTargetOptions &Options);
 
   void setDwarfUsesRelocationsAcrossSections(bool enable) {
     DwarfUsesRelocationsAcrossSections = enable;
@@ -53,6 +31,6 @@ class SBFMCAsmInfo : public MCAsmInfo {
     SupportsDebugInformation = enable;
   }
 };
-}
 
+}
 #endif
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 923d764efe5aa..47c410ca11a71 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -81,6 +81,9 @@ static MCInstPrinter *createSBFMCInstPrinter(const Triple &T,
                                              const MCRegisterInfo &MRI) {
   if (SyntaxVariant == 0)
     return new SBFInstPrinter(MAI, MII, MRI);
+  if (SyntaxVariant == 1)
+    return new SBFLegacyInstPrinter(MAI, MII, MRI);
+
   return nullptr;
 }
 
diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
index 4f0a45d0e6e2e..ca4d689609e60 100644
--- a/llvm/lib/Target/SBF/SBF.td
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -48,25 +48,50 @@ def : Proc<"v3", []>;
 def : Proc<"probe", []>;
 def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls]>;
 
-def SBFInstPrinter : AsmWriter {
+//===----------------------------------------------------------------------===//
+// Assembly printer
+//===----------------------------------------------------------------------===//
+
+def SBFAsmWriter : AsmWriter {
   string AsmWriterClassName  = "InstPrinter";
+  int Variant = 0;
   bit isMCAsmWriter = 1;
 }
 
+def LegacyAsmWriter : AsmWriter {
+  let AsmWriterClassName = "LegacyInstPrinter";
+  int Variant = 1;
+  int isMCAsmWriter = 1;
+}
+
+//===----------------------------------------------------------------------===//
+// Assembly parser
+//===----------------------------------------------------------------------===//
+
 def SBFAsmParser : AsmParser {
   bit HasMnemonicFirst = 0;
 }
 
 def SBFAsmParserVariant : AsmParserVariant {
   int Variant = 0;
-  string Name = "SBF";
+  string Name = "sbf";
+  string BreakCharacters = ".";
+}
+
+def LegacyAsmParserVariant : AsmParserVariant {
+  int Variant = 1;
+  string Name = "legacy";
   string BreakCharacters = ".";
   string TokenizingCharacters = "#()[]=:.<>!+*/";
 }
 
+//===----------------------------------------------------------------------===//
+// Target Declaration
+//===----------------------------------------------------------------------===//
+
 def SBF : Target {
   let InstructionSet = SBFInstrInfo;
-  let AssemblyWriters = [SBFInstPrinter];
+  let AssemblyWriters = [SBFAsmWriter, LegacyAsmWriter];
   let AssemblyParsers = [SBFAsmParser];
-  let AssemblyParserVariants = [SBFAsmParserVariant];
+  let AssemblyParserVariants = [SBFAsmParserVariant, LegacyAsmParserVariant];
 }
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index d9d58753fab27..52c5ef6580e04 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -34,6 +34,8 @@ using namespace llvm;
 
 #define DEBUG_TYPE "asm-printer"
 
+extern cl::opt<unsigned> SBFAsmWriterVariant;
+
 namespace {
 class SBFAsmPrinter : public AsmPrinter {
 public:
@@ -132,10 +134,15 @@ bool SBFAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
   if (ExtraCode)
     return true; // Unknown modifier.
 
+  if (SBFAsmWriterVariant == 1)
+    O << "(";
+  O << SBFInstPrinter::getRegisterName(BaseMO.getReg());
   if (Offset < 0)
-    O << "(" << SBFInstPrinter::getRegisterName(BaseMO.getReg()) << " - " << -Offset << ")";
+    O << " - " << -Offset;
   else
-    O << "(" << SBFInstPrinter::getRegisterName(BaseMO.getReg()) << " + " << Offset << ")";
+    O << " + " << Offset;
+  if (SBFAsmWriterVariant == 1)
+    O << ")";
 
   return false;
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 44a9abff44732..8fc42e2ae9635 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -155,11 +155,12 @@ class TYPE_LD_ST<bits<3> mode, bits<2> size,
 }
 
 // jump instructions
-class JMP_RR<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+class JMP_RR<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
                    (outs),
                    (ins GPR:$dst, GPR:$src, brtarget:$BrDst),
-                   "if $dst "#OpcodeStr#" $src goto $BrDst",
+                   "{" # Mnemonic # " $dst, $src, $BrDst"
+                   "|if $dst " # OpcodeStr # " $src goto $BrDst}",
                    [(SBFbrcc i64:$dst, i64:$src, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<4> src;
@@ -171,11 +172,12 @@ class JMP_RR<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP;
 }
 
-class JMP_RI<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+class JMP_RI<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
                    (outs),
                    (ins GPR:$dst, i64imm:$imm, brtarget:$BrDst),
-                   "if $dst "#OpcodeStr#" $imm goto $BrDst",
+                   "{" # Mnemonic # " $dst, $imm, $BrDst"
+                   "|if $dst " # OpcodeStr # " $imm goto $BrDst}",
                    [(SBFbrcc i64:$dst, i64immSExt32:$imm, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<16> BrDst;
@@ -187,11 +189,12 @@ class JMP_RI<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP;
 }
 
-class JMP_RR_32<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+class JMP_RR_32<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
                    (outs),
                    (ins GPR32:$dst, GPR32:$src, brtarget:$BrDst),
-                   "if $dst "#OpcodeStr#" $src goto $BrDst",
+                   "{" # Mnemonic # " $dst, $src, $BrDst"
+                   "|if $dst " # OpcodeStr # " $src goto $BrDst}",
                    [(SBFbrcc i32:$dst, i32:$src, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<4> src;
@@ -203,11 +206,12 @@ class JMP_RR_32<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP32;
 }
 
-class JMP_RI_32<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
+class JMP_RI_32<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
                    (outs),
                    (ins GPR32:$dst, i32imm:$imm, brtarget:$BrDst),
-                   "if $dst "#OpcodeStr#" $imm goto $BrDst",
+                   "{" # Mnemonic # " $dst, $imm, $BrDst"
+                   "|if $dst " # OpcodeStr # " $imm goto $BrDst}",
                    [(SBFbrcc i32:$dst, i32immSExt32:$imm, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<16> BrDst;
@@ -219,25 +223,26 @@ class JMP_RI_32<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP32;
 }
 
-multiclass J<SBFJumpOp Opc, string OpcodeStr, PatLeaf Cond, PatLeaf Cond32> {
-  def _rr : JMP_RR<Opc, OpcodeStr, Cond>;
-  def _ri : JMP_RI<Opc, OpcodeStr, Cond>;
-  def _rr_32 : JMP_RR_32<Opc, OpcodeStr, Cond32>;
-  def _ri_32 : JMP_RI_32<Opc, OpcodeStr, Cond32>;
+multiclass J<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond,
+             PatLeaf Cond32> {
+  def _rr : JMP_RR<Opc, Mnemonic, OpcodeStr, Cond>;
+  def _ri : JMP_RI<Opc, Mnemonic, OpcodeStr, Cond>;
+  def _rr_32 : JMP_RR_32<Opc, Mnemonic, OpcodeStr, Cond32>;
+  def _ri_32 : JMP_RI_32<Opc, Mnemonic, OpcodeStr, Cond32>;
 }
 
 let isBranch = 1, isTerminator = 1, hasDelaySlot=0 in {
 // cmp+goto instructions
-defm JEQ  : J<SBF_JEQ, "==",  SBF_CC_EQ, SBF_CC_EQ_32>;
-defm JUGT : J<SBF_JGT, ">", SBF_CC_GTU, SBF_CC_GTU_32>;
-defm JUGE : J<SBF_JGE, ">=", SBF_CC_GEU, SBF_CC_GEU_32>;
-defm JNE  : J<SBF_JNE, "!=",  SBF_CC_NE, SBF_CC_NE_32>;
-defm JSGT : J<SBF_JSGT, "s>", SBF_CC_GT, SBF_CC_GT_32>;
-defm JSGE : J<SBF_JSGE, "s>=", SBF_CC_GE, SBF_CC_GE_32>;
-defm JULT : J<SBF_JLT, "<", SBF_CC_LTU, SBF_CC_LTU_32>;
-defm JULE : J<SBF_JLE, "<=", SBF_CC_LEU, SBF_CC_LEU_32>;
-defm JSLT : J<SBF_JSLT, "s<", SBF_CC_LT, SBF_CC_LT_32>;
-defm JSLE : J<SBF_JSLE, "s<=", SBF_CC_LE, SBF_CC_LE_32>;
+defm JEQ  : J<SBF_JEQ, "jeq", "==",  SBF_CC_EQ, SBF_CC_EQ_32>;
+defm JUGT : J<SBF_JGT, "jgt", ">", SBF_CC_GTU, SBF_CC_GTU_32>;
+defm JUGE : J<SBF_JGE, "jge", ">=", SBF_CC_GEU, SBF_CC_GEU_32>;
+defm JNE  : J<SBF_JNE, "jne", "!=",  SBF_CC_NE, SBF_CC_NE_32>;
+defm JSGT : J<SBF_JSGT, "jsgt",  "s>", SBF_CC_GT, SBF_CC_GT_32>;
+defm JSGE : J<SBF_JSGE, "jsge",  "s>=", SBF_CC_GE, SBF_CC_GE_32>;
+defm JULT : J<SBF_JLT, "jlt", "<", SBF_CC_LTU, SBF_CC_LTU_32>;
+defm JULE : J<SBF_JLE, "jle", "<=", SBF_CC_LEU, SBF_CC_LEU_32>;
+defm JSLT : J<SBF_JSLT, "jslt", "s<", SBF_CC_LT, SBF_CC_LT_32>;
+defm JSLE : J<SBF_JSLE, "jsle", "s<=", SBF_CC_LE, SBF_CC_LE_32>;
 }
 
 // ALU instructions
@@ -263,46 +268,51 @@ class ALU_RR<SBFOpClass Class, SBFArithOp Opc,
   let SBFClass = Class;
 }
 
-multiclass ALU<SBFArithOp Opc, string OpcodeStr, SDNode OpNode> {
+multiclass ALU<SBFArithOp Opc, string Mnemonic, string OpcodeStr,
+               SDNode OpNode> {
   def _rr : ALU_RR<SBF_ALU64, Opc,
                    (outs GPR:$dst),
                    (ins GPR:$src2, GPR:$src),
-                   "$dst "#OpcodeStr#" $src",
+                   "{?!?" # Mnemonic # "64 $dst, $src" #
+                   "!$dst " # OpcodeStr # " $src}",
                    [(set GPR:$dst, (OpNode i64:$src2, i64:$src))]>;
   def _ri : ALU_RI<SBF_ALU64, Opc,
                    (outs GPR:$dst),
                    (ins GPR:$src2, i64imm:$imm),
-                   "$dst "#OpcodeStr#" $imm",
+                   "{?!?" # Mnemonic # "64 $dst, $imm" #
+                   "!$dst " # OpcodeStr #" $imm}",
                    [(set GPR:$dst, (OpNode GPR:$src2, i64immSExt32:$imm))]>;
   def _rr_32 : ALU_RR<SBF_ALU, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, GPR32:$src),
-                   "$dst "#OpcodeStr#" $src",
+                   "{?!?" # Mnemonic # "32 $dst, $src" #
+                   "!$dst " # OpcodeStr # " $src}",
                    [(set GPR32:$dst, (OpNode i32:$src2, i32:$src))]>;
   def _ri_32 : ALU_RI<SBF_ALU, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, i32imm:$imm),
-                   "$dst "#OpcodeStr#" $imm",
+                   "{?!?" # Mnemonic # "32 $dst, $imm" #
+                   "!$dst " # OpcodeStr # " $imm}",
                    [(set GPR32:$dst, (OpNode GPR32:$src2, i32immSExt32:$imm))]>;
 }
 
 let Constraints = "$dst = $src2" in {
     let isAsCheapAsAMove = 1 in {
-        defm ADD : ALU<SBF_ADD, "+=", add>;
-        defm SUB : ALU<SBF_SUB, "-=", sub>;
-        defm OR  : ALU<SBF_OR, "|=", or>;
-        defm AND : ALU<SBF_AND, "&=", and>;
-        defm SLL : ALU<SBF_LSH, "<<=", shl>;
-        defm SRL : ALU<SBF_RSH, ">>=", srl>;
-        defm XOR : ALU<SBF_XOR, "^=", xor>;
-        defm SRA : ALU<SBF_ARSH, "s>>=", sra>;
+        defm ADD : ALU<SBF_ADD, "add", "+=", add>;
+        defm SUB : ALU<SBF_SUB, "sub", "-=", sub>;
+        defm OR  : ALU<SBF_OR, "or", "|=", or>;
+        defm AND : ALU<SBF_AND, "and", "&=", and>;
+        defm SLL : ALU<SBF_LSH, "lsh", "<<=", shl>;
+        defm SRL : ALU<SBF_RSH, "rsh", ">>=", srl>;
+        defm XOR : ALU<SBF_XOR, "xor", "^=", xor>;
+        defm SRA : ALU<SBF_ARSH, "arsh", "s>>=", sra>;
     }
 
-    defm MUL : ALU<SBF_MUL, "*=", mul>;
-    defm DIV : ALU<SBF_DIV, "/=", udiv>;
+    defm MUL : ALU<SBF_MUL, "mul", "*=", mul>;
+    defm DIV : ALU<SBF_DIV, "div", "/=", udiv>;
 
     let Predicates = [SBFSubtargetSolana] in {
-        defm SDIV : ALU<SBF_SDIV, "s/=", sdiv>;
+        defm SDIV : ALU<SBF_SDIV, "sdiv", "s/=", sdiv>;
     }
 }
 
@@ -317,18 +327,19 @@ class NEG_RR<SBFOpClass Class, SBFArithOp Opc,
 
 let Constraints = "$dst = $src", isAsCheapAsAMove = 1 in {
   def NEG_64: NEG_RR<SBF_ALU64, SBF_NEG, (outs GPR:$dst), (ins GPR:$src),
-                     "$dst = -$src",
+                     "{neg64 $dst|$dst = -$src}",
                      [(set GPR:$dst, (ineg i64:$src))]>;
   def NEG_32: NEG_RR<SBF_ALU, SBF_NEG, (outs GPR32:$dst), (ins GPR32:$src),
-                     "$dst = -$src",
+                     "{neg32 $dst|$dst = -$src}",
                      [(set GPR32:$dst, (ineg i32:$src))]>;
 }
 
-class LD_IMM64<bits<4> Pseudo, string OpcodeStr>
+class LD_IMM64<bits<4> Pseudo, string Mnemonic, string OpcodeStr>
     : TYPE_LD_ST<SBF_IMM.Value, SBF_DW.Value,
                  (outs GPR:$dst),
                  (ins u64imm:$imm),
-                 "$dst "#OpcodeStr#" ${imm} ll",
+                 "{" # Mnemonic # " $dst, $imm" #
+                 "|$dst " # OpcodeStr # " $imm ll}",
                  [(set GPR:$dst, (i64 imm:$imm))]> {
 
   bits<4> dst;
@@ -342,26 +353,26 @@ class LD_IMM64<bits<4> Pseudo, string OpcodeStr>
 }
 
 let isReMaterializable = 1, isAsCheapAsAMove = 1 in {
-def LD_imm64 : LD_IMM64<0, "=">;
+def LD_imm64 : LD_IMM64<0, "lddw", "=">;
 def MOV_rr : ALU_RR<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins GPR:$src),
-                    "$dst = $src",
+                    "{mov64 $dst, $src|$dst = $src}",
                     []>;
 def MOV_ri : ALU_RI<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins i64imm:$imm),
-                    "$dst = $imm",
+                    "{mov64 $dst, $imm|$dst = $imm}",
                     [(set GPR:$dst, (i64 i64immSExt32:$imm))]>;
 def MOV_rr_32 : ALU_RR<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins GPR32:$src),
-                    "$dst = $src",
+                    "{mov32 $dst, $src|$dst = $src}",
                     []>;
 def MOV_ri_32 : ALU_RI<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins i32imm:$imm),
-                    "$dst = $imm",
+                    "{mov32 $dst, $imm|$dst = $imm}",
                     [(set GPR32:$dst, (i32 i32immSExt32:$imm))]>;
 }
 
@@ -399,11 +410,13 @@ def LD_pseudo
 }
 
 // STORE instructions
-class STORE<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+class STORE<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+            list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$src, MEMri:$addr),
-                 "*("#OpcodeStr#" *)($addr) = $src",
+                 "{" # Mnemonic # " [$addr], $src" #
+                 "|*(" # OpcodeStr # " *)($addr) = $src}",
                  Pattern> {
   bits<4> src;
   bits<20> addr;
@@ -414,22 +427,25 @@ class STORE<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
   let SBFClass = SBF_STX;
 }
 
-class STOREi64<SBFWidthModifer Opc, string OpcodeStr, PatFrag OpNode>
-    : STORE<Opc, OpcodeStr, [(OpNode i64:$src, ADDRri:$addr)]>;
+class STOREi64<SBFWidthModifer Opc, string Mnemonic, string OpcodeStr,
+               PatFrag OpNode>
+    : STORE<Opc, Mnemonic, OpcodeStr, [(OpNode i64:$src, ADDRri:$addr)]>;
 
 let Predicates = [SBFNoALU32] in {
-  def STW : STOREi64<SBF_W, "u32", truncstorei32>;
-  def STH : STOREi64<SBF_H, "u16", truncstorei16>;
-  def STB : STOREi64<SBF_B, "u8", truncstorei8>;
+  def STW : STOREi64<SBF_W, "stxw", "u32", truncstorei32>;
+  def STH : STOREi64<SBF_H, "stxh", "u16", truncstorei16>;
+  def STB : STOREi64<SBF_B, "stxb", "u8", truncstorei8>;
 }
-def STD : STOREi64<SBF_DW, "u64", store>;
+def STD : STOREi64<SBF_DW, "stxdw", "u64", store>;
 
 // LOAD instructions
-class LOAD<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+class LOAD<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+           list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr),
-                 "$dst = *("#OpcodeStr#" *)($addr)",
+                 "{" # Mnemonic # " $dst, [$addr]" #
+                 "|$dst = *(" # OpcodeStr # " *)($addr)}",
                  Pattern> {
   bits<4> dst;
   bits<20> addr;
@@ -440,8 +456,9 @@ class LOAD<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
   let SBFClass = SBF_LDX;
 }
 
-class LOADi64<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
-    : LOAD<SizeOp, OpcodeStr, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
+class LOADi64<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+              PatFrag OpNode>
+    : LOAD<SizeOp, Mnemonic, OpcodeStr, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
 
 let isCodeGenOnly = 1 in {
   def CORE_MEM : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
@@ -464,18 +481,20 @@ let isCodeGenOnly = 1 in {
 }
 
 let Predicates = [SBFNoALU32] in {
-  def LDW : LOADi64<SBF_W, "u32", zextloadi32>;
-  def LDH : LOADi64<SBF_H, "u16", zextloadi16>;
-  def LDB : LOADi64<SBF_B, "u8", zextloadi8>;
+  def LDW : LOADi64<SBF_W, "ldxw", "u32", zextloadi32>;
+  def LDH : LOADi64<SBF_H, "ldxh", "u16", zextloadi16>;
+  def LDB : LOADi64<SBF_B, "ldxb", "u8", zextloadi8>;
 }
 
-def LDD : LOADi64<SBF_DW, "u64", load>;
+def LDD : LOADi64<SBF_DW, "ldxdw", "u64", load>;
 
-class BRANCH<SBFJumpOp Opc, string OpcodeStr, list<dag> Pattern>
+class BRANCH<SBFJumpOp Opc, string Mnemonic, string OpcodeStr,
+             list<dag> Pattern>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
                    (outs),
                    (ins brtarget:$BrDst),
-                   !strconcat(OpcodeStr, " $BrDst"),
+                   "{" # Mnemonic # " $BrDst" #
+                   "|" # OpcodeStr # " $BrDst}",
                    Pattern> {
   bits<16> BrDst;
 
@@ -509,7 +528,7 @@ class CALLX<string OpcodeStr>
 
 // Jump always
 let isBranch = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1 in {
-  def JMP : BRANCH<SBF_JA, "goto", [(br bb:$BrDst)]>;
+  def JMP : BRANCH<SBF_JA, "ja", "goto", [(br bb:$BrDst)]>;
 }
 
 // Jump and link
@@ -624,11 +643,13 @@ let Predicates = [SBFNoALU32] in {
 }
 
 // Atomic XADD for SBFNoALU32
-class XADD<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+class XADD<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+           PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "lock *("#OpcodeStr#" *)($addr) += $val",
+                 "{" # Mnemonic # " [$addr], $val" #
+                 "|lock *(" # OpcodeStr # " *)($addr) += $val}",
                  [(set GPR:$dst, (OpNode ADDRri:$addr, GPR:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -642,16 +663,17 @@ class XADD<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFNoALU32] in {
-    def XADDW : XADD<SBF_W, "u32", atomic_load_add_32>;
+    def XADDW : XADD<SBF_W, "stxxaddw", "u32", atomic_load_add_32>;
   }
 }
 
 // Atomic add, and, or, xor
-class ATOMIC_NOFETCH<SBFArithOp Opc, string Opstr>
+class ATOMIC_NOFETCH<SBFArithOp Opc, string Mnemonic, string Opstr>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SBF_DW.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "lock *(u64 *)($addr) " #Opstr# "= $val",
+                 "{?!?stxx" # Mnemonic # "dw [$addr], $val" #
+                 "!lock *(u64 *)($addr) " # Opstr # "= $val}",
                  []> {
   bits<4> dst;
   bits<20> addr;
@@ -663,11 +685,12 @@ class ATOMIC_NOFETCH<SBFArithOp Opc, string Opstr>
   let SBFClass = SBF_STX;
 }
 
-class ATOMIC32_NOFETCH<SBFArithOp Opc, string Opstr>
+class ATOMIC32_NOFETCH<SBFArithOp Opc, string Mnemonic, string Opstr>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SBF_W.Value,
                  (outs GPR32:$dst),
                  (ins MEMri:$addr, GPR32:$val),
-                 "lock *(u32 *)($addr) " #Opstr# "= $val",
+                 "{?!?stxx" # Mnemonic # "w [$addr], $val" #
+                 "!lock *(u32 *)($addr) " # Opstr # "= $val}",
                  []> {
   bits<4> dst;
   bits<20> addr;
@@ -681,16 +704,16 @@ class ATOMIC32_NOFETCH<SBFArithOp Opc, string Opstr>
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-    def XADDW32 : ATOMIC32_NOFETCH<SBF_ADD, "+">;
-    def XANDW32 : ATOMIC32_NOFETCH<SBF_AND, "&">;
-    def XORW32  : ATOMIC32_NOFETCH<SBF_OR, "|">;
-    def XXORW32 : ATOMIC32_NOFETCH<SBF_XOR, "^">;
+    def XADDW32 : ATOMIC32_NOFETCH<SBF_ADD, "add", "+">;
+    def XANDW32 : ATOMIC32_NOFETCH<SBF_AND, "and", "&">;
+    def XORW32  : ATOMIC32_NOFETCH<SBF_OR, "or", "|">;
+    def XXORW32 : ATOMIC32_NOFETCH<SBF_XOR, "xor", "^">;
   }
 
-  def XADDD  : ATOMIC_NOFETCH<SBF_ADD, "+">;
-  def XANDD  : ATOMIC_NOFETCH<SBF_AND, "&">;
-  def XORD   : ATOMIC_NOFETCH<SBF_OR, "|">;
-  def XXORD  : ATOMIC_NOFETCH<SBF_XOR, "^">;
+  def XADDD  : ATOMIC_NOFETCH<SBF_ADD, "add", "+">;
+  def XANDD  : ATOMIC_NOFETCH<SBF_AND, "and", "&">;
+  def XORD   : ATOMIC_NOFETCH<SBF_OR, "or", "|">;
+  def XXORD  : ATOMIC_NOFETCH<SBF_XOR,"xor",  "^">;
 }
 
 // Atomic Fetch-and-<add, and, or, xor> operations
@@ -699,7 +722,8 @@ class XFALU64<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "$dst = atomic_fetch_"#OpcStr#"(("#OpcodeStr#" *)($addr), $val)",
+                 "{stxxf" # OpcStr # "dw [$addr], $val" #
+                 "|$dst = atomic_fetch_" # OpcStr # "((" # OpcodeStr # " *)($addr), $val)}",
                  [(set GPR:$dst, (OpNode ADDRri:$addr, GPR:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -717,7 +741,8 @@ class XFALU32<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR32:$dst),
                  (ins MEMri:$addr, GPR32:$val),
-                 "$dst = atomic_fetch_"#OpcStr#"(("#OpcodeStr#" *)($addr), $val)",
+                 "{stxxf" # OpcStr  # "w [$addr], $val" #
+                 "|$dst = atomic_fetch_" # OpcStr # "((" # OpcodeStr # " *)($addr), $val)}",
                  [(set GPR32:$dst, (OpNode ADDRri:$addr, GPR32:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -764,7 +789,8 @@ class XCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "$dst = xchg_"#OpcodeStr#"($addr, $val)",
+                 "{stxxchgdw [$addr], $val" #
+                 "|$dst = xchg_" # OpcodeStr # "($addr, $val)}",
                  [(set GPR:$dst, (OpNode ADDRri:$addr,GPR:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -781,7 +807,8 @@ class XCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR32:$dst),
                  (ins MEMri:$addr, GPR32:$val),
-                 "$dst = xchg32_"#OpcodeStr#"($addr, $val)",
+                 "{stxxchgw [$addr], $val" #
+                 "|$dst = xchg32_" # OpcodeStr # "($addr, $val)}",
                  [(set GPR32:$dst, (OpNode ADDRri:$addr,GPR32:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -807,7 +834,8 @@ class CMPXCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs),
                  (ins MEMri:$addr, GPR:$new),
-                 "r0 = cmpxchg_"#OpcodeStr#"($addr, r0, $new)",
+                 "{stxcmpxchgdw [$addr], $new" #
+                 "|r0 = cmpxchg_" # OpcodeStr # "($addr, r0, $new)}",
                  [(set R0, (OpNode ADDRri:$addr, R0, GPR:$new))]> {
   bits<4> new;
   bits<20> addr;
@@ -824,7 +852,8 @@ class CMPXCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs),
                  (ins MEMri:$addr, GPR32:$new),
-                 "w0 = cmpxchg32_"#OpcodeStr#"($addr, w0, $new)",
+                 "{stxcmpxchgw [$addr], $new" #
+                 "|w0 = cmpxchg32_" # OpcodeStr # "($addr, w0, $new)}",
                  [(set W0, (OpNode ADDRri:$addr, W0, GPR32:$new))]> {
   bits<4> new;
   bits<20> addr;
@@ -851,7 +880,8 @@ class BSWAP<bits<32> SizeOp, string OpcodeStr, SBFSrcType SrcType, list<dag> Pat
     : TYPE_ALU_JMP<SBF_END.Value, SrcType.Value,
                    (outs GPR:$dst),
                    (ins GPR:$src),
-                   "$dst = "#OpcodeStr#" $src",
+                   "{" # OpcodeStr # " $src" #
+                   "|$dst = " # OpcodeStr # " $src}",
                    Pattern> {
   bits<4> dst;
 
@@ -876,11 +906,13 @@ let Constraints = "$dst = $src" in {
 
 let Defs = [R0, R1, R2, R3, R4, R5], Uses = [R6], hasSideEffects = 1,
     hasExtraDefRegAllocReq = 1, hasExtraSrcRegAllocReq = 1, mayLoad = 1 in {
-class LOAD_ABS<SBFWidthModifer SizeOp, string OpcodeStr, Intrinsic OpNode>
+class LOAD_ABS<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+               Intrinsic OpNode>
     : TYPE_LD_ST<SBF_ABS.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$skb, i64imm:$imm),
-                 "r0 = *("#OpcodeStr#" *)skb[$imm]",
+                 "{" # Mnemonic # " $imm" #
+                 "|r0 = *(" # OpcodeStr # " *)skb[$imm]}",
                  [(set R0, (OpNode GPR:$skb, i64immSExt32:$imm))]> {
   bits<32> imm;
 
@@ -888,11 +920,13 @@ class LOAD_ABS<SBFWidthModifer SizeOp, string OpcodeStr, Intrinsic OpNode>
   let SBFClass = SBF_LD;
 }
 
-class LOAD_IND<SBFWidthModifer SizeOp, string OpcodeStr, Intrinsic OpNode>
+class LOAD_IND<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+               Intrinsic OpNode>
     : TYPE_LD_ST<SBF_IND.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$skb, GPR:$val),
-                 "r0 = *("#OpcodeStr#" *)skb[$val]",
+                 "{" # Mnemonic # " $val" #
+                 "|r0 = *(" # OpcodeStr # " *)skb[$val]}",
                  [(set R0, (OpNode GPR:$skb, GPR:$val))]> {
   bits<4> val;
 
@@ -901,18 +935,18 @@ class LOAD_IND<SBFWidthModifer SizeOp, string OpcodeStr, Intrinsic OpNode>
 }
 }
 
-def LD_ABS_B : LOAD_ABS<SBF_B, "u8", int_bpf_load_byte>;
-def LD_ABS_H : LOAD_ABS<SBF_H, "u16", int_bpf_load_half>;
-def LD_ABS_W : LOAD_ABS<SBF_W, "u32", int_bpf_load_word>;
+def LD_ABS_B : LOAD_ABS<SBF_B, "ldabsb", "u8", int_bpf_load_byte>;
+def LD_ABS_H : LOAD_ABS<SBF_H, "ldabsh", "u16", int_bpf_load_half>;
+def LD_ABS_W : LOAD_ABS<SBF_W, "ldabsw", "u32", int_bpf_load_word>;
 
-def LD_IND_B : LOAD_IND<SBF_B, "u8", int_bpf_load_byte>;
-def LD_IND_H : LOAD_IND<SBF_H, "u16", int_bpf_load_half>;
-def LD_IND_W : LOAD_IND<SBF_W, "u32", int_bpf_load_word>;
+def LD_IND_B : LOAD_IND<SBF_B, "ldindb", "u8", int_bpf_load_byte>;
+def LD_IND_H : LOAD_IND<SBF_H, "ldindh", "u16", int_bpf_load_half>;
+def LD_IND_W : LOAD_IND<SBF_W, "ldindw", "u32", int_bpf_load_word>;
 
 let isCodeGenOnly = 1 in {
   def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
-                         "$dst = $src", []>;
+                         "{mov32 $dst, $src|$dst = $src}", []>;
 }
 
 def : Pat<(i64 (sext GPR32:$src)),
@@ -928,11 +962,13 @@ def : Pat<(i32 (trunc GPR:$src)),
 def : Pat<(i64 (anyext GPR32:$src)),
           (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>;
 
-class STORE32<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+class STORE32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+              list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins GPR32:$src, MEMri:$addr),
-                 "*("#OpcodeStr#" *)($addr) = $src",
+                 "{" # Mnemonic # " [$addr], $src" #
+                 "|*("#OpcodeStr#" *)($addr) = $src}",
                  Pattern> {
   bits<4> src;
   bits<20> addr;
@@ -943,20 +979,23 @@ class STORE32<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
   let SBFClass = SBF_STX;
 }
 
-class STOREi32<SBFWidthModifer Opc, string OpcodeStr, PatFrag OpNode>
-    : STORE32<Opc, OpcodeStr, [(OpNode i32:$src, ADDRri:$addr)]>;
+class STOREi32<SBFWidthModifer Opc, string Mnemonic, string OpcodeStr,
+               PatFrag OpNode>
+    : STORE32<Opc, Mnemonic, OpcodeStr, [(OpNode i32:$src, ADDRri:$addr)]>;
 
 let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-  def STW32 : STOREi32<SBF_W, "u32", store>;
-  def STH32 : STOREi32<SBF_H, "u16", truncstorei16>;
-  def STB32 : STOREi32<SBF_B, "u8", truncstorei8>;
+  def STW32 : STOREi32<SBF_W, "stxw", "u32", store>;
+  def STH32 : STOREi32<SBF_H, "stxh", "u16", truncstorei16>;
+  def STB32 : STOREi32<SBF_B, "stxb", "u8", truncstorei8>;
 }
 
-class LOAD32<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
+class LOAD32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+             list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                 (outs GPR32:$dst),
                 (ins MEMri:$addr),
-                "$dst = *("#OpcodeStr#" *)($addr)",
+                 "{" # Mnemonic # " $dst, [$addr]" #
+                "|$dst = *("#OpcodeStr#" *)($addr)}",
                 Pattern> {
   bits<4> dst;
   bits<20> addr;
@@ -967,13 +1006,14 @@ class LOAD32<SBFWidthModifer SizeOp, string OpcodeStr, list<dag> Pattern>
   let SBFClass = SBF_LDX;
 }
 
-class LOADi32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
-    : LOAD32<SizeOp, OpcodeStr, [(set i32:$dst, (OpNode ADDRri:$addr))]>;
+class LOADi32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
+              PatFrag OpNode>
+    : LOAD32<SizeOp, Mnemonic, OpcodeStr, [(set i32:$dst, (OpNode ADDRri:$addr))]>;
 
 let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-  def LDW32 : LOADi32<SBF_W, "u32", load>;
-  def LDH32 : LOADi32<SBF_H, "u16", zextloadi16>;
-  def LDB32 : LOADi32<SBF_B, "u8", zextloadi8>;
+  def LDW32 : LOADi32<SBF_W, "ldxw", "u32", load>;
+  def LDH32 : LOADi32<SBF_H, "ldxh", "u16", zextloadi16>;
+  def LDB32 : LOADi32<SBF_B, "ldxb", "u8", zextloadi8>;
 }
 
 let Predicates = [SBFHasALU32] in {
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
index 30eafd6cbf2aa..17c13fa3215f1 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
@@ -120,21 +120,21 @@
 define dso_local i32 @mov(i32 returned %a) local_unnamed_addr #0 {
 entry:
   ret i32 %a
-; CHECK: w{{[0-9]+}} = w{{[0-9]+}}
+; CHECK: mov32 w{{[0-9]+}}, w{{[0-9]+}}
 }
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @mov_ri() local_unnamed_addr #0 {
 entry:
   ret i32 255
-; CHECK: w{{[0-9]+}} = 255
+; CHECK: mov32 w{{[0-9]+}}, 255
 }
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @add(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %add = add nsw i32 %b, %a
-; CHECK: w{{[0-9]+}} += w{{[0-9]+}}
+; CHECK: add32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %add
 }
 
@@ -142,7 +142,7 @@ entry:
 define dso_local i32 @add_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %add = add nsw i32 %a, 2147483647
-; CHECK: w{{[0-9]+}} += 2147483647
+; CHECK: add32 w{{[0-9]+}}, 2147483647
   ret i32 %add
 }
 
@@ -150,7 +150,7 @@ entry:
 define dso_local i32 @sub(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %sub = sub nsw i32 %a, %b
-; CHECK: w{{[0-9]+}} -= w{{[0-9]+}}
+; CHECK: sub32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %sub
 }
 
@@ -158,7 +158,7 @@ entry:
 define dso_local i32 @sub_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %sub = add i32 %a, 1
-; CHECK: w{{[0-9]+}} += 1
+; CHECK: add32 w{{[0-9]+}}, 1
   ret i32 %sub
 }
 
@@ -166,7 +166,7 @@ entry:
 define dso_local i32 @mul(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %mul = mul nsw i32 %b, %a
-; CHECK: w{{[0-9]+}} *= w{{[0-9]+}}
+; CHECK: mul32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %mul
 }
 
@@ -174,7 +174,7 @@ entry:
 define dso_local i32 @mul_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %mul = mul nsw i32 %a, 15
-; CHECK: w{{[0-9]+}} *= 15
+; CHECK: mul32 w{{[0-9]+}}, 15
   ret i32 %mul
 }
 
@@ -182,7 +182,7 @@ entry:
 define dso_local i32 @div(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %div = udiv i32 %a, %b
-; CHECK: w{{[0-9]+}} /= w{{[0-9]+}}
+; CHECK: div32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %div
 }
 
@@ -190,7 +190,7 @@ entry:
 define dso_local i32 @div_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %div = udiv i32 %a, 15
-; CHECK: w{{[0-9]+}} /= 15
+; CHECK: div32 w{{[0-9]+}}, 15
   ret i32 %div
 }
 
@@ -198,7 +198,7 @@ entry:
 define dso_local i32 @or(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %or = or i32 %b, %a
-; CHECK: w{{[0-9]+}} |= w{{[0-9]+}}
+; CHECK: or32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %or
 }
 
@@ -206,7 +206,7 @@ entry:
 define dso_local i32 @or_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %or = or i32 %a, 255
-; CHECK: w{{[0-9]+}} |= 255
+; CHECK: or32 w{{[0-9]+}}, 255
   ret i32 %or
 }
 
@@ -214,7 +214,7 @@ entry:
 define dso_local i32 @xor(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %xor = xor i32 %b, %a
-; CHECK: w{{[0-9]+}} ^= w{{[0-9]+}}
+; CHECK: xor32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %xor
 }
 
@@ -222,7 +222,7 @@ entry:
 define dso_local i32 @xor_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %xor = xor i32 %a, 4095
-; CHECK: w{{[0-9]+}} ^= 4095
+; CHECK: xor32 w{{[0-9]+}}, 4095
   ret i32 %xor
 }
 
@@ -230,7 +230,7 @@ entry:
 define dso_local i32 @and(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %and = and i32 %b, %a
-; CHECK: w{{[0-9]+}} &= w{{[0-9]+}}
+; CHECK: and32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %and
 }
 
@@ -238,7 +238,7 @@ entry:
 define dso_local i32 @and_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %and = and i32 %a, 65535
-; CHECK: w{{[0-9]+}} &= 65535
+; CHECK: and32 w{{[0-9]+}}, 65535
   ret i32 %and
 }
 
@@ -246,7 +246,7 @@ entry:
 define dso_local i32 @sll(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %shl = shl i32 %a, %b
-; CHECK: w{{[0-9]+}} <<= w{{[0-9]+}}
+; CHECK: lsh32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %shl
 }
 
@@ -254,7 +254,7 @@ entry:
 define dso_local i32 @sll_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %shl = shl i32 %a, 17
-; CHECK: w{{[0-9]+}} <<= 17
+; CHECK: lsh32 w{{[0-9]+}}, 17
   ret i32 %shl
 }
 
@@ -262,7 +262,7 @@ entry:
 define dso_local i32 @srl(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %shr = lshr i32 %a, %b
-; CHECK: w{{[0-9]+}} >>= w{{[0-9]+}}
+; CHECK: rsh32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %shr
 }
 
@@ -270,7 +270,7 @@ entry:
 define dso_local i32 @srl_i(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %shr = lshr i32 %a, 31
-; CHECK: w{{[0-9]+}} >>= 31
+; CHECK: rsh32 w{{[0-9]+}}, 31
   ret i32 %shr
 }
 
@@ -278,7 +278,7 @@ entry:
 define dso_local i32 @sra(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %shr = ashr i32 %a, %b
-; CHECK: w{{[0-9]+}} s>>= w{{[0-9]+}}
+; CHECK: arsh32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %shr
 }
 
@@ -286,7 +286,7 @@ entry:
 define dso_local i32 @sra_i(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %shr = ashr i32 %a, 7
-; CHECK: w{{[0-9]+}} s>>= 7
+; CHECK: arsh32 w{{[0-9]+}}, 7
   ret i32 %shr
 }
 
@@ -294,6 +294,6 @@ entry:
 define dso_local i32 @neg(i32 %a) local_unnamed_addr #0 {
 entry:
   %sub = sub nsw i32 0, %a
-; CHECK: w{{[0-9]+}} = -w{{[0-9]+}}
+; CHECK: mov32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %sub
 }
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
index 9076cda149a34..2ea3048a314e2 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
@@ -56,9 +56,9 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: select_cc_32
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i64 @select_cc_32_64(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
@@ -68,9 +68,9 @@ entry:
   ret i64 %c.d
 }
 ; CHECK-LABEL: select_cc_32_64
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @select_cc_64_32(i64 %a, i64 %b, i32 %c, i32 %d) local_unnamed_addr #0 {
@@ -80,7 +80,7 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: select_cc_64_32
-; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @selecti_cc_32(i32 %a, i32 %c, i32 %d) local_unnamed_addr #0 {
@@ -90,9 +90,9 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: selecti_cc_32
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i64 @selecti_cc_32_64(i32 %a, i64 %c, i64 %d) local_unnamed_addr #0 {
@@ -102,9 +102,9 @@ entry:
   ret i64 %c.d
 }
 ; CHECK-LABEL: selecti_cc_32_64
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @selecti_cc_64_32(i64 %a, i32 %c, i32 %d) local_unnamed_addr #0 {
@@ -114,4 +114,4 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: selecti_cc_64_32
-; CHECK-NOT: r{{[0-9]+}} <<= 32
+; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
index 63645383dd06f..e4fcde383c02f 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
@@ -43,7 +43,7 @@
 define dso_local zeroext i8 @loadu8(i8* nocapture readonly %p) local_unnamed_addr #0 {
 entry:
   %0 = load i8, i8* %p, align 1
-; CHECK: w{{[0-9]+}} = *(u8 *)(r{{[0-9]+}} + 0)
+; CHECK: ldxb w{{[0-9]+}}, [r{{[0-9]+}} + 0]
   ret i8 %0
 }
 
@@ -51,7 +51,7 @@ entry:
 define dso_local zeroext i16 @loadu16(i16* nocapture readonly %p) local_unnamed_addr #0 {
 entry:
   %0 = load i16, i16* %p, align 2
-; CHECK: w{{[0-9]+}} = *(u16 *)(r{{[0-9]+}} + 0)
+; CHECK: ldxh w{{[0-9]+}}, [r{{[0-9]+}} + 0]
   ret i16 %0
 }
 
@@ -59,7 +59,7 @@ entry:
 define dso_local i32 @loadu32(i32* nocapture readonly %p) local_unnamed_addr #0 {
 entry:
   %0 = load i32, i32* %p, align 4
-; CHECK: w{{[0-9]+}} = *(u32 *)(r{{[0-9]+}} + 0)
+; CHECK: ldxw w{{[0-9]+}}, [r{{[0-9]+}} + 0]
   ret i32 %0
 }
 
@@ -67,7 +67,7 @@ entry:
 define dso_local i64 @loadu64(i64* nocapture readonly %p) local_unnamed_addr #0 {
 entry:
   %0 = load i64, i64* %p, align 8
-; CHECK: r{{[0-9]+}} = *(u64 *)(r{{[0-9]+}} + 0)
+; CHECK: ldxdw r{{[0-9]+}}, [r{{[0-9]+}} + 0]
   ret i64 %0
 }
 
@@ -76,7 +76,7 @@ define dso_local void @storeu8(i8* nocapture %p, i64 %v) local_unnamed_addr #1 {
 entry:
   %conv = trunc i64 %v to i8
   store i8 %conv, i8* %p, align 1
-; CHECK: *(u8 *)(r{{[0-9]+}} + 0) = w{{[0-9]+}}
+; CHECK: stxb [r{{[0-9]+}} + 0], w{{[0-9]+}}
   ret void
 }
 
@@ -85,7 +85,7 @@ define dso_local void @storeu16(i16* nocapture %p, i64 %v) local_unnamed_addr #1
 entry:
   %conv = trunc i64 %v to i16
   store i16 %conv, i16* %p, align 2
-; CHECK: *(u16 *)(r{{[0-9]+}} + 0) = w{{[0-9]+}}
+; CHECK: stxh [r{{[0-9]+}} + 0], w{{[0-9]+}}
   ret void
 }
 
@@ -94,7 +94,7 @@ define dso_local void @storeu32(i32* nocapture %p, i64 %v) local_unnamed_addr #1
 entry:
   %conv = trunc i64 %v to i32
   store i32 %conv, i32* %p, align 4
-; CHECK: *(u32 *)(r{{[0-9]+}} + 0) = w{{[0-9]+}}
+; CHECK: stxw [r{{[0-9]+}} + 0], w{{[0-9]+}}
   ret void
 }
 
@@ -102,6 +102,6 @@ entry:
 define dso_local void @storeu64(i64* nocapture %p, i64 %v) local_unnamed_addr #1 {
 entry:
   store i64 %v, i64* %p, align 8
-; CHECK: *(u64 *)(r{{[0-9]+}} + 0) = r{{[0-9]+}}
+; CHECK: stxdw [r{{[0-9]+}} + 0], r{{[0-9]+}}
   ret void
 }
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll
index 26012d19f0db2..701d30ccdeca0 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-1.ll
@@ -27,8 +27,8 @@ entry:
   %call = tail call i32 @helper(i32 %conv)
   ret i32 %call
 }
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} >>= 32
-; CHECK: if r{{[0-9]+}} == r{{[0-9]+}} goto
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
+; CHECK: jeq r{{[0-9]+}}, r{{[0-9]+}},
 
 declare dso_local i32 @helper(i32) local_unnamed_addr
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll
index d8f301e70f247..2fef555d3f418 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-2.ll
@@ -27,8 +27,8 @@ entry:
   %call = tail call i32 @helper(i32 %conv)
   ret i32 %call
 }
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK: if r{{[0-9]+}} == r{{[0-9]+}} goto
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: jeq r{{[0-9]+}}, r{{[0-9]+}},
 
 declare dso_local i32 @helper(i32) local_unnamed_addr
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll
index 3c70c3940dcbc..20d71af957fd1 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole-phi-3.ll
@@ -44,10 +44,10 @@ for.body:                                         ; preds = %for.body, %entry
   %exitcond = icmp eq i64 %inc, 100
   br i1 %exitcond, label %for.cond.cleanup, label %for.body, !llvm.loop !2
 }
-; CHECK: [[VAL:r[0-9]+]] = w{{[0-9]+}}
-; CHECK-NOT: [[VAL:r[0-9]+]] <<= 32
-; CHECK-NOT: [[VAL]] >>= 32
-; CHECK: if [[VAL]] == 0 goto
+; CHECK: mov32 [[VAL:r[0-9]+]], w{{[0-9]+}}
+; CHECK-NOT: lsh32 [[VAL:r[0-9]+]], 32
+; CHECK-NOT: rsh32 [[VAL]], 32
+; CHECK: jeq [[VAL]], 0,
 
 !2 = distinct !{!2, !3}
 !3 = !{!"llvm.loop.unroll.disable"}
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
index b5c7764f9150a..6ade7e00390d0 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
@@ -47,10 +47,10 @@ define dso_local i64 @select_u(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_add
 entry:
   %cmp = icmp ugt i32 %a, %b
   %c.d = select i1 %cmp, i64 %c, i64 %d
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
-; CHECK: if r{{[0-9]+}} {{<|>}} r{{[0-9]+}} goto
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
+; CHECK: {{jlt|jgt}}  r{{[0-9]+}}, r{{[0-9]+}},
   ret i64 %c.d
 }
 
@@ -59,9 +59,9 @@ define dso_local i64 @select_u_2(i32 %a, i64 %b, i64 %c, i64 %d) local_unnamed_a
 ; CHECK-LABEL: select_u_2:
 entry:
   %conv = zext i32 %a to i64
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
   %cmp = icmp ugt i64 %conv, %b
   %c.d = select i1 %cmp, i64 %c, i64 %d
   ret i64 %c.d
@@ -73,9 +73,9 @@ define dso_local i64 @select_s(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_add
 entry:
   %cmp = icmp sgt i32 %a, %b
   %c.d = select i1 %cmp, i64 %c, i64 %d
-; CHECK: r{{[0-9]+}} <<= 32
-; CHECK-NEXT: r{{[0-9]+}} s>>= 32
-; CHECK: if r{{[0-9]+}} s{{<|>}} r{{[0-9]+}} goto
+; CHECK: lsh64 r{{[0-9]+}}, 32
+; CHECK-NEXT: arsh64 r{{[0-9]+}}, 32
+; CHECK: {{jslt|jsgt}} r{{[0-9]+}}, r{{[0-9]+}},
   ret i64 %c.d
 }
 
@@ -88,11 +88,11 @@ entry:
   %cmp = icmp ult i32 %conv, 10
 ; %call comes from function call returning i64 so the high bits will need
 ; to be cleared.
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
   %b.c = select i1 %cmp, i32 %b, i32 %c
-; CHECK: if r{{[0-9]+}} {{<|>}} {{[0-9]+}} goto
+; CHECK: {{jlt|jgt}} r{{[0-9]+}}, {{[0-9]+}},
   ret i32 %b.c
 }
 
@@ -103,9 +103,9 @@ define dso_local i32* @inc_p(i32* readnone %p, i32 %a) local_unnamed_addr #0 {
 ; CHECK-LABEL: inc_p:
 entry:
   %idx.ext = zext i32 %a to i64
-; CHECK: r{{[0-9]+}} = w{{[0-9]+}}
-; CHECK-NOT: r{{[0-9]+}} <<= 32
-; CHECK-NOT: r{{[0-9]+}} >>= 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
+; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
   %add.ptr = getelementptr inbounds i32, i32* %p, i64 %idx.ext
   ret i32* %add.ptr
 }
@@ -117,10 +117,10 @@ entry:
   %cmp = icmp sgt i32 %call, 6
 ; The shifts can't be optimized out because %call comes from function call
 ; return i32 so the high bits might be invalid.
-; CHECK: r{{[0-9]+}} <<= 32
-; CHECK-NEXT: r{{[0-9]+}} s>>= 32
+; CHECK: lsh64 r{{[0-9]+}}, 32
+; CHECK-NEXT: arsh64 r{{[0-9]+}}, 32
   %cond = zext i1 %cmp to i32
-; CHECK: if r{{[0-9]+}} s{{<|>}} {{[0-9]+}} goto
+; CHECK: {{jslt|jsgt}} r{{[0-9]+}}, {{[0-9]+}},
   ret i32 %cond
 }
 declare dso_local i32 @helper(...) local_unnamed_addr
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
index de28abf192b97..c71172f5872e6 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
@@ -33,17 +33,17 @@ entry:
   %cmp = icmp sle i32 %1, 0
   br i1 %cmp, label %if.then, label %lor.lhs.false
 
-; CHECK:         [[REG1:r[0-9]+]] <<= 32
-; CHECK:         [[REG1]] s>>= 32
-; CHECK:         [[REG2:r[0-9]+]] = 1
-; CHECK:         if [[REG2]] s> [[REG1]] goto
-; CHECK:         if [[REG1]] s> 7 goto
+; CHECK:         lsh64 [[REG1:r[0-9]+]], 32
+; CHECK:         arsh64 [[REG1]], 32
+; CHECK:         mov64 [[REG2:r[0-9]+]], 1
+; CHECK:         jsgt [[REG2]], [[REG1]],
+; CHECK:         jsgt [[REG1]], 7,
 
-; CHECK-DISABLE: [[REG1:r[0-9]+]] += -8
-; CHECK-DISABLE: [[REG1]] <<= 32
-; CHECK-DISABLE: [[REG1]] >>= 32
-; CHECK-DISABLE: [[REG2:r[0-9]+]] = 4294967289
-; CHECK-DISABLE: if [[REG2]] > [[REG1]] goto
+; CHECK-DISABLE: add64 [[REG1:r[0-9]+]], -8
+; CHECK-DISABLE: lsh64 [[REG1]], 32
+; CHECK-DISABLE: rsh64 [[REG1]], 32
+; CHECK-DISABLE: lddw [[REG2:r[0-9]+]], 4294967289
+; CHECK-DISABLE: jgt [[REG2]], [[REG1]],
 
 lor.lhs.false:                                    ; preds = %entry
   %2 = load i32, i32* %ret, align 4, !tbaa !2
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
index dd3b7eee10c91..b78c18365ad81 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
@@ -31,17 +31,17 @@ entry:
   %cmp = icmp sle i32 %1, 0
   br i1 %cmp, label %if.then, label %if.end
 
-; CHECK:         [[REG1:r[0-9]+]] <<= 32
-; CHECK:         [[REG1]] s>>= 32
-; CHECK:         [[REG2:r[0-9]+]] = 1
-; CHECK:         if [[REG2]] s> [[REG1]] goto
-; CHECK:         if [[REG1]] s> 7 goto
+; CHECK:         lsh64 [[REG1:r[0-9]+]], 32
+; CHECK:         arsh64 [[REG1]], 32
+; CHECK:         mov64 [[REG2:r[0-9]+]], 1
+; CHECK:         jsgt [[REG2]], [[REG1]],
+; CHECK:         jsgt [[REG1]], 7,
 
-; CHECK-DISABLE: [[REG1:r[0-9]+]] += -8
-; CHECK-DISABLE: [[REG1]] <<= 32
-; CHECK-DISABLE: [[REG1]] >>= 32
-; CHECK-DISABLE: [[REG2:r[0-9]+]] = 4294967289
-; CHECK-DISABLE: if [[REG2]] > [[REG1]] goto
+; CHECK-DISABLE: add64 [[REG1:r[0-9]+]], -8
+; CHECK-DISABLE: lsh64 [[REG1]], 32
+; CHECK-DISABLE: rsh64 [[REG1]], 32
+; CHECK-DISABLE: lddw [[REG2:r[0-9]+]], 4294967289
+; CHECK-DISABLE: jgt [[REG2]], [[REG1]],
 
 if.then:                                          ; preds = %entry
   store i32 0, i32* %retval, align 4
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
index f7eed6fea77d9..28d932bbf5937 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
@@ -40,8 +40,8 @@ return:                                           ; preds = %if.end, %if.then
 }
 
 ; CHECK-LABEL: test1
-; CHECK-V1:    if r[[#]] > r[[#]] goto
-; CHECK-V3:    if w[[#]] < 4 goto
+; CHECK-V1:    jgt r[[#]], r[[#]],
+; CHECK-V3:    jlt w[[#]], 4,
 
 ; Function Attrs: nounwind
 define dso_local i32 @test2(i64 %a) #0 {
@@ -68,8 +68,8 @@ return:                                           ; preds = %if.end, %if.then
 }
 
 ; CHECK-LABEL: test2
-; CHECK-V1:    if r[[#]] > r[[#]] goto
-; CHECK-V3:    if w[[#]] < 4 goto
+; CHECK-V1:    jgt r[[#]], r[[#]],
+; CHECK-V3:    jlt w[[#]], 4,
 
 attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
 
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
index ac079f5dbe533..a3d202657847c 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
@@ -40,8 +40,8 @@ return:                                           ; preds = %if.end, %if.then
 }
 
 ; CHECK-LABEL: test1
-; CHECK-V1:    if r[[#]] > 3 goto
-; CHECK-V3:    if w[[#]] > 3 goto
+; CHECK-V1:    jgt r[[#]], 3,
+; CHECK-V3:    jgt w[[#]], 3,
 
 ; Function Attrs: nounwind
 define dso_local i32 @test2(i64 %a) #0 {
@@ -68,8 +68,8 @@ return:                                           ; preds = %if.end, %if.then
 }
 
 ; CHECK-LABEL: test2
-; CHECK-V1:    if r[[#]] > 3 goto
-; CHECK-V3:    if w[[#]] > 3 goto
+; CHECK-V1:    jgt r[[#]], 3,
+; CHECK-V3:    jgt w[[#]], 3,
 
 attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
 
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll b/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
index 46a39411bedc2..5f3ef42b6dc7e 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
@@ -41,20 +41,20 @@ if.end:                                           ; preds = %if.then, %entry
   call void @llvm.lifetime.end.p0i8(i64 8, i8* %5) #3
   ret i8* %4
 }
-; CHECK-COMMON:  [[REG6:r[0-9]+]] = r1
+; CHECK-COMMON:  mov64 [[REG6:r[0-9]+]], r1
 ; CHECK-COMMON:  call foo
 
-; CHECK:         if r0 > 7 goto [[LABEL:.*]]
-; CHECK:         [[REG6]] += r0
+; CHECK:         jgt r0, 7, [[LABEL:.*]]
+; CHECK:         add64 [[REG6]], r0
 ; CHECK:         [[LABEL]]:
-; CHECK:         r0 = [[REG6]]
+; CHECK:         mov64 r0, [[REG6]]
 
-; CHECK-DISABLE: [[REG1:r[0-9]+]] = 8
-; CHECK-DISABLE: if [[REG1]] > r0 goto [[LABEL:.*]]
-; CHECK-DISABLE: r0 = 0
+; CHECK-DISABLE: mov64 [[REG1:r[0-9]+]], 8
+; CHECK-DISABLE: jgt [[REG1]], r0, [[LABEL:.*]]
+; CHECK-DISABLE: mov64 r0, 0
 ; CHECK-DISABLE: [[LABEL]]:
-; CHECK-DISABLE: [[REG6]] += r0
-; CHECK-DISABLE: r0 = [[REG6]]
+; CHECK-DISABLE: add64 [[REG6]], r0
+; CHECK-DISABLE: mov64 r0, [[REG6]]
 
 ; CHECK-COMMON:  exit
 
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll b/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
index 8f663160dd7f9..371920a9cf9a9 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
@@ -43,27 +43,27 @@ if.end:                                           ; preds = %if.then, %entry
   ret i8* %4
 }
 
-; CHECK-COMMON:  [[REG6:r[0-9]+]] = r1
+; CHECK-COMMON:  mov64 [[REG6:r[0-9]+]], r1
 ; CHECK-COMMON:  call foo
 
-; CHECK:         r0 <<= 32
-; CHECK:         r0 >>= 32
-; CHECK:         if r0 > 7 goto [[LABEL:.*]]
-; CHECK:         [[REG6]] += r0
+; CHECK:         lsh64 r0, 32
+; CHECK:         rsh64 r0, 32
+; CHECK:         jgt r0, 7, [[LABEL:.*]]
+; CHECK:         add64 [[REG6]], r0
 ; CHECK:         [[LABEL]]:
-; CHECK:         r0 = [[REG6]]
+; CHECK:         mov64 r0, [[REG6]]
 
-; CHECK-DISABLE: [[REG1:r[0-9]+]] = r0
-; CHECK-DISABLE: [[REG1]] <<= 32
-; CHECK-DISABLE: [[REG1]] >>= 32
-; CHECK-DISABLE: [[REG2:r[0-9]+]] = 8
-; CHECK-DISABLE: if [[REG2]] > [[REG1]] goto [[LABEL:.*]]
-; CHECK-DISABLE: r0 = 0
+; CHECK-DISABLE: mov64 [[REG1:r[0-9]+]], r0
+; CHECK-DISABLE: lsh64 [[REG1]], 32
+; CHECK-DISABLE: rsh64 [[REG1]], 32
+; CHECK-DISABLE: mov64 [[REG2:r[0-9]+]], 8
+; CHECK-DISABLE: jgt [[REG2]], [[REG1]], [[LABEL:.*]]
+; CHECK-DISABLE: mov64 r0, 0
 ; CHECK-DISABLE: [[LABEL]]:
-; CHECK-DISABLE: r0 <<= 32
-; CHECK-DISABLE: r0 >>= 32
-; CHECK-DISABLE: [[REG6]] += r0
-; CHECK-DISABLE: r0 = [[REG6]]
+; CHECK-DISABLE: lsh64 r0, 32
+; CHECK-DISABLE: rsh64 r0, 32
+; CHECK-DISABLE: add64 [[REG6]], r0
+; CHECK-DISABLE: mov64 r0, [[REG6]]
 
 ; CHECK-COMMON:  exit
 
diff --git a/llvm/test/CodeGen/SBF/alu8.ll b/llvm/test/CodeGen/SBF/alu8.ll
index 35e5f7e63dcb3..3843fab1d8268 100644
--- a/llvm/test/CodeGen/SBF/alu8.ll
+++ b/llvm/test/CodeGen/SBF/alu8.ll
@@ -2,36 +2,36 @@
 
 define i8 @mov(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: mov:
-; CHECK: r0 = r2 # encoding: [0xbf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: mov64 r0, r2 # encoding: [0xbf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
 ; CHECK: exit # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
   ret i8 %b
 }
 
 define i8 @add(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: add:
-; CHECK: r0 = r1 # encoding: [0xbf,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
-; CHECK: r0 += r2 # encoding: [0x0f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: mov64 r0, r1 # encoding: [0xbf,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: add64 r0, r2 # encoding: [0x0f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %1 = add i8 %a, %b
   ret i8 %1
 }
 
 define i8 @and(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: and:
-; CHECK: r0 &= r2 # encoding: [0x5f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: and64 r0, r2 # encoding: [0x5f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %1 = and i8 %a, %b
   ret i8 %1
 }
 
 define i8 @bis(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: bis:
-; CHECK: r0 |= r2 # encoding: [0x4f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: or64 r0, r2 # encoding: [0x4f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %1 = or i8 %a, %b
   ret i8 %1
 }
 
 define i8 @xorand(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: xorand:
-; CHECK: r2 ^= -1 # encoding: [0xa7,0x02,0x00,0x00,0xff,0xff,0xff,0xff]
+; CHECK: xor64 r2, -1 # encoding: [0xa7,0x02,0x00,0x00,0xff,0xff,0xff,0xff]
   %1 = xor i8 %b, -1
   %2 = and i8 %a, %1
   ret i8 %2
@@ -39,7 +39,7 @@ define i8 @xorand(i8 %a, i8 %b) nounwind {
 
 define i8 @xor(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: xor:
-; CHECK: r0 ^= r2 # encoding: [0xaf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: xor64 r0, r2 # encoding: [0xaf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %1 = xor i8 %a, %b
   ret i8 %1
 }
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
index 8e448e4aba13a..4af68c876f20e 100644
--- a/llvm/test/CodeGen/SBF/atomics_sbf.ll
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -1,10 +1,10 @@
 ; RUN: llc < %s -march=sbf -mcpu=v3 -verify-machineinstrs | tee -i /tmp/log | FileCheck %s
 ;
 ; CHECK-LABEL: test_load_add_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: w3 += w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: add32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_add_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw add i32* %p, i32 %v seq_cst
@@ -12,10 +12,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_add_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: r3 += r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: add64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i32 @test_load_add_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw add i64* %p, i64 %v seq_cst
@@ -24,10 +24,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_sub_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: w3 -= w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: sub32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_sub_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw sub i32* %p, i32 %v seq_cst
@@ -35,10 +35,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_sub_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: r3 -= r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: sub64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i32 @test_load_sub_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw sub i64* %p, i64 %v seq_cst
@@ -47,8 +47,8 @@ entry:
 }
 
 ; CHECK-LABEL: test_xchg_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: *(u32 *)(r1 + 0) = w2
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: stxw [r1 + 0], w2
 define dso_local i32 @test_xchg_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw xchg i32* %p, i32 %v seq_cst
@@ -56,8 +56,8 @@ entry:
 }
 
 ; CHECK-LABEL: test_xchg_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: *(u64 *)(r1 + 0) = r2
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: stxdw [r1 + 0], r2
 define dso_local i32 @test_xchg_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw xchg i64* %p, i64 %v seq_cst
@@ -66,10 +66,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_cas_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: if w0 == w2 goto
-; CHECK: w3 = w0
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: jeq w0, w2,
+; CHECK: mov32 w3, w0
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
 entry:
   %0 = cmpxchg i32* %p, i32 %old, i32 %new seq_cst seq_cst
@@ -78,10 +78,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_cas_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: if r0 == r2 goto
-; CHECK: r3 = r0
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: jeq r0, r2,
+; CHECK: mov64 r3, r0
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i64 @test_cas_64(i64* nocapture %p, i64 %old, i64 %new) local_unnamed_addr {
 entry:
   %0 = cmpxchg i64* %p, i64 %old, i64 %new seq_cst seq_cst
@@ -90,10 +90,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_and_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: w3 &= w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: and32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_and_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw and i32* %p, i32 %v seq_cst
@@ -101,10 +101,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_and_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: r3 &= r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: and64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i64 @test_load_and_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw and i64* %p, i64 %v seq_cst
@@ -112,11 +112,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_nand_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: w3 &= w2
-; CHECK: w3 ^= -1
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: and32 w3, w2
+; CHECK: xor32 w3, -1
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_nand_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw nand i32* %p, i32 %v seq_cst
@@ -124,11 +124,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_nand_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: r3 &= r2
-; CHECK: r3 ^= -1
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: and64 r3, r2
+; CHECK: xor64 r3, -1
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i64 @test_load_nand_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw nand i64* %p, i64 %v seq_cst
@@ -136,10 +136,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_or_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: w3 |= w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: or32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_or_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw or i32* %p, i32 %v seq_cst
@@ -147,10 +147,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_or_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: r3 |= r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: or64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i64 @test_load_or_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw or i64* %p, i64 %v seq_cst
@@ -158,10 +158,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_xor_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: w3 ^= w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: xor32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_xor_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw xor i32* %p, i32 %v seq_cst
@@ -169,10 +169,10 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_xor_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: r3 ^= r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: xor64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local i64 @test_load_xor_64(i64* nocapture %p, i64 %v) local_unnamed_addr {
 entry:
   %0 = atomicrmw xor i64* %p, i64 %v seq_cst
@@ -180,11 +180,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_min_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: if w0 s< w2 goto
-; CHECK: w3 = w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: jslt w0, w2,
+; CHECK: mov32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_min_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw min i32* %ptr, i32 %v release, align 1
@@ -192,11 +192,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_min_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: if r0 s< r2 goto
-; CHECK: r3 = r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: jslt r0, r2,
+; CHECK: mov64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local  i64 @test_min_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw min i64* %ptr, i64 %v release, align 1
@@ -204,11 +204,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_max_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: if w0 s> w2 goto
-; CHECK: w3 = w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: jsgt w0, w2,
+; CHECK: mov32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_max_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw max i32* %ptr, i32 %v release, align 1
@@ -216,11 +216,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_max_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: if r0 s> r2 goto
-; CHECK: r3 = r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: jsgt r0, r2,
+; CHECK: mov64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local  i64 @test_max_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw max i64* %ptr, i64 %v release, align 1
@@ -228,11 +228,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_umin_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: if w0 < w2 goto
-; CHECK: w3 = w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: jlt w0, w2,
+; CHECK: mov32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umin_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw umin i32* %ptr, i32 %v release, align 1
@@ -240,11 +240,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_umin_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: if r0 < r2 goto
-; CHECK: r3 = r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: jlt r0, r2,
+; CHECK: mov64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local  i64 @test_umin_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw umin i64* %ptr, i64 %v release, align 1
@@ -252,11 +252,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_umax_32
-; CHECK: w0 = *(u32 *)(r1 + 0)
-; CHECK: w3 = w0
-; CHECK: if w0 > w2 goto
-; CHECK: w3 = w2
-; CHECK: *(u32 *)(r1 + 0) = w3
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w3, w0
+; CHECK: jgt w0, w2,
+; CHECK: mov32 w3, w2
+; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umax_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw umax i32* %ptr, i32 %v release, align 1
@@ -264,11 +264,11 @@ entry:
 }
 
 ; CHECK-LABEL: test_umax_64
-; CHECK: r0 = *(u64 *)(r1 + 0)
-; CHECK: r3 = r0
-; CHECK: if r0 > r2 goto
-; CHECK: r3 = r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r3, r0
+; CHECK: jgt r0, r2,
+; CHECK: mov64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define dso_local  i64 @test_umax_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
 entry:
   %0 = atomicrmw umax i64* %ptr, i64 %v release, align 1
diff --git a/llvm/test/CodeGen/SBF/basictest.ll b/llvm/test/CodeGen/SBF/basictest.ll
index 5cc98bfaf65b8..7af1db977e7ff 100644
--- a/llvm/test/CodeGen/SBF/basictest.ll
+++ b/llvm/test/CodeGen/SBF/basictest.ll
@@ -4,12 +4,12 @@ define i32 @test0(i32 %X) {
   %tmp.1 = add i32 %X, 1
   ret i32 %tmp.1
 ; CHECK-LABEL: test0:
-; CHECK: r0 += 1
+; CHECK: add64 r0, 1
 }
 
 ; CHECK-LABEL: store_imm:
-; CHECK: *(u32 *)(r1 + 0) = r{{[03]}}
-; CHECK: *(u32 *)(r2 + 4) = r{{[03]}}
+; CHECK: stxw [r1 + 0], r{{[03]}}
+; CHECK: stxw [r2 + 4], r{{[03]}}
 define i32 @store_imm(i32* %a, i32* %b) {
 entry:
   store i32 0, i32* %a, align 4
@@ -23,6 +23,6 @@ define zeroext i8 @loadG() {
   %tmp = load i8, i8* @G
   ret i8 %tmp
 ; CHECK-LABEL: loadG:
-; CHECK: r1 =
-; CHECK: r0 = *(u8 *)(r1 + 0)
+; CHECK: lddw r1, G
+; CHECK: ldxb r0, [r1 + 0]
 }
diff --git a/llvm/test/CodeGen/SBF/byval.ll b/llvm/test/CodeGen/SBF/byval.ll
index ba24c7a99aa3a..652b2a88a6ea5 100644
--- a/llvm/test/CodeGen/SBF/byval.ll
+++ b/llvm/test/CodeGen/SBF/byval.ll
@@ -5,10 +5,10 @@
 ; Function Attrs: nounwind uwtable
 define void @bar(i32 %a) #0 {
 ; CHECK-LABEL: bar:
-; CHECK: r2 = 8589934593 ll
-; CHECK: *(u64 *)(r10 - 40) = r2
-; CHECK: r2 = r10
-; CHECK: r2 += -40
+; CHECK: lddw r2, 8589934593
+; CHECK: stxdw [r10 - 40], r2
+; CHECK: mov64 r2, r10
+; CHECK: add64 r2, -40
 ; CHECK: call foo
 entry:
   %.compoundliteral = alloca %struct.S, align 8
diff --git a/llvm/test/CodeGen/SBF/cc_args.ll b/llvm/test/CodeGen/SBF/cc_args.ll
index 5d4a26945b66c..3b7f46eb74409 100644
--- a/llvm/test/CodeGen/SBF/cc_args.ll
+++ b/llvm/test/CodeGen/SBF/cc_args.ll
@@ -4,32 +4,32 @@ define void @test() #0 {
 entry:
 ; CHECK: test:
 
-; CHECK: r1 = 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
+; CHECK: mov64 r1, 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
 ; CHECK: call f_i16
   call void @f_i16(i16 123)
 
-; CHECK: r1 = 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
+; CHECK: mov64 r1, 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
 ; CHECK: call f_i32
   call void @f_i32(i32 12345678)
 
-; CHECK: r1 = 72623859790382856 ll # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
+; CHECK: lddw r1, 72623859790382856 # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
 ; CHECK: call f_i64
   call void @f_i64(i64 72623859790382856)
 
-; CHECK: r1 = 1234
-; CHECK: r2 = 5678
+; CHECK: mov64 r1, 1234
+; CHECK: mov64 r2, 5678
 ; CHECK: call f_i32_i32
   call void @f_i32_i32(i32 1234, i32 5678)
 
-; CHECK: r1 = 2
-; CHECK: r2 = 3
-; CHECK: r3 = 4
+; CHECK: mov64 r1, 2
+; CHECK: mov64 r2, 3
+; CHECK: mov64 r3, 4
 ; CHECK: call f_i16_i32_i16
   call void @f_i16_i32_i16(i16 2, i32 3, i16 4)
 
-; CHECK: r1 = 5
-; CHECK: r2 = 7262385979038285 ll
-; CHECK: r3 = 6
+; CHECK: mov64 r1, 5
+; CHECK: lddw r2, 7262385979038285
+; CHECK: mov64 r3, 6
 ; CHECK: call f_i16_i64_i16
   call void @f_i16_i64_i16(i16 5, i64 7262385979038285, i16 6)
 
@@ -42,52 +42,52 @@ entry:
 
 define void @f_i16(i16 %a) #0 {
 ; CHECK: f_i16:
-; CHECK: *(u16 *)(r2 + 0) = r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: stxh [r2 + 0], r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i16 %a, i16* @g_i16, align 2
   ret void
 }
 
 define void @f_i32(i32 %a) #0 {
 ; CHECK: f_i32:
-; CHECK: *(u32 *)(r2 + 0) = r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: stxw [r2 + 0], r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i32 %a, i32* @g_i32, align 2
   ret void
 }
 
 define void @f_i64(i64 %a) #0 {
 ; CHECK: f_i64:
-; CHECK: *(u64 *)(r2 + 0) = r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: stxdw [r2 + 0], r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i64 %a, i64* @g_i64, align 2
   ret void
 }
 
 define void @f_i32_i32(i32 %a, i32 %b) #0 {
 ; CHECK: f_i32_i32:
-; CHECK: *(u32 *)(r3 + 0) = r1
+; CHECK: stxw [r3 + 0], r1
   store volatile i32 %a, i32* @g_i32, align 4
-; CHECK: *(u32 *)(r3 + 0) = r2
+; CHECK: stxw [r3 + 0], r2
   store volatile i32 %b, i32* @g_i32, align 4
   ret void
 }
 
 define void @f_i16_i32_i16(i16 %a, i32 %b, i16 %c) #0 {
 ; CHECK: f_i16_i32_i16:
-; CHECK: *(u16 *)(r4 + 0) = r1
+; CHECK: stxh [r4 + 0], r1
   store volatile i16 %a, i16* @g_i16, align 2
-; CHECK: *(u32 *)(r1 + 0) = r2
+; CHECK: stxw [r1 + 0], r2
   store volatile i32 %b, i32* @g_i32, align 4
-; CHECK: *(u16 *)(r4 + 0) = r3
+; CHECK: stxh [r4 + 0], r3
   store volatile i16 %c, i16* @g_i16, align 2
   ret void
 }
 
 define void @f_i16_i64_i16(i16 %a, i64 %b, i16 %c) #0 {
 ; CHECK: f_i16_i64_i16:
-; CHECK: *(u16 *)(r4 + 0) = r1
+; CHECK: stxh [r4 + 0], r1
   store volatile i16 %a, i16* @g_i16, align 2
-; CHECK: *(u64 *)(r1 + 0) = r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: stxdw [r1 + 0], r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i64 %b, i64* @g_i64, align 8
-; CHECK: *(u16 *)(r4 + 0) = r3
+; CHECK: stxh [r4 + 0], r3
   store volatile i16 %c, i16* @g_i16, align 2
   ret void
 }
diff --git a/llvm/test/CodeGen/SBF/cc_ret.ll b/llvm/test/CodeGen/SBF/cc_ret.ll
index 8625e548b8ff8..12a22e2cb5ace 100644
--- a/llvm/test/CodeGen/SBF/cc_ret.ll
+++ b/llvm/test/CodeGen/SBF/cc_ret.ll
@@ -5,17 +5,17 @@ entry:
 ; CHECK: test:
 
 ; CHECK: call f_i16
-; CHECK: *(u16 *)(r1 + 0) = r0
+; CHECK: stxh [r1 + 0], r0
   %0 = call i16 @f_i16()
   store volatile i16 %0, i16* @g_i16
 
 ; CHECK: call f_i32
-; CHECK: *(u32 *)(r1 + 0) = r0
+; CHECK: stxw [r1 + 0], r0
   %1 = call i32 @f_i32()
   store volatile i32 %1, i32* @g_i32
 
 ; CHECK: call f_i64
-; CHECK: *(u64 *)(r1 + 0) = r0
+; CHECK: stxdw [r1 + 0], r0
   %2 = call i64 @f_i64()
   store volatile i64 %2, i64* @g_i64
 
@@ -28,21 +28,21 @@ entry:
 
 define i16 @f_i16() #0 {
 ; CHECK: f_i16:
-; CHECK: r0 = 1
+; CHECK: mov64 r0, 1
 ; CHECK: exit
   ret i16 1
 }
 
 define i32 @f_i32() #0 {
 ; CHECK: f_i32:
-; CHECK: r0 = 16909060
+; CHECK: mov64 r0, 16909060
 ; CHECK: exit
   ret i32 16909060
 }
 
 define i64 @f_i64() #0 {
 ; CHECK: f_i64:
-; CHECK: r0 = 72623859790382856 ll
+; CHECK: lddw r0, 72623859790382856
 ; CHECK: exit
   ret i64 72623859790382856
 }
diff --git a/llvm/test/CodeGen/SBF/cmp.ll b/llvm/test/CodeGen/SBF/cmp.ll
index 2f90b50bb2b11..328ba1d7b3184 100644
--- a/llvm/test/CodeGen/SBF/cmp.ll
+++ b/llvm/test/CodeGen/SBF/cmp.ll
@@ -17,7 +17,7 @@ define signext i8 @foo_cmp1(i8 signext %a, i8 signext %b) #0 {
   %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
   ret i8 %.0
 ; CHECK-LABEL:foo_cmp1:
-; CHECK: if r0 s>= r1
+; CHECK: jsge r0, r1
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -37,7 +37,7 @@ define signext i8 @foo_cmp2(i8 signext %a, i8 signext %b) #0 {
   %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
   ret i8 %.0
 ; CHECK-LABEL:foo_cmp2:
-; CHECK: if r0 s> r1
+; CHECK: jsgt r0, r1
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -57,7 +57,7 @@ define signext i8 @foo_cmp3(i8 signext %a, i8 signext %b) #0 {
   %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
   ret i8 %.0
 ; CHECK-LABEL:foo_cmp3:
-; CHECK: if r1 s>= r0
+; CHECK: jsge r1, r0
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -77,7 +77,7 @@ define signext i8 @foo_cmp4(i8 signext %a, i8 signext %b) #0 {
   %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
   ret i8 %.0
 ; CHECK-LABEL:foo_cmp4:
-; CHECK: if r1 s> r0
+; CHECK: jsgt r1, r0
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -86,9 +86,9 @@ define signext i8 @min(i8 signext %a, i8 signext %b) #0 {
   %a.b = select i1 %1, i8 %a, i8 %b
   ret i8 %a.b
 ; CHECK-LABEL:min:
-; CHECK: r0 = r1
-; CHECK: if r2 s> r0
-; CHECK: r0 = r2
+; CHECK: mov64 r0, r1
+; CHECK: jsgt r2, r0
+; CHECK: mov64 r0, r2
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -97,7 +97,7 @@ define zeroext i8 @minu(i8 zeroext %a, i8 zeroext %b) #0 {
   %a.b = select i1 %1, i8 %a, i8 %b
   ret i8 %a.b
 ; CHECK-LABEL:minu:
-; CHECK: if r{{[0-9]+}} {{<|>}} r{{[0-9]+}}
+; CHECK: {{jlt|jgt}} r{{[0-9]+}}, r{{[0-9]+}}
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -106,7 +106,7 @@ define signext i8 @max(i8 signext %a, i8 signext %b) #0 {
   %a.b = select i1 %1, i8 %a, i8 %b
   ret i8 %a.b
 ; CHECK-LABEL:max:
-; CHECK: if r0 s> r2
+; CHECK: jsgt r0, r2
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -115,5 +115,5 @@ define signext i8 @meq(i8 signext %a, i8 signext %b, i8 signext %c) #0 {
   %c.a = select i1 %1, i8 %c, i8 %a
   ret i8 %c.a
 ; CHECK-LABEL:meq:
-; CHECK: if r1 == r2
+; CHECK: jeq r1, r2
 }
diff --git a/llvm/test/CodeGen/SBF/ex1.ll b/llvm/test/CodeGen/SBF/ex1.ll
index 0a0f5f2e6d4f2..615e7c2b1c89c 100644
--- a/llvm/test/CodeGen/SBF/ex1.ll
+++ b/llvm/test/CodeGen/SBF/ex1.ll
@@ -30,11 +30,11 @@ define i32 @bpf_prog1(%struct.bpf_context* nocapture %ctx) #0 section "events/ne
 ; CHECK-LABEL: bpf_prog1:
 ; CHECK: call 4
 ; CHECK: call 9
-; CHECK: if r0 != 0
-; CHECK: r1 = 2946850620859748 ll
-; CHECK: r1 = 7214898703899978611 ll
+; CHECK: jne r0, 0
+; CHECK: lddw r1, 2946850620859748
+; CHECK: lddw r1, 7214898703899978611
 ; CHECK: call 11
-; CHECK: r0 = 0
+; CHECK: mov64 r0, 0
 ; CHECK: exit
   br label %13
 
diff --git a/llvm/test/CodeGen/SBF/f64-intrinsics.ll b/llvm/test/CodeGen/SBF/f64-intrinsics.ll
index f71fb71c81c72..c1203dbe14777 100644
--- a/llvm/test/CodeGen/SBF/f64-intrinsics.ll
+++ b/llvm/test/CodeGen/SBF/f64-intrinsics.ll
@@ -14,8 +14,8 @@ define double @powi_f64(double %a, i32 %b) nounwind {
 ;
 ; CHECK64-LABEL: powi_f64:
 ; CHECK64:       # %bb.0:
-; CHECK64-NEXT:    r2 <<= 32
-; CHECK64-NEXT:    r2 s>>= 32
+; CHECK64-NEXT:    lsh64 r2, 32
+; CHECK64-NEXT:    arsh64 r2, 32
 ; CHECK64-NEXT:    call __powidf2
 ; CHECK64-NEXT:    exit
   %1 = call double @llvm.powi.f64.i32(double %a, i32 %b)
diff --git a/llvm/test/CodeGen/SBF/fi_ri.ll b/llvm/test/CodeGen/SBF/fi_ri.ll
index cb16d3c7448ed..836728088db53 100644
--- a/llvm/test/CodeGen/SBF/fi_ri.ll
+++ b/llvm/test/CodeGen/SBF/fi_ri.ll
@@ -6,13 +6,13 @@
 define i32 @test() #0 {
   %key = alloca %struct.key_t, align 4
   %1 = bitcast %struct.key_t* %key to i8*
-; CHECK: r1 = 0
-; CHECK: *(u32 *)(r10 - 8) = r1
-; CHECK: *(u64 *)(r10 - 16) = r1
-; CHECK: *(u64 *)(r10 - 24) = r1
+; CHECK: mov64 r1, 0
+; CHECK: stxw [r10 - 8], r1
+; CHECK: stxdw [r10 - 16], r1
+; CHECK: stxdw [r10 - 24], r1
   call void @llvm.memset.p0i8.i64(i8* align 4 %1, i8 0, i64 20, i1 false)
-; CHECK: r1 = r10
-; CHECK: r1 += -20
+; CHECK: mov64 r1, r10
+; CHECK: add64 r1, -20
   %2 = getelementptr inbounds %struct.key_t, %struct.key_t* %key, i64 0, i32 1, i64 0
 ; CHECK: call test1
   call void @test1(i8* %2) #3
diff --git a/llvm/test/CodeGen/SBF/i128.ll b/llvm/test/CodeGen/SBF/i128.ll
index 373b89ef62e3d..1c2bedc77438a 100644
--- a/llvm/test/CodeGen/SBF/i128.ll
+++ b/llvm/test/CodeGen/SBF/i128.ll
@@ -32,10 +32,10 @@ entry:
 }
 
 ; CHECK-LABEL: test
-; CHECK:       r7 = r10
-; CHECK:       r7 += -32 
-; CHECK:       r1 = r7
-; CHECK:       *(u32 *)(r10 - 32) = r{{[0-9]+}}
+; CHECK:       mov64 r7, r10
+; CHECK:       add64 r7, -32 
+; CHECK:       mov64 r1, r7
+; CHECK:       stxw [r10 - 32], r{{[0-9]+}}
 
 ; Function Attrs: argmemonly nounwind willreturn
 declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
diff --git a/llvm/test/CodeGen/SBF/inline_asm.ll b/llvm/test/CodeGen/SBF/inline_asm.ll
index 3e7dcd39a9dce..141bc39c4135d 100644
--- a/llvm/test/CodeGen/SBF/inline_asm.ll
+++ b/llvm/test/CodeGen/SBF/inline_asm.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -verify-machineinstrs --sbf-output-asm-variant=1 | FileCheck %s
 
 ; Source code:
 ; int g[2];
@@ -25,17 +25,17 @@ entry:
   %0 = bitcast i32* %a to i8*
   call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %0) #2
   store i32 4, i32* %a, align 4
-  tail call void asm sideeffect "r0 = *(u16 *)skb[$0]", "i"(i32 2) #2
+  tail call void asm sideeffect ".syntax_old r0 = *(u16 *)skb[$0]", "i"(i32 2) #2
 ; CHECK: r0 = *(u16 *)skb[2]
-  tail call void asm sideeffect "r0 = *(u16 *)skb[$0]", "r"(i32 4) #2
+  tail call void asm sideeffect ".syntax_old r0 = *(u16 *)skb[$0]", "r"(i32 4) #2
 ; CHECK: r0 = *(u16 *)skb[r1]
-  %1 = tail call i32 asm sideeffect "$0 = $1", "=r,i"(i32 4) #2
+  %1 = tail call i32 asm sideeffect ".syntax_old $0 = $1", "=r,i"(i32 4) #2
 ; CHECK: r1 = 4
-  %2 = tail call i32 asm sideeffect "$0 = $1 ll", "=r,i"(i64 333333333333) #2
+  %2 = tail call i32 asm sideeffect ".syntax_old $0 = $1 ll", "=r,i"(i64 333333333333) #2
 ; CHECK: r1 = 333333333333 ll
-  %3 = call i32 asm sideeffect "$0 = *(u16 *) $1", "=r,*m"(i32* elementtype(i32) nonnull %a) #2
+  %3 = call i32 asm sideeffect ".syntax_old $0 = *(u16 *) $1", "=r,*m"(i32* elementtype(i32) nonnull %a) #2
 ; CHECK: r1 = *(u16 *) (r10 - 4)
-  %4 = call i32 asm sideeffect "$0 = *(u32 *) $1", "=r,*m"(i32* elementtype(i32) getelementptr inbounds ([2 x i32], [2 x i32]* @g, i64 0, i64 1)) #2
+  %4 = call i32 asm sideeffect ".syntax_old $0 = *(u32 *) $1", "=r,*m"(i32* elementtype(i32) getelementptr inbounds ([2 x i32], [2 x i32]* @g, i64 0, i64 1)) #2
 ; CHECK: r1 = g ll
 ; CHECK: r0 = *(u32 *) (r1 + 4)
   call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %0) #2
diff --git a/llvm/test/CodeGen/SBF/is_trunc_free.ll b/llvm/test/CodeGen/SBF/is_trunc_free.ll
index f5b91089e23b4..12e671c7cc899 100644
--- a/llvm/test/CodeGen/SBF/is_trunc_free.ll
+++ b/llvm/test/CodeGen/SBF/is_trunc_free.ll
@@ -58,8 +58,8 @@ cleanup:                                          ; preds = %entry, %if.end10
   ret i32 %retval.0
 }
 
-; CHECK: w{{[0-9]+}} = *(u32 *)(r{{[0-9]+}} + 0)
-; CHECK-NOT: w{{[0-9]+}} = w{{[0-9]+}}
+; CHECK: ldxw w{{[0-9]+}}, [r{{[0-9]+}} + 0]
+; CHECK-NOT: mov32 w{{[0-9]+}}, w{{[0-9]+}}
 
 declare dso_local i32 @work(%struct.env_t*, i32) local_unnamed_addr #1
 
diff --git a/llvm/test/CodeGen/SBF/is_zext_free.ll b/llvm/test/CodeGen/SBF/is_zext_free.ll
index cd267bc006651..4011891ff4774 100644
--- a/llvm/test/CodeGen/SBF/is_zext_free.ll
+++ b/llvm/test/CodeGen/SBF/is_zext_free.ll
@@ -14,8 +14,8 @@ entry:
   ret i32 %conv
 }
 
-; CHECK: r[[REG1:[0-9]+]] = r{{[0-9]+}}
-; CHECK: w[[REG1]] &= w{{[0-9]+}}
+; CHECK: mov64 r[[REG1:[0-9]+]], r{{[0-9]+}}
+; CHECK: and32 w[[REG1]], w{{[0-9]+}}
 
 attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
 
diff --git a/llvm/test/CodeGen/SBF/load.ll b/llvm/test/CodeGen/SBF/load.ll
index 78b8021bf8a36..9710b7df111ef 100644
--- a/llvm/test/CodeGen/SBF/load.ll
+++ b/llvm/test/CodeGen/SBF/load.ll
@@ -5,7 +5,7 @@ define i16 @am1(i16* %a) nounwind {
   ret i16 %1
 }
 ; CHECK-LABEL: am1:
-; CHECK: r0 = *(u16 *)(r1 + 0)
+; CHECK: ldxh r0, [r1 + 0]
 
 @foo = external global i16
 
@@ -14,15 +14,15 @@ define i16 @am2() nounwind {
   ret i16 %1
 }
 ; CHECK-LABEL: am2:
-; CHECK: r0 = *(u16 *)(r1 + 0)
+; CHECK: ldxh r0, [r1 + 0]
 
 define i16 @am4() nounwind {
   %1 = load volatile i16, i16* inttoptr(i16 32 to i16*)
   ret i16 %1
 }
 ; CHECK-LABEL: am4:
-; CHECK: r1 = 32
-; CHECK: r0 = *(u16 *)(r1 + 0)
+; CHECK: mov64 r1, 32
+; CHECK: ldxh r0, [r1 + 0]
 
 define i16 @am5(i16* %a) nounwind {
   %1 = getelementptr i16, i16* %a, i16 2
@@ -30,7 +30,7 @@ define i16 @am5(i16* %a) nounwind {
   ret i16 %2
 }
 ; CHECK-LABEL: am5:
-; CHECK: r0 = *(u16 *)(r1 + 4)
+; CHECK: ldxh r0, [r1 + 4]
 
 %S = type { i16, i16 }
 @baz = common global %S zeroinitializer, align 1
@@ -40,4 +40,4 @@ define i16 @am6() nounwind {
   ret i16 %1
 }
 ; CHECK-LABEL: am6:
-; CHECK: r0 = *(u16 *)(r1 + 2)
+; CHECK: ldxh r0, [r1 + 2]
diff --git a/llvm/test/CodeGen/SBF/loop-exit-cond.ll b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
index 016e7c06e2185..e42467d05cb8c 100644
--- a/llvm/test/CodeGen/SBF/loop-exit-cond.ll
+++ b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
@@ -49,9 +49,9 @@ for.cond:                                         ; preds = %for.inc, %if.then
   %cmp1 = icmp slt i32 %2, %3
   br i1 %cmp1, label %for.body, label %for.cond.cleanup
 
-; CHECK:      w[[LEN:[0-9]+]] = w1
-; CHECK:      w[[IDX:[0-9]+]] += 1
-; CHECK-NEXT: w[[IDX]] s< w[[LEN]] goto
+; CHECK:      mov32 w[[LEN:[0-9]+]], w1
+; CHECK:      add32 w[[IDX:[0-9]+]], 1
+; CHECK-NEXT: jslt w[[IDX]], w[[LEN]],
 
 for.cond.cleanup:                                 ; preds = %for.cond
   %4 = bitcast i32* %i to i8*
diff --git a/llvm/test/CodeGen/SBF/loops.ll b/llvm/test/CodeGen/SBF/loops.ll
index 13b5b46ab480a..1ecf813bf9411 100644
--- a/llvm/test/CodeGen/SBF/loops.ll
+++ b/llvm/test/CodeGen/SBF/loops.ll
@@ -10,7 +10,7 @@ for.body:                                         ; preds = %for.body, %entry
   %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
   %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
 ; CHECK-LABEL: add:
-; CHECK: r{{[0-9]+}} += r{{[0-9]+}}
+; CHECK: add64 r{{[0-9]+}}, r{{[0-9]+}}
   %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
   %add = add i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
   %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
@@ -32,7 +32,7 @@ for.body:                                         ; preds = %for.body, %entry
   %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
   %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
 ; CHECK-LABEL: sub:
-; CHECK: r{{[0-9]+}} -= r{{[0-9]+}}
+; CHECK: sub64 r{{[0-9]+}}, r{{[0-9]+}}
   %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
   %add = sub i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
   %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
@@ -54,7 +54,7 @@ for.body:                                         ; preds = %for.body, %entry
   %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
   %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
 ; CHECK-LABEL: or:
-; CHECK: r{{[0-9]+}} |= r{{[0-9]+}}
+; CHECK: or64 r{{[0-9]+}}, r{{[0-9]+}}
   %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
   %add = or i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
   %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
@@ -76,7 +76,7 @@ for.body:                                         ; preds = %for.body, %entry
   %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
   %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
 ; CHECK-LABEL: xor:
-; CHECK: r{{[0-9]+}} ^= r{{[0-9]+}}
+; CHECK: xor64 r{{[0-9]+}}, r{{[0-9]+}}
   %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
   %add = xor i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
   %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
@@ -98,7 +98,7 @@ for.body:                                         ; preds = %for.body, %entry
   %sum.09 = phi i16 [ 0, %entry ], [ %add, %for.body ] ; <i16> [#uses=1]
   %arrayidx = getelementptr i16, i16* %a, i16 %i.010   ; <i16*> [#uses=1]
 ; CHECK-LABEL: and:
-; CHECK: r{{[0-9]+}} &= r{{[0-9]+}}
+; CHECK: and64 r{{[0-9]+}}, r{{[0-9]+}}
   %tmp4 = load i16, i16* %arrayidx                     ; <i16> [#uses=1]
   %add = and i16 %tmp4, %sum.09                   ; <i16> [#uses=2]
   %inc = add i16 %i.010, 1                        ; <i16> [#uses=2]
diff --git a/llvm/test/CodeGen/SBF/many_args1.ll b/llvm/test/CodeGen/SBF/many_args1.ll
index 3c6e277fa9424..18a7434e250b2 100644
--- a/llvm/test/CodeGen/SBF/many_args1.ll
+++ b/llvm/test/CodeGen/SBF/many_args1.ll
@@ -3,12 +3,12 @@
 ; Function Attrs: nounwind uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK-LABEL: foo:
-; CHECK: r4 = 2
-; CHECK: *(u64 *)(r10 - 4096) = r4
-; CHECK: r4 = 3
-; CHECK: *(u64 *)(r10 - 4088) = r4
-; CHECK: r5 = r10
-; CHECK: r4 = 1
+; CHECK: mov64 r4, 2
+; CHECK: stxdw [r10 - 4096], r4
+; CHECK: mov64 r4, 3
+; CHECK: stxdw [r10 - 4088], r4
+; CHECK: mov64 r5, r10
+; CHECK: mov64 r4, 1
 ; CHECK: call bar
 entry:
   %call = tail call i32 @bar(i32 %a, i32 %b, i32 %c, i32 1, i32 2, i32 3) #3
diff --git a/llvm/test/CodeGen/SBF/many_args2.ll b/llvm/test/CodeGen/SBF/many_args2.ll
index 8db12aa47ba00..7b9151a5bd125 100644
--- a/llvm/test/CodeGen/SBF/many_args2.ll
+++ b/llvm/test/CodeGen/SBF/many_args2.ll
@@ -3,7 +3,7 @@
 ; Function Attrs: nounwind readnone uwtable
 define i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) #0 {
 ; CHECK-LABEL: bar:
-; CHECK: r0 = 1
+; CHECK: mov64 r0, 1
 entry:
   ret i32 1
 }
@@ -11,7 +11,7 @@ entry:
 ; Function Attrs: nounwind readnone uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK-LABEL: foo:
-; CHECK: r0 = 1
+; CHECK: mov64 r0, 1
 entry:
   ret i32 1
 }
diff --git a/llvm/test/CodeGen/SBF/mem_offset.ll b/llvm/test/CodeGen/SBF/mem_offset.ll
index edce3e9975d0a..90c850b38ece4 100644
--- a/llvm/test/CodeGen/SBF/mem_offset.ll
+++ b/llvm/test/CodeGen/SBF/mem_offset.ll
@@ -2,8 +2,8 @@
 
 ; Function Attrs: nounwind
 define i32 @bpf_prog1(i8* nocapture readnone) local_unnamed_addr #0 {
-; CHECK: r1 += -1879113726 # encoding: [0x07,0x01,0x00,0x00,0x02,0x00,0xff,0x8f]
-; CHECK: r0 = *(u64 *)(r1 + 0) # encoding: [0x79,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: add64 r1, -1879113726 # encoding: [0x07,0x01,0x00,0x00,0x02,0x00,0xff,0x8f]
+; CHECK: ldxdw r0, [r1 + 0] # encoding: [0x79,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
   %2 = alloca i64, align 8
   %3 = bitcast i64* %2 to i8*
   store volatile i64 590618314553, i64* %2, align 8
diff --git a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
index bec8bec61b13a..2c59a27aab596 100644
--- a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
+++ b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
@@ -66,13 +66,13 @@ entry:
   tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 %0, i8* align 8 %1, i64 27, i1 false)
   ret void
 }
-; CHECK: [[SCRATCH_REG:r[0-9]]] = *(u64 *)([[SRC_REG:r[0-9]]] + 0)
-; CHECK: *(u64 *)([[DST_REG:r[0-9]]] + 0) = [[SCRATCH_REG]]
-; CHECK: [[SCRATCH_REG]] = *(u64 *)([[SRC_REG]] + 8)
-; CHECK: *(u64 *)([[DST_REG]] + 8) = [[SCRATCH_REG]]
-; CHECK: [[SCRATCH_REG]] = *(u64 *)([[SRC_REG]] + 16)
-; CHECK: *(u64 *)([[DST_REG]] + 16) = [[SCRATCH_REG]]
-; CHECK: [[SCRATCH_REG]] = *(u16 *)([[SRC_REG]] + 24)
-; CHECK: *(u16 *)([[DST_REG]] + 24) = [[SCRATCH_REG]]
-; CHECK: [[SCRATCH_REG]] = *(u8 *)([[SRC_REG]] + 26)
-; CHECK: *(u8 *)([[DST_REG]] + 26) = [[SCRATCH_REG]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG]]
+; CHECK: ldxdw [[SCRATCH_REG]], [[[SRC_REG]] + 8]
+; CHECK: stxdw [[[DST_REG]] + 8], [[SCRATCH_REG]]
+; CHECK: ldxdw [[SCRATCH_REG]], [[[SRC_REG]] + 16]
+; CHECK: stxdw [[[DST_REG]] + 16], [[SCRATCH_REG]]
+; CHECK: ldxh [[SCRATCH_REG]], [[[SRC_REG]] + 24]
+; CHECK: stxh [[[DST_REG]] + 24], [[SCRATCH_REG]]
+; CHECK: ldxb [[SCRATCH_REG]], [[[SRC_REG]] + 26]
+; CHECK: stxb [[[DST_REG]] + 26], [[SCRATCH_REG]]
diff --git a/llvm/test/CodeGen/SBF/ninline_asm.ll b/llvm/test/CodeGen/SBF/ninline_asm.ll
new file mode 100644
index 0000000000000..f3412ac0b90ed
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/ninline_asm.ll
@@ -0,0 +1,37 @@
+; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+
+@g = common global [2 x i32] zeroinitializer, align 4
+
+; Function Attrs: nounwind
+define i32 @test(i8* nocapture readnone %ctx) local_unnamed_addr #0 {
+entry:
+  %a = alloca i32, align 4
+  %0 = bitcast i32* %a to i8*
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %0) #2
+  store i32 4, i32* %a, align 4
+  tail call void asm sideeffect "ldabsh $0", "i"(i32 2) #2
+; CHECK: ldabsh 2 
+  tail call void asm sideeffect "ldindh $0", "r"(i32 4) #2
+; CHECK: ldindh r1
+  %1 = tail call i32 asm sideeffect "mov64 $0, $1", "=r,i"(i32 4) #2
+; CHECK: mov64 r1, 4
+  %2 = tail call i32 asm sideeffect "lddw $0, $1", "=r,i"(i64 333333333333) #2
+; CHECK: lddw r1, 333333333333
+  %3 = call i32 asm sideeffect "ldxh $0, [$1]", "=r,*m"(i32* elementtype(i32) nonnull %a) #2
+; CHECK: ldxh r1, [r10 - 4]
+  %4 = call i32 asm sideeffect "ldxw $0, [$1]", "=r,*m"(i32* elementtype(i32) getelementptr inbounds ([2 x i32], [2 x i32]* @g, i64 0, i64 1)) #2
+; CHECK: lddw r1, g
+; CHECK: ldxw r0, [r1 + 4]
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %0) #2
+  ret i32 %4
+}
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #1
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
+
+attributes #0 = { nounwind }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_atomics.ll b/llvm/test/CodeGen/SBF/objdump_atomics.ll
index b87a3ae25a7e9..d6f594a509aa8 100644
--- a/llvm/test/CodeGen/SBF/objdump_atomics.ll
+++ b/llvm/test/CodeGen/SBF/objdump_atomics.ll
@@ -1,9 +1,9 @@
 ; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; CHECK-LABEL: test_load_add_32
-; CHECK: r3 = *(u32 *)(r1 + 0)
-; CHECK: r3 += r2
-; CHECK: *(u32 *)(r1 + 0) = r3
+; CHECK: ldxw r3, [r1 + 0]
+; CHECK: add64 r3, r2
+; CHECK: stxw [r1 + 0], r3
 define void @test_load_add_32(i32* %p, i32 zeroext %v) {
 entry:
   atomicrmw add i32* %p, i32 %v seq_cst
@@ -11,9 +11,9 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_add_64
-; CHECK: r3 = *(u64 *)(r1 + 0)
-; CHECK: r3 += r2
-; CHECK: *(u64 *)(r1 + 0) = r3
+; CHECK: ldxdw r3, [r1 + 0]
+; CHECK: add64 r3, r2
+; CHECK: stxdw [r1 + 0], r3
 define void @test_load_add_64(i64* %p, i64 zeroext %v) {
 entry:
   atomicrmw add i64* %p, i64 %v seq_cst
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index dab1dfb9d1c18..1a9be7dbd5f9d 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -25,40 +25,40 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %6 = shl i32 %5, 1
   %7 = mul i32 %6, %5
   br label %13
-; CHECK: r1 <<= 32
-; CHECK: r1 >>= 32
-; CHECK: if r1 != 2 goto +6 <LBB0_2>
+; CHECK: lsh64 r1, 32
+; CHECK: rsh64 r1, 32
+; CHECK: jne r1, 2, +6 <LBB0_2>
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i32 %0, %1
   %10 = load i32, i32* @gbl, align 4
   br i1 %9, label %15, label %11
 
-; CHECK: r1 = 0 ll
-; CHECK: r0 = *(u32 *)(r1 + 0)
-; CHECK: r0 *= r0
-; CHECK: r0 <<= 1
-; CHECK: goto +7 <LBB0_4>
+; CHECK: lddw r1, 0
+; CHECK: ldxw r0, [r1 + 0]
+; CHECK: mul64 r0, r0
+; CHECK: lsh64 r0, 1
+; CHECK: ja +7 <LBB0_4>
 
 ; <label>:11:                                     ; preds = %8
   %12 = shl nsw i32 %10, 2
   br label %13
 
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: r3 = 0 ll
-; CHECK: r0 = *(u32 *)(r3 + 0)
-; CHECK: r2 <<= 32
-; CHECK: r2 >>= 32
-; CHECK: if r1 == r2 goto +4 <LBB0_5>
-; CHECK: r0 <<= 2
+; CHECK: lddw r3, 0
+; CHECK: ldxw r0, [r3 + 0]
+; CHECK: lsh64 r2, 32
+; CHECK: rsh64 r2, 32
+; CHECK: jeq r1, r2, +4 <LBB0_5>
+; CHECK: lsh64 r0, 2
 
 ; <label>:13:                                     ; preds = %4, %11
   %14 = phi i32 [ %12, %11 ], [ %7, %4 ]
   store i32 %14, i32* @gbl, align 4
   br label %15
 ; CHECK-LABEL: <LBB0_4>:
-; CHECK: r1 = 0 ll
-; CHECK: *(u32 *)(r1 + 0) = r0
+; CHECK: lddw r1, 0
+; CHECK: stxw [r1 + 0], r0
 
 ; <label>:15:                                     ; preds = %8, %13
   %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
index 3f6655f637b4b..7682613fbcd7b 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -14,8 +14,8 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 
 ; <label>:4:                                      ; preds = %2
   br label %5
-; CHECK: if r4 s>= r3 goto +11 <LBB0_3>
-; CHECK: r0 = 0
+; CHECK: jsge r4, r3, +11 <LBB0_3>
+; CHECK: mov64 r0, 0
 ; CHECK-LABEL: <LBB0_2>:
 
 ; <label>:5:                                      ; preds = %4, %5
@@ -27,8 +27,8 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %11 = sub nsw i32 %7, %9
   %12 = icmp slt i32 %10, %11
   br i1 %12, label %5, label %13
-; CHECK: r1 = r3
-; CHECK: if r2 s> r3 goto -10 <LBB0_2>
+; CHECK: mov64 r1, r3
+; CHECK: jsgt r2, r3, -10 <LBB0_2>
 
 ; <label>:13:                                     ; preds = %5, %2
   %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
diff --git a/llvm/test/CodeGen/SBF/objdump_dis_all.ll b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
index 67155013145a9..f1d9dea566293 100644
--- a/llvm/test/CodeGen/SBF/objdump_dis_all.ll
+++ b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
@@ -21,6 +21,6 @@ entry:
 }
 ; CHECK-LABEL: section .data
 ; CHECK-LABEL: g
-; CHECK:       *(u64 *)(r10 - 16) = r1
+; CHECK:       stxdw [r10 - 16], r1
 ; CHECK-LABEL: h
 ; CHECK:       <unknown>
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
index 57c87da92c870..7b2a4f0cdbe1f 100644
--- a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -25,23 +25,23 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 ; CHECK-LABEL: test
   %3 = icmp eq i64 %0, -6067004223159161907
   br i1 %3, label %4, label %8
-; CHECK-DEC: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         r3 = -6067004223159161907 ll
-; CHECK-DEC: 5d 31 07 00 00 00 00 00         if r1 != r3 goto +7
-; CHECK-HEX: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         r3 = -0x5432543254325433 ll
-; CHECK-HEX: 5d 31 07 00 00 00 00 00         if r1 != r3 goto +0x7
+; CHECK-DEC: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -6067004223159161907
+; CHECK-DEC: 5d 31 07 00 00 00 00 00         jne r1, r3, +7
+; CHECK-HEX: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -0x5432543254325433
+; CHECK-HEX: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
 
 ; <label>:4:                                      ; preds = %2
   %5 = load i32, i32* @gbl, align 4
   %6 = shl i32 %5, 1
-; CHECK-DEC: 67 01 00 00 01 00 00 00         r1 <<= 1
-; CHECK-HEX: 67 01 00 00 01 00 00 00         r1 <<= 0x1
+; CHECK-DEC: 67 01 00 00 01 00 00 00         lsh64 r1, 1
+; CHECK-HEX: 67 01 00 00 01 00 00 00         lsh64 r1, 0x1
   %7 = mul i32 %6, %5
   br label %13
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i64 %1, 188899839028173
-; CHECK-DEC: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         r1 = 188899839028173 ll
-; CHECK-HEX: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         r1 = 0xabcdabcdabcd ll
+; CHECK-DEC: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 188899839028173
+; CHECK-HEX: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 0xabcdabcdabcd
   br i1 %9, label %10, label %16
 
 ; <label>:10:                                     ; preds = %8
@@ -53,8 +53,8 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
   %14 = phi i32 [ %12, %10 ], [ %7, %4 ]
   %15 = phi i32 [ 2, %10 ], [ 1, %4 ]
   store i32 %14, i32* @gbl, align 4
-; CHECK-DEC: 63 12 00 00 00 00 00 00         *(u32 *)(r2 + 0) = r1
-; CHECK-HEX: 63 12 00 00 00 00 00 00         *(u32 *)(r2 + 0x0) = r1
+; CHECK-DEC: 63 12 00 00 00 00 00 00         stxw [r2 + 0], r1
+; CHECK-HEX: 63 12 00 00 00 00 00 00         stxw [r2 + 0x0], r1
   br label %16
 
 ; <label>:16:                                     ; preds = %13, %8
diff --git a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
index 40b5096a67ff8..23fcfbb5ba0d1 100644
--- a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
+++ b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
@@ -25,11 +25,11 @@ entry:
   %conv5 = trunc i64 %add4 to i32
   ret i32 %conv5
 ; CHECK-LABEL: bswap:
-; CHECK-EL: r1 = be64 r1
-; CHECK-EL: r0 = be32 r0
-; CHECK-EL: r0 += r1
-; CHECK-EL: r3 = be16 r3
-; CHECK-EL: r0 += r3
+; CHECK-EL: be64 r1
+; CHECK-EL: be32 r0
+; CHECK-EL: add64 r0, r1
+; CHECK-EL: be16 r3
+; CHECK-EL: add64 r0, r3
 }
 
 declare i64 @llvm.bswap.i64(i64) #1
diff --git a/llvm/test/CodeGen/SBF/objdump_nop.ll b/llvm/test/CodeGen/SBF/objdump_nop.ll
index e90d481e3badc..b058392353c29 100644
--- a/llvm/test/CodeGen/SBF/objdump_nop.ll
+++ b/llvm/test/CodeGen/SBF/objdump_nop.ll
@@ -2,18 +2,18 @@
 ;
 ; Source:
 ;   int test() {
-;     asm volatile("r0 = r0" ::);
+;     asm volatile("mov64 r0, r0" ::);
 ;     return 0;
 ;   }
 ; Compilation flag:
-;   clang -target bpf -O2 -S -emit-llvm t.c
+;   clang -target sbf -O2 -S -emit-llvm t.c
 
 ; Function Attrs: nounwind
 define dso_local i32 @test() local_unnamed_addr {
 entry:
-  tail call void asm sideeffect "r0 = r0", ""()
+  tail call void asm sideeffect "mov64 r0, r0", ""()
   ret i32 0
 }
 ; CHECK-LABEL: test
-; CHECK:       r0 = r0
-; CHECK:       r0 = 0
+; CHECK:       mov64 r0, r0
+; CHECK:       mov64 r0, 0
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index 8f20d2ae83d51..a00fc196ac344 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -10,16 +10,16 @@
 ; Function Attrs: norecurse nounwind
 define dso_local i32 @test() local_unnamed_addr #0 {
   %1 = load volatile i64, i64* @a, align 8, !tbaa !2
-; CHECK: r1 = 0 ll
+; CHECK: lddw r1, 0
 ; CHECK: R_SBF_64_64	a
-; CHECK: r1 = *(u64 *)(r1 + 0)
+; CHECK: ldxdw r1, [r1 + 0]
   %2 = load volatile i32, i32* @b, align 4, !tbaa !6
-; CHECK: r2 = 0 ll
+; CHECK: lddw r2, 0
 ; CHECK: R_SBF_64_64	b
-; CHECK: r0 = *(u32 *)(r2 + 0)
+; CHECK: ldxw r0, [r2 + 0]
   %3 = trunc i64 %1 to i32
   %4 = add i32 %2, %3
-; CHECK: r0 += r1
+; CHECK: add64 r0, r1
   ret i32 %4
 ; CHECK: exit
 }
diff --git a/llvm/test/CodeGen/SBF/objdump_trivial.ll b/llvm/test/CodeGen/SBF/objdump_trivial.ll
index 0e634d9aa23a3..d4f33570695e4 100644
--- a/llvm/test/CodeGen/SBF/objdump_trivial.ll
+++ b/llvm/test/CodeGen/SBF/objdump_trivial.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
-; CHECK: if r2 s> r1 goto
+; CHECK: jsgt r2, r1,
 ; CHECK: call 1
 ; CHECK: exit
 ; CHECK: call 2
diff --git a/llvm/test/CodeGen/SBF/preprocess-loads.ll b/llvm/test/CodeGen/SBF/preprocess-loads.ll
index 6267916236511..f36e2a976ec74 100644
--- a/llvm/test/CodeGen/SBF/preprocess-loads.ll
+++ b/llvm/test/CodeGen/SBF/preprocess-loads.ll
@@ -22,11 +22,11 @@ start:
   ret void
 }
 
-; CHECK: *(u64 *)(r1 + 24) = r4
-; CHECK: *(u64 *)(r1 + 16) = r4
-; CHECK: *(u64 *)(r1 + 8) = r4
-; CHECK: *(u64 *)(r1 + 0) = r2
-; CHECK: *(u8 *)(r1 + 32) = r3
+; CHECK: stxdw [r1 + 24], r4
+; CHECK: stxdw [r1 + 16], r4
+; CHECK: stxdw [r1 + 8], r4
+; CHECK: stxdw [r1 + 0], r2
+; CHECK: stxb [r1 + 32], r3
 
 attributes #2 = { nofree noinline nounwind willreturn "target-cpu"="generic" }
 
diff --git a/llvm/test/CodeGen/SBF/reloc-2.ll b/llvm/test/CodeGen/SBF/reloc-2.ll
index 8dc3f3b3ae7f5..d05229d1bf298 100644
--- a/llvm/test/CodeGen/SBF/reloc-2.ll
+++ b/llvm/test/CodeGen/SBF/reloc-2.ll
@@ -41,8 +41,8 @@ entry:
 ; DUMP:       .text:
 ; DUMP-EMPTY:
 ; DUMP-NEXT:  <test>
-; DUMP-NEXT:  r[[#]] = r[[#]]
-; DUMP-NEXT:  r[[#]] = r[[#]]
+; DUMP-NEXT:  mov64 r[[#]], r[[#]]
+; DUMP-NEXT:  mov64 r[[#]], r[[#]]
 ; DUMP-NEXT:  call -1
 
 ; DUMP:       sec1:
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_1.ll b/llvm/test/CodeGen/SBF/remove_truncate_1.ll
index 55555c491b046..28e9de9ab3a99 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_1.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_1.ll
@@ -48,14 +48,14 @@ if.then:                                          ; preds = %entry
   %3 = load i8, i8* %2, align 1
   %cmp = icmp eq i8 %3, 1
   br i1 %cmp, label %cleanup20, label %if.end12
-; CHECK:  r1 = *(u32 *)(r1 + 0)
-; CHECK:  r2 = *(u8 *)(r1 + 0)
+; CHECK:  ldxw r1, [r1 + 0]
+; CHECK:  ldxb r2, [r1 + 0]
 
 if.else:                                          ; preds = %entry
   %data_end = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %xdp, i64 0, i32 1
   %4 = load i32, i32* %data_end, align 4
   %conv6 = zext i32 %4 to i64
-; CHECK:  r2 = *(u32 *)(r1 + 4)
+; CHECK:  ldxw r2, [r1 + 4]
   %5 = inttoptr i64 %conv6 to i8*
   %6 = load volatile i8, i8* %5, align 1
   %cmp8 = icmp eq i8 %6, 1
@@ -65,16 +65,16 @@ if.else.if.end12_crit_edge:                       ; preds = %if.else
   %data13.phi.trans.insert = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %xdp, i64 0, i32 0
   %.pre = load i32, i32* %data13.phi.trans.insert, align 4
   br label %if.end12
-; CHECK: r1 = *(u32 *)(r1 + 0)
+; CHECK: ldxw r1, [r1 + 0]
 
 if.end12:                                         ; preds = %if.else.if.end12_crit_edge, %if.then
   %7 = phi i32 [ %.pre, %if.else.if.end12_crit_edge ], [ %1, %if.then ]
   %conv14 = zext i32 %7 to i64
-; CHECK-NOT: r1 <<= 32
-; CHECK-NOT: r1 >>= 32
+; CHECK-NOT: lsh64 r1, 32
+; CHECK-NOT: rsh64 r1, 32
   %8 = inttoptr i64 %conv14 to i8*
   %9 = load volatile i8, i8* %8, align 1
-; CHECK:  r1 = *(u8 *)(r1 + 0)
+; CHECK: ldxb r1, [r1 + 0]
   %cmp16 = icmp eq i8 %9, 0
   %.28 = zext i1 %cmp16 to i32
   br label %cleanup20
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_2.ll b/llvm/test/CodeGen/SBF/remove_truncate_2.ll
index ece436ea663ed..d1b9f9ff39dec 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_2.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_2.ll
@@ -32,8 +32,8 @@ entry:
   %conv = zext i32 %0 to i64
   %1 = inttoptr i64 %conv to i8*
   %2 = load i8, i8* %1, align 1
-; CHECK:  r1 = *(u32 *)(r1 + 0)
-; CHECK:  r1 = *(u8 *)(r1 + 0)
+; CHECK:  ldxw r1, [r1 + 0]
+; CHECK:  ldxb r1, [r1 + 0]
   %3 = load i32, i32* @gbl, align 4
   switch i32 %3, label %if.end [
     i32 0, label %if.else
@@ -42,16 +42,16 @@ entry:
 
 if.end:                                           ; preds = %entry
   %cmp4 = icmp eq i8 %2, 1
-; CHECK:  r0 = 3
-; CHECK-NOT:  r1 &= 255
-; CHECK:  if r1 == 1 goto
+; CHECK:  mov64 r0, 3
+; CHECK-NOT:  and64 r1, 255
+; CHECK:  jeq r1, 1,
   br i1 %cmp4, label %cleanup, label %if.end13
 
 if.else:                                          ; preds = %entry
   %cmp9 = icmp eq i8 %2, 0
-; CHECK:  r0 = 2
-; CHECK-NOT:  r1 &= 255
-; CHECK:  if r1 == 0 goto
+; CHECK:  mov64 r0, 2
+; CHECK-NOT:  and64 r1, 255
+; CHECK:  jeq r1, 0,
   br i1 %cmp9, label %cleanup, label %if.end13
 
 if.end13:                                         ; preds = %if.else, %if.end
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_3.ll b/llvm/test/CodeGen/SBF/remove_truncate_3.ll
index c1393fbefe4bd..336015266607b 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_3.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_3.ll
@@ -51,17 +51,17 @@ define i32 @xdp_dummy(%struct.xdp_md* nocapture readonly) local_unnamed_addr #0
   %9 = load i8, i8* %8, align 1
   %10 = icmp eq i8 %9, 1
   br i1 %10, label %28, label %23
-; CHECK:  r1 = *(u32 *)(r1 + 0)
-; CHECK:  r2 = *(u8 *)(r1 + 0)
+; CHECK:  ldxw r1, [r1 + 0]
+; CHECK:  ldxb r2, [r1 + 0]
 
 ; <label>:11:                                     ; preds = %1
   %12 = getelementptr inbounds %struct.xdp_md, %struct.xdp_md* %0, i64 0, i32 1
   %13 = load i32, i32* %12, align 4
   %14 = zext i32 %13 to i64
-; CHECK:  r2 = *(u32 *)(r1 + 4)
+; CHECK:  ldxw r2, [r1 + 4]
   %15 = inttoptr i64 %14 to i8*
   %16 = load volatile i8, i8* %15, align 1
-; CHECK:  r2 = *(u8 *)(r2 + 0)
+; CHECK:  ldxb r2, [r2 + 0]
   %17 = icmp eq i8 %16, 1
   br i1 %17, label %28, label %18
 
@@ -71,14 +71,14 @@ define i32 @xdp_dummy(%struct.xdp_md* nocapture readonly) local_unnamed_addr #0
   %21 = zext i32 %20 to i64
   %22 = inttoptr i64 %21 to i8*
   br label %23
-; CHECK: r1 = *(u32 *)(r1 + 0)
+; CHECK: ldxw r1, [r1 + 0]
 
 ; <label>:23:                                     ; preds = %18, %4
   %24 = phi i8* [ %22, %18 ], [ %8, %4 ]
-; CHECK-NOT: r1 <<= 32
-; CHECK-NOT: r1 >>= 32
+; CHECK-NOT: lsh64 r1, 32
+; CHECK-NOT: rsh64 r1, 32
   %25 = load volatile i8, i8* %24, align 1
-; CHECK:  r1 = *(u8 *)(r1 + 0)
+; CHECK:  ldxb r1, [r1 + 0]
   %26 = icmp eq i8 %25, 0
   %27 = zext i1 %26 to i32
   br label %28
@@ -91,13 +91,13 @@ define i32 @xdp_dummy(%struct.xdp_md* nocapture readonly) local_unnamed_addr #0
 ; Function Attrs: norecurse nounwind readnone
 define i32 @rol32(i32, i32) local_unnamed_addr #1 {
   %3 = shl i32 %0, %1
-; CHECK: r1 <<= 32
-; CHECK: r1 >>= 32
+; CHECK: lsh64 r1, 32
+; CHECK: rsh64 r1, 32
   %4 = sub i32 0, %1
   %5 = and i32 %4, 31
   %6 = lshr i32 %0, %5
-; CHECK: r0 <<= 32
-; CHECK: r0 >>= 32
+; CHECK: lsh64 r0, 32
+; CHECK: rsh64 r0, 32
   %7 = or i32 %6, %3
   ret i32 %7
 }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_5.ll b/llvm/test/CodeGen/SBF/remove_truncate_5.ll
index d9160bd3b44a6..b5d162b962a55 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_5.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_5.ll
@@ -24,10 +24,10 @@ define dso_local void @test() local_unnamed_addr #0 {
   %2 = bitcast %struct.test_t* %1 to i8*
   call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %2) #3
   call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 4 %2, i8* align 4 bitcast (%struct.test_t* @test.t to i8*), i64 16, i1 false)
-; CHECK: r1 = 0
-; CHECK: *(u64 *)(r10 - 8) = r1
-; CHECK: r1 = 5
-; CHECK: *(u64 *)(r10 - 16) = r1
+; CHECK: mov64 r1, 0
+; CHECK: stxdw [r10 - 8], r1
+; CHECK: mov64 r1, 5
+; CHECK: stxdw [r10 - 16], r1
   call void @foo(i8* nonnull %2) #3
 ; CHECK: call foo
   call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %2) #3
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_6.ll b/llvm/test/CodeGen/SBF/remove_truncate_6.ll
index 3b984edc1b50d..0bbcd936d5eaf 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_6.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_6.ll
@@ -42,8 +42,8 @@ for.body:                                         ; preds = %for.body, %for.body
   %e.09 = phi i16 [ %0, %for.body.preheader ], [ %neg, %for.body ]
   %conv = zext i16 %e.09 to i64
   %arrayidx = getelementptr inbounds i64, i64* %b, i64 %indvars.iv
-; CHECK: r{{[0-9]+}} &= 65535
-; CHECK-32: r{{[0-9]+}} &= 65535
+; CHECK: and64 r{{[0-9]+}}, 65535
+; CHECK-32: and64 r{{[0-9]+}}, 65535
   store i64 %conv, i64* %arrayidx, align 8
   %neg = xor i16 %e.09, -1
   %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
@@ -70,8 +70,8 @@ for.body:                                         ; preds = %for.body, %for.body
   %e.09 = phi i16 [ %0, %for.body.preheader ], [ %neg, %for.body ]
   %conv = zext i16 %e.09 to i32
   %arrayidx = getelementptr inbounds i32, i32* %b, i64 %indvars.iv
-; CHECK: r{{[0-9]+}} &= 65535
-; CHECK-32: w{{[0-9]+}} &= 65535
+; CHECK: and64 r{{[0-9]+}}, 65535
+; CHECK-32: and32 w{{[0-9]+}}, 65535
   store i32 %conv, i32* %arrayidx, align 4
   %neg = xor i16 %e.09, -1
   %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_7.ll b/llvm/test/CodeGen/SBF/remove_truncate_7.ll
index 1a451d75ab833..a0df2f86d1f1e 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_7.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_7.ll
@@ -49,7 +49,7 @@ if.end:
   ret i8* %p.0
 }
 
-; CHECK:       w0 = *(u32 *)(r2 + 0)
-; CHECK:       w0 = *(u32 *)(r2 + 4)
-; CHECK-NOT:   r[[#]] = w[[#]]
+; CHECK:       ldxw w0, [r2 + 0]
+; CHECK:       ldxw w0, [r2 + 4]
+; CHECK-NOT:   mov64 r[[#]], w[[#]]
 ; CHECK:       exit
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_8.ll b/llvm/test/CodeGen/SBF/remove_truncate_8.ll
index 19558b719b5a9..3b7355fc1321c 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_8.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_8.ll
@@ -27,8 +27,8 @@ entry:
   %cmp = icmp ult i32 %0, %1
   %cmp2 = icmp slt i32 %0, 3
   %or.cond = and i1 %cmp2, %cmp
-; CHECK: r{{[0-9]+}} <<= 32
-; CHECK: r{{[0-9]+}} s>>= 32
+; CHECK: lsh64 r{{[0-9]+}}, 32
+; CHECK: arsh64 r{{[0-9]+}}, 32
   br i1 %or.cond, label %if.then3, label %if.end5
 
 if.then3:                                         ; preds = %entry
diff --git a/llvm/test/CodeGen/SBF/rodata_1.ll b/llvm/test/CodeGen/SBF/rodata_1.ll
index af93306d2acec..a2729cf32ff1f 100644
--- a/llvm/test/CodeGen/SBF/rodata_1.ll
+++ b/llvm/test/CodeGen/SBF/rodata_1.ll
@@ -34,16 +34,16 @@ define i32 @test() local_unnamed_addr #0 {
 entry:
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* getelementptr inbounds (%struct.test_t1, %struct.test_t1* @g1, i64 0, i32 0), i8* getelementptr inbounds (%struct.test_t1, %struct.test_t1* @test.t1, i64 0, i32 0), i64 3, i1 false)
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 bitcast (%struct.test_t2* @g2 to i8*), i8* align 4 bitcast (%struct.test_t2* @test.t2 to i8*), i64 20, i1 false)
-; CHECK: r1 = g1 ll
-; CHECK: r2 = 1
-; CHECK: *(u8 *)(r1 + 2) = r2
-; CHECK: r3 = 0
-; CHECK: *(u16 *)(r1 + 0) = r3
-
-; CHECK: r1 = g2 ll
-; CHECK: *(u64 *)(r1 + 0) = r3
-; CHECK: *(u64 *)(r1 + 8) = r2
-; CHECK: *(u32 *)(r1 + 16) = r3
+; CHECK: lddw r1, g1
+; CHECK: mov64 r2, 1
+; CHECK: stxb [r1 + 2], r2
+; CHECK: mov64 r3, 0
+; CHECK: stxh [r1 + 0], r3
+
+; CHECK: lddw r1, g2
+; CHECK: stxdw [r1 + 0], r3
+; CHECK: stxdw [r1 + 8], r2
+; CHECK: stxw [r1 + 16], r3
 
     ret i32 0
 }
diff --git a/llvm/test/CodeGen/SBF/rodata_2.ll b/llvm/test/CodeGen/SBF/rodata_2.ll
index 3be522ac100a3..03518084cc4d0 100644
--- a/llvm/test/CodeGen/SBF/rodata_2.ll
+++ b/llvm/test/CodeGen/SBF/rodata_2.ll
@@ -31,15 +31,15 @@ define i32 @test() local_unnamed_addr #0 {
 
 entry:
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 getelementptr inbounds (%struct.test_t2, %struct.test_t2* @g, i64 0, i32 0), i8* align 4 getelementptr inbounds (%struct.test_t2, %struct.test_t2* @test.t2, i64 0, i32 0), i64 32, i1 false)
-; CHECK: r1 = g ll
-; CHECK: r2 = 3
-; CHECK: *(u64 *)(r1 + 24) = r2
-; CHECK: r2 = 8589934593 ll   
-; CHECK: *(u64 *)(r1 + 16) = r2
-; CHECK: r2 = 0
-; CHECK: *(u64 *)(r1 + 8) = r2
-; CHECK: *(u64 *)(r1 + 0) = r2
-; CHECK: r0 = 0
+; CHECK: lddw r1, g
+; CHECK: mov64 r2, 3
+; CHECK: stxdw [r1 + 24], r2
+; CHECK: lddw r2, 8589934593
+; CHECK: stxdw [r1 + 16], r2
+; CHECK: mov64 r2, 0
+; CHECK: stxdw [r1 + 8], r2
+; CHECK: stxdw [r1 + 0], r2
+; CHECK: mov64 r0, 0
 
       ret i32 0
 }
diff --git a/llvm/test/CodeGen/SBF/rodata_3.ll b/llvm/test/CodeGen/SBF/rodata_3.ll
index 578bb5eea7835..7b62c1399ed60 100644
--- a/llvm/test/CodeGen/SBF/rodata_3.ll
+++ b/llvm/test/CodeGen/SBF/rodata_3.ll
@@ -25,11 +25,11 @@
 define i32 @test() local_unnamed_addr #0 {
 entry:
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 getelementptr inbounds (%struct.test_t1, %struct.test_t1* @g, i64 0, i32 0), i8* align 4 getelementptr inbounds (%struct.test_t1, %struct.test_t1* @test.t1, i64 0, i32 0), i64 16, i1 false)
-; CHECK-EL: r1 = g ll
-; CHECK-EL: r2 = 0
-; CHECK-EL: *(u64 *)(r1 + 8) = r2
-; CHECK-EL: r2 = 1
-; CHECK-EL: *(u64 *)(r1 + 0) = r2
+; CHECK-EL: lddw r1, g
+; CHECK-EL: mov64 r2, 0
+; CHECK-EL: stxdw [r1 + 8], r2
+; CHECK-EL: mov64 r2, 1
+; CHECK-EL: stxdw [r1 + 0], r2
     ret i32 0
 }
 ; CHECK-EL:  .section .rodata.cst16,"aM",@progbits,16
diff --git a/llvm/test/CodeGen/SBF/rodata_4.ll b/llvm/test/CodeGen/SBF/rodata_4.ll
index e438dcb8f56d4..1f3a28ab21ae0 100644
--- a/llvm/test/CodeGen/SBF/rodata_4.ll
+++ b/llvm/test/CodeGen/SBF/rodata_4.ll
@@ -27,11 +27,11 @@ define i32 @test() local_unnamed_addr #0 {
 ; CHECK-LABEL: test:
 entry:
   tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 2 bitcast (%struct.test_t1* @g to i8*), i8* align 2 bitcast (%struct.test_t1* getelementptr inbounds ([4 x %struct.test_t1], [4 x %struct.test_t1]* @test.t1, i64 0, i64 1) to i8*), i64 6, i1 false)
-; CHECK: r1 = g ll
-; CHECK: r2 = 6
-; CHECK: *(u16 *)(r1 + 4) = r2
-; CHECK: r2 = 39321660
-; CHECK: *(u32 *)(r1 + 0) = r2
+; CHECK: lddw r1, g
+; CHECK: mov64 r2, 6
+; CHECK: stxh [r1 + 4], r2
+; CHECK: mov64 r2, 39321660
+; CHECK: stxw [r1 + 0], r2
   ret i32 0
 }
 ; CHECK:  .section  .rodata,"a",@progbits
diff --git a/llvm/test/CodeGen/SBF/rodata_5.ll b/llvm/test/CodeGen/SBF/rodata_5.ll
index 8a88dc077c0bc..5b590083acf15 100644
--- a/llvm/test/CodeGen/SBF/rodata_5.ll
+++ b/llvm/test/CodeGen/SBF/rodata_5.ll
@@ -32,10 +32,10 @@ entry:
   call void @llvm.lifetime.end.p0i8(i64 3, i8* nonnull %v1.sub)
   ret i32 0
 }
-; CHECK-NOT:    w{{[0-9]+}} = *(u16 *)
-; CHECK-NOT:    w{{[0-9]+}} = *(u8 *)
-; CHECK:        *(u8 *)(r10 - 2) = w{{[0-9]+}}
-; CHECK:        *(u16 *)(r10 - 4) = w{{[0-9]+}}
+; CHECK-NOT:    ldxh w{{[0-9]+}},
+; CHECK-NOT:    ldxb w{{[0-9]+}},
+; CHECK:        stxb [r10 - 2], w{{[0-9]+}}
+; CHECK:        stxh [r10 - 4], w{{[0-9]+}}
 
 ; Function Attrs: argmemonly nounwind willreturn
 declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture)
diff --git a/llvm/test/CodeGen/SBF/rodata_6.ll b/llvm/test/CodeGen/SBF/rodata_6.ll
index fa4d690f730a6..2dd6cd3acd709 100644
--- a/llvm/test/CodeGen/SBF/rodata_6.ll
+++ b/llvm/test/CodeGen/SBF/rodata_6.ll
@@ -18,8 +18,8 @@ define dso_local i32 @foo() local_unnamed_addr {
 entry:
   %0 = load i32, i32* getelementptr inbounds (%struct.t1, %struct.t1* @data, i64 0, i32 0), align 4
   %add = add nsw i32 %0, 20
-; CHECK:   [[REG1:r[0-9]+]] = data ll
-; CHECK:   r0 = *(u32 *)([[REG1]] + 0)
-; CHECK:   r0 += 20
+; CHECK:   lddw [[REG1:r[0-9]+]], data
+; CHECK:   ldxw r0, [[[REG1]] + 0]
+; CHECK:   add64 r0, 20
   ret i32 %add
 }
diff --git a/llvm/test/CodeGen/SBF/rodata_7.ll b/llvm/test/CodeGen/SBF/rodata_7.ll
index 9945f397b3508..1dbc0c26778f5 100644
--- a/llvm/test/CodeGen/SBF/rodata_7.ll
+++ b/llvm/test/CodeGen/SBF/rodata_7.ll
@@ -18,8 +18,8 @@ define dso_local i32 @foo() local_unnamed_addr {
 entry:
   %0 = load volatile i32, i32* getelementptr inbounds (%struct.t1, %struct.t1* @data, i64 0, i32 0), align 4
   %add = add nsw i32 %0, 20
-; CHECK:   [[REG1:r[0-9]+]] = data ll
-; CHECK:   r0 = *(u32 *)([[REG1]] + 0)
-; CHECK:   r0 += 20
+; CHECK:   lddw [[REG1:r[0-9]+]], data
+; CHECK:   ldxw r0, [[[REG1]] + 0]
+; CHECK:   add64 r0, 20
   ret i32 %add
 }
diff --git a/llvm/test/CodeGen/SBF/sanity.ll b/llvm/test/CodeGen/SBF/sanity.ll
index e1f9449598b07..22f2ebf076b13 100644
--- a/llvm/test/CodeGen/SBF/sanity.ll
+++ b/llvm/test/CodeGen/SBF/sanity.ll
@@ -7,7 +7,7 @@ define i32 @foo_int(i32 %a, i32 %b) #0 {
   %1 = add nsw i32 %b, %a
   ret i32 %1
 ; CHECK-LABEL: foo_int:
-; CHECK: r0 += r1
+; CHECK: add64 r0, r1
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -15,9 +15,9 @@ define signext i8 @foo_char(i8 signext %a, i8 signext %b) #0 {
   %1 = add i8 %b, %a
   ret i8 %1
 ; CHECK-LABEL: foo_char:
-; CHECK: r0 += r1
-; CHECK: r0 <<= 56
-; CHECK: r0 s>>= 56
+; CHECK: add64 r0, r1
+; CHECK: lsh64 r0, 56
+; CHECK: arsh64 r0, 56
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -26,9 +26,9 @@ define i64 @foo_ll(i64 %a, i64 %b, i64 %c) #0 {
   %2 = sub i64 %1, %c
   ret i64 %2
 ; CHECK-LABEL: foo_ll:
-; CHECK: r0 = r2
-; CHECK: r0 += r1
-; CHECK: r0 -= r3
+; CHECK: mov64 r0, r2
+; CHECK: add64 r0, r1
+; CHECK: sub64 r0, r3
 }
 
 ; Function Attrs: nounwind uwtable
@@ -37,9 +37,9 @@ define void @foo_call2(i32 %a, i32 %b) #1 {
   tail call void @foo_2arg(i8 signext %1, i32 %a) #3
   ret void
 ; CHECK-LABEL: foo_call2:
-; CHECK: r2 <<= 56
-; CHECK: r2 s>>= 56
-; CHECK: r1 = r2
+; CHECK: lsh64 r2, 56
+; CHECK: arsh64 r2, 56
+; CHECK: mov64 r1, r2
 }
 
 declare void @foo_2arg(i8 signext, i32) #2
@@ -60,7 +60,7 @@ define signext i8 @foo_cmp(i8 signext %a, i8 signext %b) #0 {
   %a.b = select i1 %1, i8 %a, i8 %b
   ret i8 %a.b
 ; CHECK-LABEL: foo_cmp:
-; CHECK: if r2 s> r0
+; CHECK: jsgt r2, r0
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -82,7 +82,7 @@ define i32 @foo_muldiv(i8 signext %a, i16 signext %b, i32 %c, i64 %d) #0 {
   %.0 = phi i32 [ %4, %2 ], [ %7, %5 ]
   ret i32 %.0
 ; CHECK-LABEL: foo_muldiv:
-; CHECK: r0 *= r3
+; CHECK: mul64 r0, r3
 }
 
 ; Function Attrs: nounwind uwtable
@@ -90,11 +90,11 @@ define i32 @foo_optimized() #1 {
   %1 = tail call i32 @manyarg(i32 1, i32 2, i32 3, i32 4, i32 5) #3
   ret i32 %1
 ; CHECK-LABEL: foo_optimized:
-; CHECK: r1 = 1
-; CHECK: r2 = 2
-; CHECK: r3 = 3
-; CHECK: r4 = 4
-; CHECK: r5 = 5
+; CHECK: mov64 r1, 1
+; CHECK: mov64 r2, 2
+; CHECK: mov64 r3, 3
+; CHECK: mov64 r4, 4
+; CHECK: mov64 r5, 5
 }
 
 declare i32 @manyarg(i32, i32, i32, i32, i32) #2
@@ -105,7 +105,7 @@ define void @foo_printf() #1 {
   %1 = getelementptr inbounds [9 x i8], [9 x i8]* %fmt, i64 0, i64 0
   call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* getelementptr inbounds ([9 x i8], [9 x i8]* @foo_printf.fmt, i64 0, i64 0), i64 9, i1 false)
 ; CHECK-LABEL: foo_printf:
-; CHECK: r1 = 729618802566522216 ll
+; CHECK: lddw r1, 729618802566522216
   %2 = call i32 (i8*, ...) @printf(i8* %1) #3
   ret void
 }
diff --git a/llvm/test/CodeGen/SBF/sdiv.ll b/llvm/test/CodeGen/SBF/sdiv.ll
index 120fcada9bfa7..e00f751f8fc66 100644
--- a/llvm/test/CodeGen/SBF/sdiv.ll
+++ b/llvm/test/CodeGen/SBF/sdiv.ll
@@ -5,6 +5,6 @@
 define i32 @test(i32 %len) #0 {
   %1 = sdiv i32 %len, 15
 ; CHECK-SBF: call __divdi3
-; CHECK-SBFV2: r0 s/= 15
+; CHECK-SBFV2: sdiv64 r0, 15
   ret i32 %1
 }
diff --git a/llvm/test/CodeGen/SBF/select_ri.ll b/llvm/test/CodeGen/SBF/select_ri.ll
index cd23574c1bd8a..b21274085ce97 100644
--- a/llvm/test/CodeGen/SBF/select_ri.ll
+++ b/llvm/test/CodeGen/SBF/select_ri.ll
@@ -18,9 +18,9 @@ entry:
   %tobool = icmp eq i32 %0, 0
   %1 = load i32, i32* @c, align 4
   %. = select i1 %tobool, i32 0, i32 %1
-; CHECK:  r1 = b
-; CHECK:  r1 = *(u32 *)(r1 + 0)
-; CHECK:  if r1 == 0 goto
+; CHECK:  lddw r1, b
+; CHECK:  ldxw r1, [r1 + 0]
+; CHECK:  jeq r1, 0,
   ret i32 %.
 }
 
@@ -32,7 +32,7 @@ define i32 @foo(i64*) local_unnamed_addr #0 {
   %3 = load i64, i64* %0, align 8
   %4 = add i64 %3, %2
   %5 = icmp ne i64 %4, 8589934591
-; CHECK:  r{{[0-9]+}} = 8589934591 ll
+; CHECK: lddw r{{[0-9]+}}, 8589934591
   %6 = sext i1 %5 to i32
   ret i32 %6
 }
@@ -57,7 +57,7 @@ define i32 @test2() local_unnamed_addr #0 {
 entry:
   %0 = load i32, i32* @m, align 4
   %cmp = icmp slt i32 %0, 6
-; CHECK:  if r{{[0-9]+}} s{{<|>}} 6 goto
+; CHECK:  {{jslt|jsgt}} r{{[0-9]+}}, 6,
   %1 = load i32, i32* @n, align 4
   %spec.select = select i1 %cmp, i32 %1, i32 %0
   ret i32 %spec.select
diff --git a/llvm/test/CodeGen/SBF/selectiondag-bug.ll b/llvm/test/CodeGen/SBF/selectiondag-bug.ll
index c1d1a7c791cfe..ae7c427eb8b30 100644
--- a/llvm/test/CodeGen/SBF/selectiondag-bug.ll
+++ b/llvm/test/CodeGen/SBF/selectiondag-bug.ll
@@ -56,10 +56,10 @@ entry:
   call void @llvm.lifetime.start.p0i8(i64 -1, i8* nonnull %19)
 
 ; CHECK:        call 8
-; CHECK-NOT:    r{{[0-9]+}} = 0
-; CHECK:        [[REG3:r[0-9]+]] = *(u64 *)(r10 - 24)
-; CHECK:        [[REG1:r[0-9]+]] = 0
-; CHECK:        *(u64 *)(r10 - 24) = [[REG1]]
+; CHECK-NOT:    mov64 r{{[0-9]+}}, 0
+; CHECK:        ldxdw [[REG3:r[0-9]+]], [r10 - 24]
+; CHECK:        mov64 [[REG1:r[0-9]+]], 0
+; CHECK:        stxdw [r10 - 24], [[REG1]]
 
   %probe_read5 = call i64 inttoptr (i64 9 to i64 (i64*, i32, i64)*)(i64* nonnull %"struct kernfs_node.parent", i32 8, i64 %18)
   %21 = load i64, i64* %"struct kernfs_node.parent", align 8
diff --git a/llvm/test/CodeGen/SBF/setcc.ll b/llvm/test/CodeGen/SBF/setcc.ll
index dce3a69f9c498..b9b62f05a2cb5 100644
--- a/llvm/test/CodeGen/SBF/setcc.ll
+++ b/llvm/test/CodeGen/SBF/setcc.ll
@@ -8,8 +8,8 @@ define i16 @sccweqand(i16 %a, i16 %b) nounwind {
   ret i16 %t3
 }
 ; CHECK-LABEL: sccweqand:
-; CHECK-V1: if r1 == 0
-; CHECK-V2: if r1 == 0
+; CHECK-V1: jeq r1, 0
+; CHECK-V2: jeq r1, 0
 
 define i16 @sccwneand(i16 %a, i16 %b) nounwind {
   %t1 = and i16 %a, %b
@@ -18,8 +18,8 @@ define i16 @sccwneand(i16 %a, i16 %b) nounwind {
   ret i16 %t3
 }
 ; CHECK-LABEL: sccwneand:
-; CHECK-V1: if r1 != 0
-; CHECK-V2: if r1 != 0
+; CHECK-V1: jne r1, 0
+; CHECK-V2: jne r1, 0
 
 define i16 @sccwne(i16 %a, i16 %b) nounwind {
   %t1 = icmp ne i16 %a, %b
@@ -27,8 +27,8 @@ define i16 @sccwne(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwne:
-; CHECK-V1: if r1 != r2
-; CHECK-V2: if r1 != r2
+; CHECK-V1: jne r1, r2
+; CHECK-V2: jne r1, r2
 
 define i16 @sccweq(i16 %a, i16 %b) nounwind {
   %t1 = icmp eq i16 %a, %b
@@ -36,8 +36,8 @@ define i16 @sccweq(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccweq:
-; CHECK-V1: if r1 == r2
-; CHECK-V2: if r1 == r2
+; CHECK-V1: jeq r1, r2
+; CHECK-V2: jeq r1, r2
 
 define i16 @sccwugt(i16 %a, i16 %b) nounwind {
   %t1 = icmp ugt i16 %a, %b
@@ -45,8 +45,8 @@ define i16 @sccwugt(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwugt:
-; CHECK-V1: if r1 > r2
-; CHECK-V2: if r1 > r2
+; CHECK-V1: jgt r1, r2
+; CHECK-V2: jgt r1, r2
 
 define i16 @sccwuge(i16 %a, i16 %b) nounwind {
   %t1 = icmp uge i16 %a, %b
@@ -54,8 +54,8 @@ define i16 @sccwuge(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwuge:
-; CHECK-V1: if r1 >= r2
-; CHECK-V2: if r1 >= r2
+; CHECK-V1: jge r1, r2
+; CHECK-V2: jge r1, r2
 
 define i16 @sccwult(i16 %a, i16 %b) nounwind {
   %t1 = icmp ult i16 %a, %b
@@ -63,8 +63,8 @@ define i16 @sccwult(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwult:
-; CHECK-V1: if r2 > r1
-; CHECK-V2: if r1 < r2
+; CHECK-V1: jgt r2, r1
+; CHECK-V2: jlt r1, r2
 
 define i16 @sccwule(i16 %a, i16 %b) nounwind {
   %t1 = icmp ule i16 %a, %b
@@ -72,8 +72,8 @@ define i16 @sccwule(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwule:
-; CHECK-V1: if r2 >= r1
-; CHECK-V2: if r1 <= r2
+; CHECK-V1: jge r2, r1
+; CHECK-V2: jle r1, r2
 
 define i16 @sccwsgt(i16 %a, i16 %b) nounwind {
   %t1 = icmp sgt i16 %a, %b
@@ -81,8 +81,8 @@ define i16 @sccwsgt(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwsgt:
-; CHECK-V1: if r1 s> r2
-; CHECK-V2: if r1 s> r2
+; CHECK-V1: jsgt r1, r2
+; CHECK-V2: jsgt r1, r2
 
 define i16 @sccwsge(i16 %a, i16 %b) nounwind {
   %t1 = icmp sge i16 %a, %b
@@ -90,8 +90,8 @@ define i16 @sccwsge(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwsge:
-; CHECK-V1: if r1 s>= r2
-; CHECK-V2: if r1 s>= r2
+; CHECK-V1: jsge r1, r2
+; CHECK-V2: jsge r1, r2
 
 define i16 @sccwslt(i16 %a, i16 %b) nounwind {
   %t1 = icmp slt i16 %a, %b
@@ -99,8 +99,8 @@ define i16 @sccwslt(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwslt:
-; CHECK-V1: if r2 s> r1
-; CHECK-V2: if r1 s< r2
+; CHECK-V1: jsgt r2, r1
+; CHECK-V2: jslt r1, r2
 
 define i16 @sccwsle(i16 %a, i16 %b) nounwind {
   %t1 = icmp sle i16 %a, %b
@@ -108,5 +108,5 @@ define i16 @sccwsle(i16 %a, i16 %b) nounwind {
   ret i16 %t2
 }
 ; CHECK-LABEL:sccwsle:
-; CHECK-V1: if r2 s>= r1
-; CHECK-V2: if r1 s<= r2
+; CHECK-V1: jsge r2, r1
+; CHECK-V2: jsle r1, r2
diff --git a/llvm/test/CodeGen/SBF/shifts.ll b/llvm/test/CodeGen/SBF/shifts.ll
index e31991dfedb9b..87c4f2d966b00 100644
--- a/llvm/test/CodeGen/SBF/shifts.ll
+++ b/llvm/test/CodeGen/SBF/shifts.ll
@@ -3,7 +3,7 @@
 define zeroext i8 @lshr8(i8 zeroext %a, i8 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: lshr8:
-; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: rsh64 r0, r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = lshr i8 %a, %cnt
   ret i8 %shr
 }
@@ -11,7 +11,7 @@ entry:
 define signext i8 @ashr8(i8 signext %a, i8 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: ashr8:
-; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: arsh64 r0, r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = ashr i8 %a, %cnt
   ret i8 %shr
 }
@@ -19,7 +19,7 @@ entry:
 define zeroext i8 @shl8(i8 zeroext %a, i8 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK: shl8
-; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: lsh64 r0, r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shl = shl i8 %a, %cnt
   ret i8 %shl
 }
@@ -27,7 +27,7 @@ entry:
 define zeroext i16 @lshr16(i16 zeroext %a, i16 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: lshr16:
-; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00
+; CHECK: rsh64 r0, r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00
   %shr = lshr i16 %a, %cnt
   ret i16 %shr
 }
@@ -35,7 +35,7 @@ entry:
 define signext i16 @ashr16(i16 signext %a, i16 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: ashr16:
-; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: arsh64 r0, r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = ashr i16 %a, %cnt
   ret i16 %shr
 }
@@ -43,7 +43,7 @@ entry:
 define zeroext i16 @shl16(i16 zeroext %a, i16 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: shl16:
-; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: lsh64 r0, r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shl = shl i16 %a, %cnt
   ret i16 %shl
 }
@@ -51,7 +51,7 @@ entry:
 define zeroext i32 @lshr32(i32 zeroext %a, i32 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: lshr32:
-; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: rsh64 r0, r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
 ; CHECK: exit # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = lshr i32 %a, %cnt
   ret i32 %shr
@@ -60,7 +60,7 @@ entry:
 define signext i32 @ashr32(i32 signext %a, i32 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: ashr32:
-; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: arsh64 r0, r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = ashr i32 %a, %cnt
   ret i32 %shr
 }
@@ -68,7 +68,7 @@ entry:
 define zeroext i32 @shl32(i32 zeroext %a, i32 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: shl32:
-; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: lsh64 r0, r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shl = shl i32 %a, %cnt
   ret i32 %shl
 }
@@ -76,7 +76,7 @@ entry:
 define zeroext i64 @lshr64(i64 zeroext %a, i64 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: lshr64:
-; CHECK: r0 >>= r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: rsh64 r0, r2 # encoding: [0x7f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = lshr i64 %a, %cnt
   ret i64 %shr
 }
@@ -84,7 +84,7 @@ entry:
 define signext i64 @ashr64(i64 signext %a, i64 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: ashr64:
-; CHECK: r0 s>>= r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: arsh64 r0, r2 # encoding: [0xcf,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
   %shr = ashr i64 %a, %cnt
   ret i64 %shr
 }
@@ -92,8 +92,8 @@ entry:
 define zeroext i64 @shl64(i64 zeroext %a, i64 zeroext %cnt) nounwind readnone {
 entry:
 ; CHECK-LABEL: shl64:
-; CHECK: r0 = r1 # encoding: [0xbf,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
-; CHECK: r0 <<= r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: mov64 r0, r1 # encoding: [0xbf,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK: lsh64 r0, r2 # encoding: [0x6f,0x20,0x00,0x00,0x00,0x00,0x00,0x00]
 ; CHECK: exit # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
   %shl = shl i64 %a, %cnt
   ret i64 %shl
diff --git a/llvm/test/CodeGen/SBF/spill-alu32.ll b/llvm/test/CodeGen/SBF/spill-alu32.ll
index c9ef67944d79e..d8c6ebf83cb31 100644
--- a/llvm/test/CodeGen/SBF/spill-alu32.ll
+++ b/llvm/test/CodeGen/SBF/spill-alu32.ll
@@ -17,11 +17,11 @@ entry:
   tail call void @foo(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) #2
   tail call void asm sideeffect "", "~{r0},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{memory}"() #2
 
-; CHECK:        *(u32 *)(r10 - 8) = w5
-; CHECK:        *(u64 *)(r10 - 16) = r4
-; CHECK:        *(u32 *)(r10 - 24) = w3
-; CHECK:        *(u32 *)(r10 - 32) = w2
-; CHECK:        *(u32 *)(r10 - 40) = w1
+; CHECK:        stxw [r10 - 8], w5
+; CHECK:        stxdw [r10 - 16], r4
+; CHECK:        stxw [r10 - 24], w3
+; CHECK:        stxw [r10 - 32], w2
+; CHECK:        stxw [r10 - 40], w1
 ; CHECK:        call foo
 
   tail call void @foo(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) #2
diff --git a/llvm/test/CodeGen/SBF/struct_ret1.ll b/llvm/test/CodeGen/SBF/struct_ret1.ll
index fc919c41788ab..5a1a7c1f2f733 100644
--- a/llvm/test/CodeGen/SBF/struct_ret1.ll
+++ b/llvm/test/CodeGen/SBF/struct_ret1.ll
@@ -7,11 +7,11 @@
 ; Function Attrs: nounwind readonly uwtable
 define { i64, i32 } @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) #0 {
 ; CHECK-LABEL: bar:
-; CHECK: r2 = s ll
-; CHECK: r3 = *(u32 *)(r2 + 8)
-; CHECK: *(u32 *)(r1 + 8) = r3
-; CHECK: r2 = *(u64 *)(r2 + 0)
-; CHECK: *(u64 *)(r1 + 0) = r2
+; CHECK: lddw r2, s
+; CHECK: ldxw r3, [r2 + 8]
+; CHECK: stxw [r1 + 8], r3
+; CHECK: ldxdw r2, [r2 + 0]
+; CHECK: stxdw [r1 + 0], r2
 entry:
   %retval.sroa.0.0.copyload = load i64, i64* bitcast (%struct.S* @s to i64*), align 4
   %retval.sroa.2.0.copyload = load i32, i32* getelementptr inbounds (%struct.S, %struct.S* @s, i64 0, i32 2), align 4
diff --git a/llvm/test/CodeGen/SBF/struct_ret2.ll b/llvm/test/CodeGen/SBF/struct_ret2.ll
index 1793496b035f1..3c5efda2105a9 100644
--- a/llvm/test/CodeGen/SBF/struct_ret2.ll
+++ b/llvm/test/CodeGen/SBF/struct_ret2.ll
@@ -4,10 +4,10 @@
 define { i64, i32 } @foo(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK-LABEL: foo:
 ; CHECK: call bar
-; CHECK: r1 = *(u64 *)(r10 - 16)
-; CHECK: r2 = *(u32 *)(r10 - 8)
-; CHECK: *(u32 *)(r6 + 8) = r2
-; CHECK: *(u64 *)(r6 + 0) = r1
+; CHECK: ldxdw r1, [r10 - 16]
+; CHECK: ldxw r2, [r10 - 8]
+; CHECK: stxw [r6 + 8], r2
+; CHECK: stxdw [r6 + 0], r1
 entry:
   %call = tail call { i64, i32 } @bar(i32 %a, i32 %b, i32 %c, i32 1, i32 2) #3
   ret { i64, i32 } %call
diff --git a/llvm/test/CodeGen/SBF/undef.ll b/llvm/test/CodeGen/SBF/undef.ll
index e9a72cd685097..133a9456ea8bb 100644
--- a/llvm/test/CodeGen/SBF/undef.ll
+++ b/llvm/test/CodeGen/SBF/undef.ll
@@ -14,20 +14,20 @@
 ; Function Attrs: nounwind uwtable
 define i32 @ebpf_filter(%struct.__sk_buff* nocapture readnone %ebpf_packet) #0 section "socket1" {
 
-; CHECK: r1 = 2569
-; CHECK: *(u16 *)(r10 - 4) = r1
-; CHECK: r1 = 134678021
-; CHECK: *(u32 *)(r10 - 8) = r1
-
-; CHECK: r1 = 0
-; CHECK-DAG:  *(u64 *)(r10 - 2) = r1
-; CHECK-DAG:  *(u64 *)(r10 + 6) = r1
-; CHECK-DAG:  *(u64 *)(r10 + 14) = r1
-; CHECK-DAG:  *(u64 *)(r10 + 20) = r1
-
-; CHECK: r2 = r10
-; CHECK: r2 += -8
-; CHECK: r1 = routing
+; CHECK: mov64 r1, 2569
+; CHECK: stxh [r10 - 4], r1
+; CHECK: mov64 r1, 134678021
+; CHECK: stxw [r10 - 8], r1
+
+; CHECK: mov64 r1, 0
+; CHECK-DAG: stxdw [r10 - 2], r1
+; CHECK-DAG: stxdw [r10 + 6], r1
+; CHECK-DAG: stxdw [r10 + 14], r1
+; CHECK-DAG: stxdw [r10 + 20], r1
+
+; CHECK: mov64 r2, r10
+; CHECK: add64 r2, -8
+; CHECK: lddw r1, routing
 ; CHECK: call bpf_map_lookup_elem
 ; CHECK: exit
   %key = alloca %struct.routing_key_2, align 1
diff --git a/llvm/test/CodeGen/SBF/xadd_legal.ll b/llvm/test/CodeGen/SBF/xadd_legal.ll
index 15c080305d5f5..a1e01eedca2e6 100644
--- a/llvm/test/CodeGen/SBF/xadd_legal.ll
+++ b/llvm/test/CodeGen/SBF/xadd_legal.ll
@@ -17,13 +17,13 @@ define dso_local i32 @test(i32* nocapture %ptr, i64 %a) {
 entry:
   %conv = trunc i64 %a to i32
   %0 = atomicrmw add i32* %ptr, i32 %conv seq_cst
-; CHECK-64: r0 = *(u32 *)(r1 + 0)
-; CHECK-64: r0 += r2
-; CHECK-64: *(u32 *)(r1 + 0) = r0
+; CHECK-64: ldxw r0, [r1 + 0]
+; CHECK-64: add64 r0, r2
+; CHECK-64: stxw [r1 + 0], r0
 
-; CHECK-32: w0 = *(u32 *)(r1 + 0)
-; CHECK-32: w0 += w2
-; CHECK-32: *(u32 *)(r1 + 0) = w0
+; CHECK-32: ldxw w0, [r1 + 0]
+; CHECK-32: add32 w0, w2
+; CHECK-32: stxw [r1 + 0], w0
 
   %1 = load i32, i32* %ptr, align 4
   ret i32 %1
diff --git a/llvm/test/MC/Disassembler/SBF/lit.local.cfg b/llvm/test/MC/Disassembler/SBF/lit.local.cfg
new file mode 100644
index 0000000000000..edf638fc61af9
--- /dev/null
+++ b/llvm/test/MC/Disassembler/SBF/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'SBF' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
new file mode 100644
index 0000000000000..b70c389be29a8
--- /dev/null
+++ b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
@@ -0,0 +1,348 @@
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK-OLD
+
+# TODO: Test immediate field ranges and some hex immediates.
+
+# CHECK-NEW: add64 r0, r9
+# CHECK-OLD: r0 += r9
+0x0f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: add64 r3, r2
+# CHECK-OLD: r3 += r2
+0x0f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: add64 r3, 123 
+# CHECK-OLD: r3 += 123 
+0x07,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: add64 r5, -123 
+# CHECK-OLD: r5 += -123 
+0x07,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: add32 w6, w2
+# CHECK-OLD: w6 += w2
+0x0c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: add32 w5, -123 
+# CHECK-OLD: w5 += -123 
+0x04,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: sub64 r0, r9
+# CHECK-OLD: r0 -= r9
+0x1f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: sub64 r3, r2
+# CHECK-OLD: r3 -= r2
+0x1f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: sub64 r3, 123 
+# CHECK-OLD: r3 -= 123 
+0x17,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: sub64 r5, -123 
+# CHECK-OLD: r5 -= -123 
+0x17,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: sub32 w6, w2
+# CHECK-OLD: w6 -= w2
+0x1c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: sub32 w5, -123 
+# CHECK-OLD: w5 -= -123 
+0x14,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: mul64 r0, r9
+# CHECK-OLD: r0 *= r9
+0x2f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mul64 r3, r2
+# CHECK-OLD: r3 *= r2
+0x2f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mul64 r3, 123 
+# CHECK-OLD: r3 *= 123 
+0x27,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: mul64 r5, -123 
+# CHECK-OLD: r5 *= -123 
+0x27,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: mul32 w6, w2
+# CHECK-OLD: w6 *= w2
+0x2c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mul32 w5, -123 
+# CHECK-OLD: w5 *= -123 
+0x24,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: div64 r0, r9
+# CHECK-OLD: r0 /= r9
+0x3f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: div64 r3, r2
+# CHECK-OLD: r3 /= r2
+0x3f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: div64 r3, 123 
+# CHECK-OLD: r3 /= 123 
+0x37,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: div64 r5, -123 
+# CHECK-OLD: r5 /= -123 
+0x37,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: div32 w6, w2
+# CHECK-OLD: w6 /= w2
+0x3c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: div32 w5, -123 
+# CHECK-OLD: w5 /= -123 
+0x34,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: sdiv64 r0, r9
+# CHECK-OLD: r0 s/= r9
+0xef,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: sdiv64 r3, r2
+# CHECK-OLD: r3 s/= r2
+0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: sdiv64 r3, 123 
+# CHECK-OLD: r3 s/= 123 
+0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: sdiv64 r5, -123 
+# CHECK-OLD: r5 s/= -123 
+0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: sdiv32 w6, w2
+# CHECK-OLD: w6 s/= w2
+0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: sdiv32 w5, -123 
+# CHECK-OLD: w5 s/= -123 
+0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: or64 r0, r9
+# CHECK-OLD: r0 |= r9
+0x4f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: or64 r3, r2
+# CHECK-OLD: r3 |= r2
+0x4f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: or64 r3, 123 
+# CHECK-OLD: r3 |= 123 
+0x47,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: or64 r5, -123 
+# CHECK-OLD: r5 |= -123 
+0x47,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: or32 w6, w2
+# CHECK-OLD: w6 |= w2
+0x4c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: or32 w5, -123 
+# CHECK-OLD: w5 |= -123 
+0x44,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: and64 r0, r9
+# CHECK-OLD: r0 &= r9
+0x5f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: and64 r3, r2
+# CHECK-OLD: r3 &= r2
+0x5f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: and64 r3, 123 
+# CHECK-OLD: r3 &= 123 
+0x57,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: and64 r5, -123 
+# CHECK-OLD: r5 &= -123 
+0x57,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: and32 w6, w2
+# CHECK-OLD: w6 &= w2
+0x5c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: and32 w5, -123 
+# CHECK-OLD: w5 &= -123 
+0x54,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: xor64 r0, r9
+# CHECK-OLD: r0 ^= r9
+0xaf,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: xor64 r3, r2
+# CHECK-OLD: r3 ^= r2
+0xaf,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: xor64 r3, 123 
+# CHECK-OLD: r3 ^= 123 
+0xa7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: xor64 r5, -123 
+# CHECK-OLD: r5 ^= -123 
+0xa7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: xor32 w6, w2
+# CHECK-OLD: w6 ^= w2
+0xac,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: xor32 w5, -123 
+# CHECK-OLD: w5 ^= -123 
+0xa4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: lsh64 r0, r9
+# CHECK-OLD: r0 <<= r9
+0x6f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: lsh64 r3, r2
+# CHECK-OLD: r3 <<= r2
+0x6f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: lsh64 r3, 123 
+# CHECK-OLD: r3 <<= 123 
+0x67,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: lsh64 r5, -123 
+# CHECK-OLD: r5 <<= -123 
+0x67,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: lsh32 w6, w2
+# CHECK-OLD: w6 <<= w2
+0x6c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: lsh32 w5, -123 
+# CHECK-OLD: w5 <<= -123 
+0x64,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: rsh64 r0, r9
+# CHECK-OLD: r0 >>= r9
+0x7f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: rsh64 r3, r2
+# CHECK-OLD: r3 >>= r2
+0x7f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: rsh64 r3, 123 
+# CHECK-OLD: r3 >>= 123 
+0x77,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: rsh64 r5, -123 
+# CHECK-OLD: r5 >>= -123 
+0x77,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: rsh32 w6, w2
+# CHECK-OLD: w6 >>= w2
+0x7c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: rsh32 w5, -123 
+# CHECK-OLD: w5 >>= -123 
+0x74,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+
+# CHECK-NEW: arsh64 r0, r9
+# CHECK-OLD: r0 s>>= r9
+0xcf,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: arsh64 r3, r2
+# CHECK-OLD: r3 s>>= r2
+0xcf,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: arsh64 r3, 123 
+# CHECK-OLD: r3 s>>= 123 
+0xc7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: arsh64 r5, -123 
+# CHECK-OLD: r5 s>>= -123 
+0xc7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: arsh32 w6, w2
+# CHECK-OLD: w6 s>>= w2
+0xcc,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: arsh32 w5, -123 
+# CHECK-OLD: w5 s>>= -123 
+0xc4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: neg64 r9
+# CHECK-OLD: r9 = -r9
+0x87,0x09,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: neg32 w6
+# CHECK-OLD: w6 = -w6
+0x84,0x06,0x00,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK-NEW: mov64 r0, r9
+# CHECK-OLD: r0 = r9
+0xbf,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mov64 r3, r2
+# CHECK-OLD: r3 = r2
+0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mov64 r3, 123 
+# CHECK-OLD: r3 = 123 
+0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: mov64 r5, -123 
+# CHECK-OLD: r5 = -123 
+0xb7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: mov32 w6, w2
+# CHECK-OLD: w6 = w2
+0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mov32 w5, -123 
+# CHECK-OLD: w5 = -123 
+0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: le16 r3
+# CHECK-NEW: le32 r4
+# CHECK-NEW: le64 r5
+# CHECK-NEW: be16 r0
+# CHECK-NEW: be32 r1
+# CHECK-NEW: be64 r2
+# CHECK-OLD: r3 = le16 r3
+# CHECK-OLD: r4 = le32 r4
+# CHECK-OLD: r5 = le64 r5
+# CHECK-OLD: r0 = be16 r0
+# CHECK-OLD: r1 = be32 r1
+# CHECK-OLD: r2 = be64 r2
+0xd4,0x03,0x00,0x00,0x10,0x00,0x00,0x00
+0xd4,0x04,0x00,0x00,0x20,0x00,0x00,0x00
+0xd4,0x05,0x00,0x00,0x40,0x00,0x00,0x00
+0xdc,0x00,0x00,0x00,0x10,0x00,0x00,0x00
+0xdc,0x01,0x00,0x00,0x20,0x00,0x00,0x00
+0xdc,0x02,0x00,0x00,0x40,0x00,0x00,0x00
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
new file mode 100644
index 0000000000000..95ebdc74a8580
--- /dev/null
+++ b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
@@ -0,0 +1,210 @@
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK-OLD
+
+# TODO: Test immediate field ranges.
+
+# TODO: Note that the negative immediates on the unsigned comparisons 
+# below (e.g., jgt) should probably render as large unsigned values. For now,
+# this is the same behavior as the old BPF back-end.
+
+
+# CHECK-NEW: ja +8
+# CHECK-OLD: goto +8
+0x05,0x00,0x08,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: jeq r0, r9, +1
+# CHECK-NEW: jne r0, r9, +1
+# CHECK-NEW: jgt r0, r9, +1
+# CHECK-NEW: jge r0, r9, +1
+# CHECK-NEW: jlt r0, r9, +1
+# CHECK-NEW: jle r0, r9, +1
+# CHECK-NEW: jsgt r0, r9, +1
+# CHECK-NEW: jsge r0, r9, +1
+# CHECK-NEW: jslt r0, r9, +1
+# CHECK-NEW: jsle r0, r9, +1
+# CHECK-OLD: if r0 == r9 goto +1
+# CHECK-OLD: if r0 != r9 goto +1
+# CHECK-OLD: if r0 > r9 goto +1
+# CHECK-OLD: if r0 >= r9 goto +1
+# CHECK-OLD: if r0 < r9 goto +1
+# CHECK-OLD: if r0 <= r9 goto +1
+# CHECK-OLD: if r0 s> r9 goto +1
+# CHECK-OLD: if r0 s>= r9 goto +1
+# CHECK-OLD: if r0 s< r9 goto +1
+# CHECK-OLD: if r0 s<= r9 goto +1
+0x1d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0x5d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0x2d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0x3d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0xad,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0xbd,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0x6d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0x7d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0xcd,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+0xdd,0x90,0x01,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: jeq r3, r2, +1
+# CHECK-NEW: jne r3, r2, +1
+# CHECK-NEW: jgt r3, r2, +1
+# CHECK-NEW: jge r3, r2, +1
+# CHECK-NEW: jlt r3, r2, +1
+# CHECK-NEW: jle r3, r2, +1
+# CHECK-NEW: jsgt r3, r2, +1
+# CHECK-NEW: jsge r3, r2, +1
+# CHECK-NEW: jslt r3, r2, +1
+# CHECK-NEW: jsle r3, r2, +1
+# CHECK-OLD: if r3 == r2 goto +1
+# CHECK-OLD: if r3 != r2 goto +1
+# CHECK-OLD: if r3 > r2 goto +1
+# CHECK-OLD: if r3 >= r2 goto +1
+# CHECK-OLD: if r3 < r2 goto +1
+# CHECK-OLD: if r3 <= r2 goto +1
+# CHECK-OLD: if r3 s> r2 goto +1
+# CHECK-OLD: if r3 s>= r2 goto +1
+# CHECK-OLD: if r3 s< r2 goto +1
+# CHECK-OLD: if r3 s<= r2 goto +1
+0x1d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0x5d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0x2d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0x3d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0xad,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0xbd,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0x6d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0x7d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0xcd,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+0xdd,0x23,0x01,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: jeq r3, 123, +8
+# CHECK-NEW: jne r3, 123, +8
+# CHECK-NEW: jgt r3, 123, +8
+# CHECK-NEW: jge r3, 123, +8
+# CHECK-NEW: jlt r3, 123, +8
+# CHECK-NEW: jle r3, 123, +8
+# CHECK-NEW: jsgt r3, 123, +8
+# CHECK-NEW: jsge r3, 123, +8
+# CHECK-NEW: jslt r3, 123, +8
+# CHECK-NEW: jsle r3, 123, +8
+# CHECK-OLD: if r3 == 123 goto +8
+# CHECK-OLD: if r3 != 123 goto +8
+# CHECK-OLD: if r3 > 123 goto +8
+# CHECK-OLD: if r3 >= 123 goto +8
+# CHECK-OLD: if r3 < 123 goto +8
+# CHECK-OLD: if r3 <= 123 goto +8
+# CHECK-OLD: if r3 s> 123 goto +8
+# CHECK-OLD: if r3 s>= 123 goto +8
+# CHECK-OLD: if r3 s< 123 goto +8
+# CHECK-OLD: if r3 s<= 123 goto +8
+0x15,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0x55,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0x25,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0x35,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0xa5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0xb5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0x65,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0x75,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0xc5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+0xd5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: jeq r5, -123, +8 
+# CHECK-NEW: jne r5, -123, +8 
+# CHECK-NEW: jgt r5, -123, +8 
+# CHECK-NEW: jge r5, -123, +8 
+# CHECK-NEW: jlt r5, -123, +8 
+# CHECK-NEW: jle r5, -123, +8 
+# CHECK-NEW: jsgt r5, -123, +8 
+# CHECK-NEW: jsge r5, -123, +8 
+# CHECK-NEW: jslt r5, -123, +8 
+# CHECK-NEW: jsle r5, -123, +8 
+# CHECK-OLD: if r5 == -123 goto +8
+# CHECK-OLD: if r5 != -123 goto +8
+# CHECK-OLD: if r5 > -123 goto +8
+# CHECK-OLD: if r5 >= -123 goto +8
+# CHECK-OLD: if r5 < -123 goto +8
+# CHECK-OLD: if r5 <= -123 goto +8
+# CHECK-OLD: if r5 s> -123 goto +8
+# CHECK-OLD: if r5 s>= -123 goto +8
+# CHECK-OLD: if r5 s< -123 goto +8
+# CHECK-OLD: if r5 s<= -123 goto +8
+0x15,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x55,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x25,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x35,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xa5,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xb5,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x65,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x75,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xc5,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xd5,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+
+# CHECK-NEW: jeq w6, w2, +8
+# CHECK-NEW: jne w6, w2, +8
+# CHECK-NEW: jgt w6, w2, +8
+# CHECK-NEW: jge w6, w2, +8
+# CHECK-NEW: jlt w6, w2, +8
+# CHECK-NEW: jle w6, w2, +8
+# CHECK-NEW: jsgt w6, w2, +8
+# CHECK-NEW: jsge w6, w2, +8
+# CHECK-NEW: jslt w6, w2, +8
+# CHECK-NEW: jsle w6, w2, +8
+# CHECK-OLD: if w6 == w2 goto +8
+# CHECK-OLD: if w6 != w2 goto +8
+# CHECK-OLD: if w6 > w2 goto +8
+# CHECK-OLD: if w6 >= w2 goto +8
+# CHECK-OLD: if w6 < w2 goto +8
+# CHECK-OLD: if w6 <= w2 goto +8
+# CHECK-OLD: if w6 s> w2 goto +8
+# CHECK-OLD: if w6 s>= w2 goto +8
+# CHECK-OLD: if w6 s< w2 goto +8
+# CHECK-OLD: if w6 s<= w2 goto +8
+0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0x3e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0xae,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0xbe,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0x6e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0x7e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0xce,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+0xde,0x26,0x08,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: jeq w5, -123, +8
+# CHECK-NEW: jne w5, -123, +8
+# CHECK-NEW: jgt w5, -123, +8
+# CHECK-NEW: jge w5, -123, +8
+# CHECK-NEW: jlt w5, -123, +8
+# CHECK-NEW: jle w5, -123, +8
+# CHECK-NEW: jsgt w5, -123, +8
+# CHECK-NEW: jsge w5, -123, +8
+# CHECK-NEW: jslt w5, -123, +8
+# CHECK-NEW: jsle w5, -123, +8
+# CHECK-OLD: if w5 == -123 goto +8
+# CHECK-OLD: if w5 != -123 goto +8
+# CHECK-OLD: if w5 s> -123 goto +8
+# CHECK-OLD: if w5 s>= -123 goto +8
+# CHECK-OLD: if w5 s< -123 goto +8
+# CHECK-OLD: if w5 s<= -123 goto +8
+0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x36,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xa6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xb6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x66,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0x76,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xc6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+0xd6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
+
+
+# CHECK-NEW: call 8
+# CHECK-OLD: call 8
+0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00
+
+# CHECK-NEW: callx r4
+# CHECK-OLD: callx r4
+0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00
+
+# CHECK-NEW: exit
+# CHECK-OLD: exit
+0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
new file mode 100644
index 0000000000000..3257416ce0061
--- /dev/null
+++ b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
@@ -0,0 +1,198 @@
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK-OLD
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+alu32 \
+# RUN:                          | FileCheck %s --check-prefix=CHECK32-NEW
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+alu32 \
+# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK32-OLD
+
+# TODO: Test immediate field ranges and some hex immediates.
+
+# CHECK-NEW: lddw r7, 32768
+# CHECK-NEW: lddw r0, 9151314442816847872
+# CHECK-NEW: lddw r1, -1
+# CHECK-OLD: r7 = 32768 ll
+# CHECK-OLD: r0 = 9151314442816847872 ll
+# CHECK-OLD: r1 = -1 ll
+0x18,0x07,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f
+0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff
+
+
+
+# CHECK-NEW: ldxb r6, [r1 + 17]
+# CHECK-NEW: ldxb r1, [r10 - 3]
+# CHECK-NEW: ldxh r8, [r2 + 32]
+# CHECK-NEW: ldxw r4, [r3 + 64]
+# CHECK-NEW: ldxdw r0, [r4 + 128]
+# CHECK-OLD: r6 = *(u8 *)(r1 + 17)
+# CHECK-OLD: r1 = *(u8 *)(r10 - 3)
+# CHECK-OLD: r8 = *(u16 *)(r2 + 32)
+# CHECK-OLD: r4 = *(u32 *)(r3 + 64)
+# CHECK-OLD: r0 = *(u64 *)(r4 + 128)
+0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00
+0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00
+0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00
+0x61,0x34,0x40,0x00,0x00,0x00,0x00,0x00
+0x79,0x40,0x80,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK32-NEW: ldxb w6, [r1 + 17]
+# CHECK32-NEW: ldxb w1, [r10 - 3]
+# CHECK32-NEW: ldxh w8, [r2 + 32]
+# CHECK32-NEW: ldxw w4, [r3 + 64]
+# CHECK32-OLD: w6 = *(u8 *)(r1 + 17)
+# CHECK32-OLD: w1 = *(u8 *)(r10 - 3)
+# CHECK32-OLD: w8 = *(u16 *)(r2 + 32)
+# CHECK32-OLD: w4 = *(u32 *)(r3 + 64)
+0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00
+0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00
+0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00
+0x61,0x34,0x40,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK-NEW: stxb [r1 + 17], r6
+# CHECK-NEW: stxb [r10 - 3], r1
+# CHECK-NEW: stxh [r2 + 32], r8
+# CHECK-NEW: stxw [r3 + 64], r4
+# CHECK-NEW: stxdw [r4 + 128], r0
+# CHECK-OLD: *(u8 *)(r1 + 17) = r6
+# CHECK-OLD: *(u8 *)(r10 - 3) = r1
+# CHECK-OLD: *(u16 *)(r2 + 32) = r8
+# CHECK-OLD: *(u32 *)(r3 + 64) = r4
+# CHECK-OLD: *(u64 *)(r4 + 128) = r0
+0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00
+0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00
+0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00
+0x63,0x43,0x40,0x00,0x00,0x00,0x00,0x00
+0x7b,0x04,0x80,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK32-NEW: stxb [r1 + 17], w6
+# CHECK32-NEW: stxb [r10 - 3], w1
+# CHECK32-NEW: stxh [r2 + 32], w8
+# CHECK32-NEW: stxw [r3 + 64], w4
+# CHECK32-OLD: *(u8 *)(r1 + 17) = w6
+# CHECK32-OLD: *(u8 *)(r10 - 3) = w1
+# CHECK32-OLD: *(u16 *)(r2 + 32) = w8
+# CHECK32-OLD: *(u32 *)(r3 + 64) = w4
+0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00
+0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00
+0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00
+0x63,0x43,0x40,0x00,0x00,0x00,0x00,0x00
+
+
+# XADDW (NoALU32).
+# CHECK-NEW: stxxaddw [r8 + 4], r2 
+# CHECK-OLD: lock *(u32 *)(r8 + 4) += r2
+0xc3,0x28,0x04,0x00,0x00,0x00,0x00,0x00
+
+
+
+# XADDD, XANDD, XORD, XXORD (NoALU32).
+# CHECK-NEW: stxxadddw [r8 - 16], r0
+# CHECK-NEW: stxxanddw [r8 - 32], r1
+# CHECK-NEW: stxxordw [r8 - 64], r2
+# CHECK-NEW: stxxxordw [r8 - 128], r3
+# CHECK-OLD: lock *(u64 *)(r8 - 16) += r0
+# CHECK-OLD: lock *(u64 *)(r8 - 32) &= r1
+# CHECK-OLD: lock *(u64 *)(r8 - 64) |= r2
+# CHECK-OLD: lock *(u64 *)(r8 - 128) ^= r3
+0xdb,0x08,0xf0,0xff,0x00,0x00,0x00,0x00
+0xdb,0x18,0xe0,0xff,0x50,0x00,0x00,0x00
+0xdb,0x28,0xc0,0xff,0x40,0x00,0x00,0x00
+0xdb,0x38,0x80,0xff,0xa0,0x00,0x00,0x00
+
+
+
+# XADDW32, XANDW32, XORW32, XXORW32 (ALU32).
+# CHECK32-NEW: stxxaddw [r8 - 16], w4
+# CHECK32-NEW: stxxandw [r8 - 32], w5
+# CHECK32-NEW: stxxorw [r8 - 64], w6
+# CHECK32-NEW: stxxxorw [r8 - 128], w7
+# CHECK32-OLD: lock *(u32 *)(r8 - 16) += w4
+# CHECK32-OLD: lock *(u32 *)(r8 - 32) &= w5
+# CHECK32-OLD: lock *(u32 *)(r8 - 64) |= w6
+# CHECK32-OLD: lock *(u32 *)(r8 - 128) ^= w7
+0xc3,0x48,0xf0,0xff,0x00,0x00,0x00,0x00
+0xc3,0x58,0xe0,0xff,0x50,0x00,0x00,0x00
+0xc3,0x68,0xc0,0xff,0x40,0x00,0x00,0x00
+0xc3,0x78,0x80,0xff,0xa0,0x00,0x00,0x00
+
+
+
+# XFADDD, XFANDD, XFORD, XFXORD (NoALU32).
+# CHECK-NEW: stxxfadddw [r8 - 16], r0
+# CHECK-NEW: stxxfanddw [r8 - 32], r1
+# CHECK-NEW: stxxfordw [r8 - 64], r2
+# CHECK-NEW: stxxfxordw [r8 - 128], r3
+# CHECK-OLD: r0 = atomic_fetch_add((u64 *)(r8 - 16), r0)
+# CHECK-OLD: r1 = atomic_fetch_and((u64 *)(r8 - 32), r1)
+# CHECK-OLD: r2 = atomic_fetch_or((u64 *)(r8 - 64), r2)
+# CHECK-OLD: r3 = atomic_fetch_xor((u64 *)(r8 - 128), r3)
+0xdb,0x08,0xf0,0xff,0x01,0x00,0x00,0x00
+0xdb,0x18,0xe0,0xff,0x51,0x00,0x00,0x00
+0xdb,0x28,0xc0,0xff,0x41,0x00,0x00,0x00
+0xdb,0x38,0x80,0xff,0xa1,0x00,0x00,0x00
+
+
+
+# XFADDW32, XFANDW32, XFORW32, XFXORW32 (ALU32).
+# CHECK32-NEW: stxxfaddw [r8 - 16], w0
+# CHECK32-NEW: stxxfandw [r8 - 32], w1
+# CHECK32-NEW: stxxforw [r8 - 64], w2
+# CHECK32-NEW: stxxfxorw [r8 - 128], w3
+# CHECK32-OLD: w0 = atomic_fetch_add((u32 *)(r8 - 16), w0)
+# CHECK32-OLD: w1 = atomic_fetch_and((u32 *)(r8 - 32), w1)
+# CHECK32-OLD: w2 = atomic_fetch_or((u32 *)(r8 - 64), w2)
+# CHECK32-OLD: w3 = atomic_fetch_xor((u32 *)(r8 - 128), w3)
+0xc3,0x08,0xf0,0xff,0x01,0x00,0x00,0x00
+0xc3,0x18,0xe0,0xff,0x51,0x00,0x00,0x00
+0xc3,0x28,0xc0,0xff,0x41,0x00,0x00,0x00
+0xc3,0x38,0x80,0xff,0xa1,0x00,0x00,0x00
+
+
+
+# XCHGD, XCHGW32
+# CHECK-NEW: stxxchgdw [r8 - 16], r7
+# CHECK-OLD: r7 = xchg_64(r8 - 16, r7)
+# CHECK32-NEW: stxxchgw [r8 - 16], w0
+# CHECK32-OLD: w0 = xchg32_32(r8 - 16, w0)
+0xdb,0x78,0xf0,0xff,0xe1,0x00,0x00,0x00
+0xc3,0x08,0xf0,0xff,0xe1,0x00,0x00,0x00
+
+
+
+# CMPXCHGD, CMPXCHGW32
+# CHECK-NEW: stxcmpxchgdw [r8 - 16], r5
+# CHECK-OLD: r0 = cmpxchg_64(r8 - 16, r0, r5) 
+# CHECK32-NEW: stxcmpxchgw [r8 - 16], w5
+# CHECK32-OLD: w0 = cmpxchg32_32(r8 - 16, w0, w5)
+0xdb,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00
+0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00
+
+
+
+# Obsolete ldabs/ldind for completeness.
+# CHECK-NEW: ldabsb 64 
+# CHECK-NEW: ldabsh 128 
+# CHECK-NEW: ldabsw 0
+# CHECK-NEW: ldindb r5
+# CHECK-NEW: ldindh r9
+# CHECK-NEW: ldindw r7
+# CHECK-OLD: r0 = *(u8 *)skb[64]
+# CHECK-OLD: r0 = *(u16 *)skb[128]
+# CHECK-OLD: r0 = *(u32 *)skb[0]
+# CHECK-OLD: r0 = *(u8 *)skb[r5]
+# CHECK-OLD: r0 = *(u16 *)skb[r9]
+# CHECK-OLD: r0 = *(u32 *)skb[r7]
+0x30,0x00,0x00,0x00,0x40,0x00,0x00,0x00
+0x28,0x00,0x00,0x00,0x80,0x00,0x00,0x00
+0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00
+0x48,0x90,0x00,0x00,0x00,0x00,0x00,0x00
+0x40,0x70,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/elf-flags.s b/llvm/test/MC/SBF/elf-flags.s
new file mode 100644
index 0000000000000..75089706a18e5
--- /dev/null
+++ b/llvm/test/MC/SBF/elf-flags.s
@@ -0,0 +1,15 @@
+# RUN: llvm-mc -triple=sbf-solana-solana -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-NONE %s
+# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=sbfv2 -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV2 %s
+
+# CHECK-NONE:       Flags [ (0x0)
+# CHECK-NONE-NEXT:  ]
+
+# CHECK-SBFV2:       Flags [ (0x20)
+# CHECK-SBFV2-NEXT:    0x20
+# CHECK-SBFV2-NEXT:  ]
+
+mov64 r0, r0
diff --git a/llvm/test/MC/SBF/elf-header.s b/llvm/test/MC/SBF/elf-header.s
new file mode 100644
index 0000000000000..049ead44e6909
--- /dev/null
+++ b/llvm/test/MC/SBF/elf-header.s
@@ -0,0 +1,21 @@
+# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana | llvm-readobj -h - \
+# RUN:     | FileCheck %s
+
+# CHECK: Format: elf64-sbf
+# CHECK: Arch: sbf
+# CHECK: AddressSize: 64bit
+# CHECK: ElfHeader {
+# CHECK:   Ident {
+# CHECK:     Magic: (7F 45 4C 46)
+# CHECK:     Class: 64-bit (0x2)
+# CHECK:     DataEncoding: LittleEndian (0x1)
+# CHECK:     FileVersion: 1
+# CHECK:     OS/ABI: SystemV (0x0)
+# CHECK:     ABIVersion: 0
+# CHECK:   }
+# CHECK:   Type: Relocatable (0x1)
+# CHECK:   Machine: EM_SBF (0x107)
+# CHECK:   Version: 1
+# CHECK:   Flags [ (0x0)
+# CHECK:   ]
+# CHECK: }
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index 822c0ca125172..fb1b5d524eed6 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -1,6 +1,8 @@
 # RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
-# RUN: llvm-objdump -d -r %t | FileCheck %s
-# RUN: llvm-objdump --mattr=+alu32 -d -r %t | FileCheck %s
+# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
+# RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck %s
+
+.syntax_old
 
 // ======== BPF_ALU Class ========
   w1 = -w1    // BPF_NEG
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
index ff1f7a3748354..76924cfd0a299 100644
--- a/llvm/test/MC/SBF/insn-unit.s
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -1,6 +1,8 @@
 # RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
-# RUN: llvm-objdump -d -r %t | FileCheck --check-prefixes CHECK,CHECK-64 %s
-# RUN: llvm-objdump --mattr=+alu32 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-32 %s
+# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-64 %s
+# RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-32 %s
+
+.syntax_old
 
 // ======== BPF_LD Class ========
 // Some extra whitespaces are deliberately added to test the parser.
diff --git a/llvm/test/MC/SBF/load-store-32.s b/llvm/test/MC/SBF/load-store-32.s
index 55460fd11f594..e5ac929965929 100644
--- a/llvm/test/MC/SBF/load-store-32.s
+++ b/llvm/test/MC/SBF/load-store-32.s
@@ -1,6 +1,8 @@
 # RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
-# RUN: llvm-objdump --mattr=+alu32 -d -r %t | FileCheck --check-prefix=CHECK-32 %s
-# RUN: llvm-objdump -d -r %t | FileCheck %s
+# RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck --check-prefix=CHECK-32 %s
+# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
+
+.syntax_old
 
 // ======== BPF_LDX Class ========
   w5 = *(u8 *)(r0 + 0)   // BPF_LDX | BPF_B
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
new file mode 100644
index 0000000000000..2846142afbe6a
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -0,0 +1,433 @@
+# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
+
+
+# TODO: Test immediate field ranges and some hex immediates.
+
+# CHECK-OBJ-NEW: add64 r0, r9
+# CHECK-OBJ-OLD: r0 += r9
+# CHECK-ASM-NEW: encoding: [0x0f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+add64 r0, r9
+
+# CHECK-OBJ-NEW: add64 r3, r2
+# CHECK-OBJ-OLD: r3 += r2
+# CHECK-ASM-NEW: encoding: [0x0f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+add64 r3, r2
+
+# CHECK-OBJ-NEW: add64 r3, 123 
+# CHECK-OBJ-OLD: r3 += 123 
+# CHECK-ASM-NEW: encoding: [0x07,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+add64 r3, 123 
+
+# CHECK-OBJ-NEW: add64 r5, -123 
+# CHECK-OBJ-OLD: r5 += -123 
+# CHECK-ASM-NEW: encoding: [0x07,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+add64 r5, -123 
+
+# CHECK-OBJ-NEW: add32 w6, w2
+# CHECK-OBJ-OLD: w6 += w2
+# CHECK-ASM-NEW: encoding: [0x0c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+add32 w6, w2
+
+# CHECK-OBJ-NEW: add32 w5, -123 
+# CHECK-OBJ-OLD: w5 += -123 
+# CHECK-ASM-NEW: encoding: [0x04,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+add32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: sub64 r0, r9
+# CHECK-OBJ-OLD: r0 -= r9
+# CHECK-ASM-NEW: encoding: [0x1f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+sub64 r0, r9
+
+# CHECK-OBJ-NEW: sub64 r3, r2
+# CHECK-OBJ-OLD: r3 -= r2
+# CHECK-ASM-NEW: encoding: [0x1f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+sub64 r3, r2
+
+# CHECK-OBJ-NEW: sub64 r3, 123 
+# CHECK-OBJ-OLD: r3 -= 123 
+# CHECK-ASM-NEW: encoding: [0x17,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+sub64 r3, 123 
+
+# CHECK-OBJ-NEW: sub64 r5, -123 
+# CHECK-OBJ-OLD: r5 -= -123 
+# CHECK-ASM-NEW: encoding: [0x17,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+sub64 r5, -123 
+
+# CHECK-OBJ-NEW: sub32 w6, w2
+# CHECK-OBJ-OLD: w6 -= w2
+# CHECK-ASM-NEW: encoding: [0x1c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+sub32 w6, w2
+
+# CHECK-OBJ-NEW: sub32 w5, -123 
+# CHECK-OBJ-OLD: w5 -= -123 
+# CHECK-ASM-NEW: encoding: [0x14,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+sub32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: mul64 r0, r9
+# CHECK-OBJ-OLD: r0 *= r9
+# CHECK-ASM-NEW: encoding: [0x2f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+mul64 r0, r9
+
+# CHECK-OBJ-NEW: mul64 r3, r2
+# CHECK-OBJ-OLD: r3 *= r2
+# CHECK-ASM-NEW: encoding: [0x2f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+mul64 r3, r2
+
+# CHECK-OBJ-NEW: mul64 r3, 123 
+# CHECK-OBJ-OLD: r3 *= 123 
+# CHECK-ASM-NEW: encoding: [0x27,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+mul64 r3, 123 
+
+# CHECK-OBJ-NEW: mul64 r5, -123 
+# CHECK-OBJ-OLD: r5 *= -123 
+# CHECK-ASM-NEW: encoding: [0x27,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+mul64 r5, -123 
+
+# CHECK-OBJ-NEW: mul32 w6, w2
+# CHECK-OBJ-OLD: w6 *= w2
+# CHECK-ASM-NEW: encoding: [0x2c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+mul32 w6, w2
+
+# CHECK-OBJ-NEW: mul32 w5, -123 
+# CHECK-OBJ-OLD: w5 *= -123 
+# CHECK-ASM-NEW: encoding: [0x24,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+mul32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: div64 r0, r9
+# CHECK-OBJ-OLD: r0 /= r9
+# CHECK-ASM-NEW: encoding: [0x3f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+div64 r0, r9
+
+# CHECK-OBJ-NEW: div64 r3, r2
+# CHECK-OBJ-OLD: r3 /= r2
+# CHECK-ASM-NEW: encoding: [0x3f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+div64 r3, r2
+
+# CHECK-OBJ-NEW: div64 r3, 123 
+# CHECK-OBJ-OLD: r3 /= 123 
+# CHECK-ASM-NEW: encoding: [0x37,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+div64 r3, 123 
+
+# CHECK-OBJ-NEW: div64 r5, -123 
+# CHECK-OBJ-OLD: r5 /= -123 
+# CHECK-ASM-NEW: encoding: [0x37,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+div64 r5, -123 
+
+# CHECK-OBJ-NEW: div32 w6, w2
+# CHECK-OBJ-OLD: w6 /= w2
+# CHECK-ASM-NEW: encoding: [0x3c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+div32 w6, w2
+
+# CHECK-OBJ-NEW: div32 w5, -123 
+# CHECK-OBJ-OLD: w5 /= -123 
+# CHECK-ASM-NEW: encoding: [0x34,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+div32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: sdiv64 r0, r9
+# CHECK-OBJ-OLD: r0 s/= r9
+# CHECK-ASM-NEW: encoding: [0xef,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+sdiv64 r0, r9
+
+# CHECK-OBJ-NEW: sdiv64 r3, r2
+# CHECK-OBJ-OLD: r3 s/= r2
+# CHECK-ASM-NEW: encoding: [0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+sdiv64 r3, r2
+
+# CHECK-OBJ-NEW: sdiv64 r3, 123 
+# CHECK-OBJ-OLD: r3 s/= 123 
+# CHECK-ASM-NEW: encoding: [0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+sdiv64 r3, 123 
+
+# CHECK-OBJ-NEW: sdiv64 r5, -123 
+# CHECK-OBJ-OLD: r5 s/= -123 
+# CHECK-ASM-NEW: encoding: [0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+sdiv64 r5, -123 
+
+# CHECK-OBJ-NEW: sdiv32 w6, w2
+# CHECK-OBJ-OLD: w6 s/= w2
+# CHECK-ASM-NEW: encoding: [0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+sdiv32 w6, w2
+
+# CHECK-OBJ-NEW: sdiv32 w5, -123 
+# CHECK-OBJ-OLD: w5 s/= -123 
+# CHECK-ASM-NEW: encoding: [0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+sdiv32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: or64 r0, r9
+# CHECK-OBJ-OLD: r0 |= r9
+# CHECK-ASM-NEW: encoding: [0x4f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+or64 r0, r9
+
+# CHECK-OBJ-NEW: or64 r3, r2
+# CHECK-OBJ-OLD: r3 |= r2
+# CHECK-ASM-NEW: encoding: [0x4f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+or64 r3, r2
+
+# CHECK-OBJ-NEW: or64 r3, 123 
+# CHECK-OBJ-OLD: r3 |= 123 
+# CHECK-ASM-NEW: encoding: [0x47,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+or64 r3, 123 
+
+# CHECK-OBJ-NEW: or64 r5, -123 
+# CHECK-OBJ-OLD: r5 |= -123 
+# CHECK-ASM-NEW: encoding: [0x47,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+or64 r5, -123 
+
+# CHECK-OBJ-NEW: or32 w6, w2
+# CHECK-OBJ-OLD: w6 |= w2
+# CHECK-ASM-NEW: encoding: [0x4c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+or32 w6, w2
+
+# CHECK-OBJ-NEW: or32 w5, -123 
+# CHECK-OBJ-OLD: w5 |= -123 
+# CHECK-ASM-NEW: encoding: [0x44,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+or32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: and64 r0, r9
+# CHECK-OBJ-OLD: r0 &= r9
+# CHECK-ASM-NEW: encoding: [0x5f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+and64 r0, r9
+
+# CHECK-OBJ-NEW: and64 r3, r2
+# CHECK-OBJ-OLD: r3 &= r2
+# CHECK-ASM-NEW: encoding: [0x5f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+and64 r3, r2
+
+# CHECK-OBJ-NEW: and64 r3, 123 
+# CHECK-OBJ-OLD: r3 &= 123 
+# CHECK-ASM-NEW: encoding: [0x57,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+and64 r3, 123 
+
+# CHECK-OBJ-NEW: and64 r5, -123 
+# CHECK-OBJ-OLD: r5 &= -123 
+# CHECK-ASM-NEW: encoding: [0x57,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+and64 r5, -123 
+
+# CHECK-OBJ-NEW: and32 w6, w2
+# CHECK-OBJ-OLD: w6 &= w2
+# CHECK-ASM-NEW: encoding: [0x5c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+and32 w6, w2
+
+# CHECK-OBJ-NEW: and32 w5, -123 
+# CHECK-OBJ-OLD: w5 &= -123 
+# CHECK-ASM-NEW: encoding: [0x54,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+and32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: xor64 r0, r9
+# CHECK-OBJ-OLD: r0 ^= r9
+# CHECK-ASM-NEW: encoding: [0xaf,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+xor64 r0, r9
+
+# CHECK-OBJ-NEW: xor64 r3, r2
+# CHECK-OBJ-OLD: r3 ^= r2
+# CHECK-ASM-NEW: encoding: [0xaf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+xor64 r3, r2
+
+# CHECK-OBJ-NEW: xor64 r3, 123 
+# CHECK-OBJ-OLD: r3 ^= 123 
+# CHECK-ASM-NEW: encoding: [0xa7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+xor64 r3, 123 
+
+# CHECK-OBJ-NEW: xor64 r5, -123 
+# CHECK-OBJ-OLD: r5 ^= -123 
+# CHECK-ASM-NEW: encoding: [0xa7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+xor64 r5, -123 
+
+# CHECK-OBJ-NEW: xor32 w6, w2
+# CHECK-OBJ-OLD: w6 ^= w2
+# CHECK-ASM-NEW: encoding: [0xac,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+xor32 w6, w2
+
+# CHECK-OBJ-NEW: xor32 w5, -123 
+# CHECK-OBJ-OLD: w5 ^= -123 
+# CHECK-ASM-NEW: encoding: [0xa4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+xor32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: lsh64 r0, r9
+# CHECK-OBJ-OLD: r0 <<= r9
+# CHECK-ASM-NEW: encoding: [0x6f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+lsh64 r0, r9
+
+# CHECK-OBJ-NEW: lsh64 r3, r2
+# CHECK-OBJ-OLD: r3 <<= r2
+# CHECK-ASM-NEW: encoding: [0x6f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+lsh64 r3, r2
+
+# CHECK-OBJ-NEW: lsh64 r3, 123 
+# CHECK-OBJ-OLD: r3 <<= 123 
+# CHECK-ASM-NEW: encoding: [0x67,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+lsh64 r3, 123 
+
+# CHECK-OBJ-NEW: lsh64 r5, -123 
+# CHECK-OBJ-OLD: r5 <<= -123 
+# CHECK-ASM-NEW: encoding: [0x67,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+lsh64 r5, -123 
+
+# CHECK-OBJ-NEW: lsh32 w6, w2
+# CHECK-OBJ-OLD: w6 <<= w2
+# CHECK-ASM-NEW: encoding: [0x6c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+lsh32 w6, w2
+
+# CHECK-OBJ-NEW: lsh32 w5, -123 
+# CHECK-OBJ-OLD: w5 <<= -123 
+# CHECK-ASM-NEW: encoding: [0x64,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+lsh32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: rsh64 r0, r9
+# CHECK-OBJ-OLD: r0 >>= r9
+# CHECK-ASM-NEW: encoding: [0x7f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+rsh64 r0, r9
+
+# CHECK-OBJ-NEW: rsh64 r3, r2
+# CHECK-OBJ-OLD: r3 >>= r2
+# CHECK-ASM-NEW: encoding: [0x7f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+rsh64 r3, r2
+
+# CHECK-OBJ-NEW: rsh64 r3, 123 
+# CHECK-OBJ-OLD: r3 >>= 123 
+# CHECK-ASM-NEW: encoding: [0x77,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+rsh64 r3, 123 
+
+# CHECK-OBJ-NEW: rsh64 r5, -123 
+# CHECK-OBJ-OLD: r5 >>= -123 
+# CHECK-ASM-NEW: encoding: [0x77,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+rsh64 r5, -123 
+
+# CHECK-OBJ-NEW: rsh32 w6, w2
+# CHECK-OBJ-OLD: w6 >>= w2
+# CHECK-ASM-NEW: encoding: [0x7c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+rsh32 w6, w2
+
+# CHECK-OBJ-NEW: rsh32 w5, -123 
+# CHECK-OBJ-OLD: w5 >>= -123 
+# CHECK-ASM-NEW: encoding: [0x74,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+rsh32 w5, -123 
+
+
+
+
+# CHECK-OBJ-NEW: arsh64 r0, r9
+# CHECK-OBJ-OLD: r0 s>>= r9
+# CHECK-ASM-NEW: encoding: [0xcf,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+arsh64 r0, r9
+
+# CHECK-OBJ-NEW: arsh64 r3, r2
+# CHECK-OBJ-OLD: r3 s>>= r2
+# CHECK-ASM-NEW: encoding: [0xcf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+arsh64 r3, r2
+
+# CHECK-OBJ-NEW: arsh64 r3, 123 
+# CHECK-OBJ-OLD: r3 s>>= 123 
+# CHECK-ASM-NEW: encoding: [0xc7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+arsh64 r3, 123 
+
+# CHECK-OBJ-NEW: arsh64 r5, -123 
+# CHECK-OBJ-OLD: r5 s>>= -123 
+# CHECK-ASM-NEW: encoding: [0xc7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+arsh64 r5, -123 
+
+# CHECK-OBJ-NEW: arsh32 w6, w2
+# CHECK-OBJ-OLD: w6 s>>= w2
+# CHECK-ASM-NEW: encoding: [0xcc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+arsh32 w6, w2
+
+# CHECK-OBJ-NEW: arsh32 w5, -123 
+# CHECK-OBJ-OLD: w5 s>>= -123 
+# CHECK-ASM-NEW: encoding: [0xc4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+arsh32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: neg64 r9
+# CHECK-OBJ-OLD: r9 = -r9
+# CHECK-ASM-NEW: encoding: [0x87,0x09,0x00,0x00,0x00,0x00,0x00,0x00]
+neg64 r9
+
+# CHECK-OBJ-NEW: neg32 w6
+# CHECK-OBJ-OLD: w6 = -w6
+# CHECK-ASM-NEW: encoding: [0x84,0x06,0x00,0x00,0x00,0x00,0x00,0x00]
+neg32 w6
+
+
+
+# CHECK-OBJ-NEW: mov64 r0, r9
+# CHECK-OBJ-OLD: r0 = r9
+# CHECK-ASM-NEW: encoding: [0xbf,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+mov64 r0, r9
+
+# CHECK-OBJ-NEW: mov64 r3, r2
+# CHECK-OBJ-OLD: r3 = r2
+# CHECK-ASM-NEW: encoding: [0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+mov64 r3, r2
+
+# CHECK-OBJ-NEW: mov64 r3, 123 
+# CHECK-OBJ-OLD: r3 = 123 
+# CHECK-ASM-NEW: encoding: [0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+mov64 r3, 123 
+
+# CHECK-OBJ-NEW: mov64 r5, -123 
+# CHECK-OBJ-OLD: r5 = -123 
+# CHECK-ASM-NEW: encoding: [0xb7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+mov64 r5, -123 
+
+# CHECK-OBJ-NEW: mov32 w6, w2
+# CHECK-OBJ-OLD: w6 = w2
+# CHECK-ASM-NEW: encoding: [0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+mov32 w6, w2
+
+# CHECK-OBJ-NEW: mov32 w5, -123 
+# CHECK-OBJ-OLD: w5 = -123 
+# CHECK-ASM-NEW: encoding: [0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+mov32 w5, -123 
+
+
+
+# CHECK-OBJ-NEW: le16 r3
+# CHECK-OBJ-NEW: le32 r4
+# CHECK-OBJ-NEW: le64 r5
+# CHECK-OBJ-NEW: be16 r0
+# CHECK-OBJ-NEW: be32 r1
+# CHECK-OBJ-NEW: be64 r2
+# CHECK-OBJ-OLD: r3 = le16 r3
+# CHECK-OBJ-OLD: r4 = le32 r4
+# CHECK-OBJ-OLD: r5 = le64 r5
+# CHECK-OBJ-OLD: r0 = be16 r0
+# CHECK-OBJ-OLD: r1 = be32 r1
+# CHECK-OBJ-OLD: r2 = be64 r2
+# CHECK-ASM-NEW: encoding: [0xd4,0x03,0x00,0x00,0x10,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xd4,0x04,0x00,0x00,0x20,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xd4,0x05,0x00,0x00,0x40,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdc,0x00,0x00,0x00,0x10,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdc,0x01,0x00,0x00,0x20,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdc,0x02,0x00,0x00,0x40,0x00,0x00,0x00]
+le16 r3
+le32 r4
+le64 r5
+be16 r0
+be32 r1
+be64 r2
diff --git a/llvm/test/MC/SBF/sbf-invalid-jmp.s b/llvm/test/MC/SBF/sbf-invalid-jmp.s
new file mode 100644
index 0000000000000..78c0b61b7bc64
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-invalid-jmp.s
@@ -0,0 +1,10 @@
+# RUN: not llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     -o /dev/null 2>&1 | FileCheck %s
+
+
+# The original BPF does not support 16-bit relocations, so we currently
+# don't either. But we will now emit an error message for SBF instead of
+# asserting as the BPF back-end does.
+# CHECK: <unknown>:0: error: 2-byte relocations not supported
+ja undefined_label
+
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
new file mode 100644
index 0000000000000..13555cc31818a
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -0,0 +1,289 @@
+# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
+
+
+
+# TODO: Test immediate field ranges, etc.
+
+mylabelback:
+# CHECK-OBJ-NEW: ja +8
+# CHECK-OBJ-NEW: ja -2 <mylabelback>
+# CHECK-OBJ-NEW: ja +0 <mylabelfwd>
+# CHECK-OBJ-OLD: goto +8
+# CHECK-OBJ-OLD: goto -2
+# CHECK-OBJ-OLD: goto +0
+# CHECK-ASM-NEW: encoding: [0x05,0x00,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x05'A',A,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: # fixup A - offset: 0, value: mylabelback, kind: FK_PCRel_2
+# CHECK-ASM-NEW: encoding: [0x05'A',A,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: # fixup A - offset: 0, value: mylabelfwd, kind: FK_PCRel_2
+ja +8
+ja mylabelback
+ja mylabelfwd
+
+mylabelfwd:
+
+# CHECK-OBJ-NEW: jeq r0, r9, +1
+# CHECK-OBJ-NEW: jne r0, r9, +1
+# CHECK-OBJ-NEW: jgt r0, r9, +1
+# CHECK-OBJ-NEW: jge r0, r9, +1
+# CHECK-OBJ-NEW: jlt r0, r9, +1
+# CHECK-OBJ-NEW: jle r0, r9, +1
+# CHECK-OBJ-NEW: jsgt r0, r9, +1
+# CHECK-OBJ-NEW: jsge r0, r9, +1
+# CHECK-OBJ-NEW: jslt r0, r9, +1
+# CHECK-OBJ-NEW: jsle r0, r9, +1
+# CHECK-OBJ-OLD: if r0 == r9 goto +1
+# CHECK-OBJ-OLD: if r0 != r9 goto +1
+# CHECK-OBJ-OLD: if r0 > r9 goto +1
+# CHECK-OBJ-OLD: if r0 >= r9 goto +1
+# CHECK-OBJ-OLD: if r0 < r9 goto +1
+# CHECK-OBJ-OLD: if r0 <= r9 goto +1
+# CHECK-OBJ-OLD: if r0 s> r9 goto +1
+# CHECK-OBJ-OLD: if r0 s>= r9 goto +1
+# CHECK-OBJ-OLD: if r0 s< r9 goto +1
+# CHECK-OBJ-OLD: if r0 s<= r9 goto +1
+# CHECK-ASM-NEW: encoding: [0x1d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x5d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x2d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x3d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xad,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xbd,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x6d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x7d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xcd,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdd,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
+jeq r0, r9, +1
+jne r0, r9, +1
+jgt r0, r9, +1
+jge r0, r9, +1
+jlt r0, r9, +1
+jle r0, r9, +1
+jsgt r0, r9, +1
+jsge r0, r9, +1
+jslt r0, r9, +1
+jsle r0, r9, +1
+
+# CHECK-OBJ-NEW: jeq r3, r2, +1
+# CHECK-OBJ-NEW: jne r3, r2, +1
+# CHECK-OBJ-NEW: jgt r3, r2, +1
+# CHECK-OBJ-NEW: jge r3, r2, +1
+# CHECK-OBJ-NEW: jlt r3, r2, +1
+# CHECK-OBJ-NEW: jle r3, r2, +1
+# CHECK-OBJ-NEW: jsgt r3, r2, +1
+# CHECK-OBJ-NEW: jsge r3, r2, +1
+# CHECK-OBJ-NEW: jslt r3, r2, +1
+# CHECK-OBJ-NEW: jsle r3, r2, +1
+# CHECK-OBJ-OLD: if r3 == r2 goto +1
+# CHECK-OBJ-OLD: if r3 != r2 goto +1
+# CHECK-OBJ-OLD: if r3 > r2 goto +1
+# CHECK-OBJ-OLD: if r3 >= r2 goto +1
+# CHECK-OBJ-OLD: if r3 < r2 goto +1
+# CHECK-OBJ-OLD: if r3 <= r2 goto +1
+# CHECK-OBJ-OLD: if r3 s> r2 goto +1
+# CHECK-OBJ-OLD: if r3 s>= r2 goto +1
+# CHECK-OBJ-OLD: if r3 s< r2 goto +1
+# CHECK-OBJ-OLD: if r3 s<= r2 goto +1
+# CHECK-ASM-NEW: encoding: [0x1d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x5d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x2d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x3d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xad,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xbd,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x6d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x7d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xcd,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdd,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
+jeq r3, r2, +1
+jne r3, r2, +1
+jgt r3, r2, +1
+jge r3, r2, +1
+jlt r3, r2, +1
+jle r3, r2, +1
+jsgt r3, r2, +1
+jsge r3, r2, +1
+jslt r3, r2, +1
+jsle r3, r2, +1
+
+# CHECK-OBJ-NEW: jeq r3, 123, +8
+# CHECK-OBJ-NEW: jne r3, 123, +8
+# CHECK-OBJ-NEW: jgt r3, 123, +8
+# CHECK-OBJ-NEW: jge r3, 123, +8
+# CHECK-OBJ-NEW: jlt r3, 123, +8
+# CHECK-OBJ-NEW: jle r3, 123, +8
+# CHECK-OBJ-NEW: jsgt r3, 123, +8
+# CHECK-OBJ-NEW: jsge r3, 123, +8
+# CHECK-OBJ-NEW: jslt r3, 123, +8
+# CHECK-OBJ-NEW: jsle r3, 123, +8
+# CHECK-OBJ-OLD: if r3 == 123 goto +8
+# CHECK-OBJ-OLD: if r3 != 123 goto +8
+# CHECK-OBJ-OLD: if r3 > 123 goto +8
+# CHECK-OBJ-OLD: if r3 >= 123 goto +8
+# CHECK-OBJ-OLD: if r3 < 123 goto +8
+# CHECK-OBJ-OLD: if r3 <= 123 goto +8
+# CHECK-OBJ-OLD: if r3 s> 123 goto +8
+# CHECK-OBJ-OLD: if r3 s>= 123 goto +8
+# CHECK-OBJ-OLD: if r3 s< 123 goto +8
+# CHECK-OBJ-OLD: if r3 s<= 123 goto +8
+# CHECK-ASM-NEW: encoding: [0x15,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x55,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x25,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x35,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xa5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xb5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x65,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x75,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xc5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xd5,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
+jeq r3, 123, +8
+jne r3, 123, +8
+jgt r3, 123, +8
+jge r3, 123, +8
+jlt r3, 123, +8
+jle r3, 123, +8
+jsgt r3, 123, +8
+jsge r3, 123, +8
+jslt r3, 123, +8
+jsle r3, 123, +8
+
+# CHECK-OBJ-NEW: jeq r5, -123, +8 
+# CHECK-OBJ-NEW: jne r5, -123, +8 
+# CHECK-OBJ-NEW: jgt r5, -123, +8 
+# CHECK-OBJ-NEW: jge r5, -123, +8 
+# CHECK-OBJ-NEW: jlt r5, -123, +8 
+# CHECK-OBJ-NEW: jle r5, -123, +8 
+# CHECK-OBJ-NEW: jsgt r5, -123, +8 
+# CHECK-OBJ-NEW: jsge r5, -123, +8 
+# CHECK-OBJ-NEW: jslt r5, -123, +8 
+# CHECK-OBJ-NEW: jsle r5, -123, +8 
+# CHECK-OBJ-OLD: if r5 == -123 goto +8
+# CHECK-OBJ-OLD: if r5 != -123 goto +8
+# CHECK-OBJ-OLD: if r5 > -123 goto +8
+# CHECK-OBJ-OLD: if r5 >= -123 goto +8
+# CHECK-OBJ-OLD: if r5 < -123 goto +8
+# CHECK-OBJ-OLD: if r5 <= -123 goto +8
+# CHECK-OBJ-OLD: if r5 s> -123 goto +8
+# CHECK-OBJ-OLD: if r5 s>= -123 goto +8
+# CHECK-OBJ-OLD: if r5 s< -123 goto +8
+# CHECK-OBJ-OLD: if r5 s<= -123 goto +8
+# CHECK-ASM-NEW: encoding: [0x15,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x55,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x25,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x35,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xa5,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xb5,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x65,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x75,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xc5,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xd5,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+jeq r5, -123, +8 
+jne r5, -123, +8 
+jgt r5, -123, +8 
+jge r5, -123, +8 
+jlt r5, -123, +8 
+jle r5, -123, +8 
+jsgt r5, -123, +8 
+jsge r5, -123, +8 
+jslt r5, -123, +8 
+jsle r5, -123, +8 
+
+# CHECK-OBJ-NEW: jeq w6, w2, +8
+# CHECK-OBJ-NEW: jne w6, w2, +8
+# CHECK-OBJ-NEW: jgt w6, w2, +8
+# CHECK-OBJ-NEW: jge w6, w2, +8
+# CHECK-OBJ-NEW: jlt w6, w2, +8
+# CHECK-OBJ-NEW: jle w6, w2, +8
+# CHECK-OBJ-NEW: jsgt w6, w2, +8
+# CHECK-OBJ-NEW: jsge w6, w2, +8
+# CHECK-OBJ-NEW: jslt w6, w2, +8
+# CHECK-OBJ-NEW: jsle w6, w2, +8
+# CHECK-OBJ-OLD: if w6 == w2 goto +8
+# CHECK-OBJ-OLD: if w6 != w2 goto +8
+# CHECK-OBJ-OLD: if w6 > w2 goto +8
+# CHECK-OBJ-OLD: if w6 >= w2 goto +8
+# CHECK-OBJ-OLD: if w6 < w2 goto +8
+# CHECK-OBJ-OLD: if w6 <= w2 goto +8
+# CHECK-OBJ-OLD: if w6 s> w2 goto +8
+# CHECK-OBJ-OLD: if w6 s>= w2 goto +8
+# CHECK-OBJ-OLD: if w6 s< w2 goto +8
+# CHECK-OBJ-OLD: if w6 s<= w2 goto +8
+# CHECK-ASM-NEW: encoding: [0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x3e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xae,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xbe,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x6e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x7e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xce,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xde,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
+jeq w6, w2, +8
+jne w6, w2, +8
+jgt w6, w2, +8
+jge w6, w2, +8
+jlt w6, w2, +8
+jle w6, w2, +8
+jsgt w6, w2, +8
+jsge w6, w2, +8
+jslt w6, w2, +8
+jsle w6, w2, +8
+
+# CHECK-OBJ-NEW: jeq w5, -123, +8
+# CHECK-OBJ-NEW: jne w5, -123, +8
+# CHECK-OBJ-NEW: jgt w5, -123, +8
+# CHECK-OBJ-NEW: jge w5, -123, +8
+# CHECK-OBJ-NEW: jlt w5, -123, +8
+# CHECK-OBJ-NEW: jle w5, -123, +8
+# CHECK-OBJ-NEW: jsgt w5, -123, +8
+# CHECK-OBJ-NEW: jsge w5, -123, +8
+# CHECK-OBJ-NEW: jslt w5, -123, +8
+# CHECK-OBJ-NEW: jsle w5, -123, +8
+# CHECK-OBJ-OLD: if w5 == -123 goto +8
+# CHECK-OBJ-OLD: if w5 != -123 goto +8
+# CHECK-OBJ-OLD: if w5 s> -123 goto +8
+# CHECK-OBJ-OLD: if w5 s>= -123 goto +8
+# CHECK-OBJ-OLD: if w5 s< -123 goto +8
+# CHECK-OBJ-OLD: if w5 s<= -123 goto +8
+# CHECK-ASM-NEW: encoding: [0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x36,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xa6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xb6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x66,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x76,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xc6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0xd6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
+jeq w5, -123, +8
+jne w5, -123, +8
+jgt w5, -123, +8
+jge w5, -123, +8
+jlt w5, -123, +8
+jle w5, -123, +8
+jsgt w5, -123, +8
+jsge w5, -123, +8
+jslt w5, -123, +8
+jsle w5, -123, +8
+
+
+# CHECK-OBJ-NEW: call 8
+# CHECK-OBJ-OLD: call 8
+# CHECK-ASM-NEW: encoding: [0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00]
+call 8
+
+# CHECK-OBJ-NEW: callx r4
+# CHECK-OBJ-OLD: callx r4
+# CHECK-ASM-NEW: encoding: [0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00]
+callx r4
+
+# CHECK-OBJ-NEW: exit
+# CHECK-OBJ-OLD: exit
+# CHECK-ASM-NEW: encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+exit
+
diff --git a/llvm/test/MC/SBF/sbf-ldst.s b/llvm/test/MC/SBF/sbf-ldst.s
new file mode 100644
index 0000000000000..5be9793a364c9
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-ldst.s
@@ -0,0 +1,262 @@
+# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK32-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump --mattr=+alu32 -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK32-OBJ-NEW %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump --mattr=+alu32 --output-asm-variant=1 -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK32-OBJ-OLD %s
+
+
+# TODO: Test immediate field ranges and some hex immediates.
+
+# CHECK-OBJ-NEW: lddw r7, 32768
+# CHECK-OBJ-NEW: lddw r0, 9151314442816847872
+# CHECK-OBJ-NEW: lddw r1, -1
+# CHECK-OBJ-NEW: lddw r3, 0
+# CHECK-OBJ-NEW: 0000000000000030:  R_SBF_64_64        the_symbol
+# CHECK-OBJ-OLD: r7 = 32768 ll
+# CHECK-OBJ-OLD: r0 = 9151314442816847872 ll
+# CHECK-OBJ-OLD: r1 = -1 ll
+# CHECK-OBJ-OLD: r3 = 0 ll
+# CHECK-OBJ-OLD: 0000000000000030:  R_SBF_64_64        the_symbol
+# CHECK-ASM-NEW: encoding: [0x18,0x07,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f]
+# CHECK-ASM-NEW: encoding: [0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x18'A',0x03'A',A,A,A,A,A,A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: # fixup A - offset: 0, value: the_symbol, kind: FK_SecRel_8
+lddw r7, 32768
+lddw r0, 9151314442816847872
+lddw r1, -1
+lddw r3, the_symbol
+
+
+
+# CHECK-OBJ-NEW: ldxb r6, [r1 + 17]
+# CHECK-OBJ-NEW: ldxb r1, [r10 - 3]
+# CHECK-OBJ-NEW: ldxh r8, [r2 + 32]
+# CHECK-OBJ-NEW: ldxw r4, [r3 + 64]
+# CHECK-OBJ-NEW: ldxdw r0, [r4 + 128]
+# CHECK-OBJ-OLD: r6 = *(u8 *)(r1 + 17)
+# CHECK-OBJ-OLD: r1 = *(u8 *)(r10 - 3)
+# CHECK-OBJ-OLD: r8 = *(u16 *)(r2 + 32)
+# CHECK-OBJ-OLD: r4 = *(u32 *)(r3 + 64)
+# CHECK-OBJ-OLD: r0 = *(u64 *)(r4 + 128)
+# CHECK-ASM-NEW: encoding: [0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x61,0x34,0x40,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x79,0x40,0x80,0x00,0x00,0x00,0x00,0x00]
+ldxb r6, [r1 + 17]
+ldxb r1, [r10 - 3]
+ldxh r8, [r2 + 32]
+ldxw r4, [r3 + 64]
+ldxdw r0, [r4 + 128]
+
+
+
+# CHECK32-OBJ-NEW: ldxb w6, [r1 + 17]
+# CHECK32-OBJ-NEW: ldxb w1, [r10 - 3]
+# CHECK32-OBJ-NEW: ldxh w8, [r2 + 32]
+# CHECK32-OBJ-NEW: ldxw w4, [r3 + 64]
+# CHECK32-OBJ-OLD: w6 = *(u8 *)(r1 + 17)
+# CHECK32-OBJ-OLD: w1 = *(u8 *)(r10 - 3)
+# CHECK32-OBJ-OLD: w8 = *(u16 *)(r2 + 32)
+# CHECK32-OBJ-OLD: w4 = *(u32 *)(r3 + 64)
+# CHECK32-ASM-NEW: encoding: [0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x61,0x34,0x40,0x00,0x00,0x00,0x00,0x00]
+ldxb w6, [r1 + 17]
+ldxb w1, [r10 - 3]
+ldxh w8, [r2 + 32]
+ldxw w4, [r3 + 64]
+
+
+
+# CHECK-OBJ-NEW: stxb [r1 + 17], r6
+# CHECK-OBJ-NEW: stxb [r10 - 3], r1
+# CHECK-OBJ-NEW: stxh [r2 + 32], r8
+# CHECK-OBJ-NEW: stxw [r3 + 64], r4
+# CHECK-OBJ-NEW: stxdw [r4 + 128], r0
+# CHECK-OBJ-OLD: *(u8 *)(r1 + 17) = r6
+# CHECK-OBJ-OLD: *(u8 *)(r10 - 3) = r1
+# CHECK-OBJ-OLD: *(u16 *)(r2 + 32) = r8
+# CHECK-OBJ-OLD: *(u32 *)(r3 + 64) = r4
+# CHECK-OBJ-OLD: *(u64 *)(r4 + 128) = r0
+# CHECK-ASM-NEW: encoding: [0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x63,0x43,0x40,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x7b,0x04,0x80,0x00,0x00,0x00,0x00,0x00]
+stxb [r1 + 17], r6
+stxb [r10 - 3], r1
+stxh [r2 + 32], r8
+stxw [r3 + 64], r4
+stxdw [r4 + 128], r0
+
+
+
+# CHECK32-OBJ-NEW: stxb [r1 + 17], w6
+# CHECK32-OBJ-NEW: stxb [r10 - 3], w1
+# CHECK32-OBJ-NEW: stxh [r2 + 32], w8
+# CHECK32-OBJ-NEW: stxw [r3 + 64], w4
+# CHECK32-OBJ-OLD: *(u8 *)(r1 + 17) = w6
+# CHECK32-OBJ-OLD: *(u8 *)(r10 - 3) = w1
+# CHECK32-OBJ-OLD: *(u16 *)(r2 + 32) = w8
+# CHECK32-OBJ-OLD: *(u32 *)(r3 + 64) = w4
+# CHECK32-ASM-NEW: encoding: [0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x63,0x43,0x40,0x00,0x00,0x00,0x00,0x00]
+stxb [r1 + 17], w6
+stxb [r10 - 3], w1
+stxh [r2 + 32], w8
+stxw [r3 + 64], w4
+
+
+# XADDW (NoALU32).
+# CHECK-OBJ-NEW: stxxaddw [r8 + 4], r2 
+# CHECK-OBJ-OLD: lock *(u32 *)(r8 + 4) += r2
+# CHECK-ASM-NEW: encoding: [0xc3,0x28,0x04,0x00,0x00,0x00,0x00,0x00]
+stxxaddw [r8 + 4], r2 
+
+
+
+# XADDD, XANDD, XORD, XXORD (NoALU32).
+# CHECK-OBJ-NEW: stxxadddw [r8 - 16], r0
+# CHECK-OBJ-NEW: stxxanddw [r8 - 32], r1
+# CHECK-OBJ-NEW: stxxordw [r8 - 64], r2
+# CHECK-OBJ-NEW: stxxxordw [r8 - 128], r3
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 16) += r0
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 32) &= r1
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 64) |= r2
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 128) ^= r3
+# CHECK-ASM-NEW: encoding: [0xdb,0x08,0xf0,0xff,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdb,0x18,0xe0,0xff,0x50,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdb,0x28,0xc0,0xff,0x40,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdb,0x38,0x80,0xff,0xa0,0x00,0x00,0x00]
+stxxadddw [r8 - 16], r0
+stxxanddw [r8 - 32], r1
+stxxordw [r8 - 64], r2
+stxxxordw [r8 - 128], r3
+
+
+
+# XADDW32, XANDW32, XORW32, XXORW32 (ALU32).
+# CHECK32-OBJ-NEW: stxxaddw [r8 - 16], w4
+# CHECK32-OBJ-NEW: stxxandw [r8 - 32], w5
+# CHECK32-OBJ-NEW: stxxorw [r8 - 64], w6
+# CHECK32-OBJ-NEW: stxxxorw [r8 - 128], w7
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 16) += w4
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 32) &= w5
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 64) |= w6
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 128) ^= w7
+# CHECK32-ASM-NEW: encoding: [0xc3,0x48,0xf0,0xff,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x58,0xe0,0xff,0x50,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x68,0xc0,0xff,0x40,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x78,0x80,0xff,0xa0,0x00,0x00,0x00]
+stxxaddw [r8 - 16], w4
+stxxandw [r8 - 32], w5
+stxxorw [r8 - 64], w6
+stxxxorw [r8 - 128], w7
+
+
+
+# XFADDD, XFANDD, XFORD, XFXORD (NoALU32).
+# CHECK-OBJ-NEW: stxxfadddw [r8 - 16], r0
+# CHECK-OBJ-NEW: stxxfanddw [r8 - 32], r1
+# CHECK-OBJ-NEW: stxxfordw [r8 - 64], r2
+# CHECK-OBJ-NEW: stxxfxordw [r8 - 128], r3
+# CHECK-OBJ-OLD: r0 = atomic_fetch_add((u64 *)(r8 - 16), r0)
+# CHECK-OBJ-OLD: r1 = atomic_fetch_and((u64 *)(r8 - 32), r1)
+# CHECK-OBJ-OLD: r2 = atomic_fetch_or((u64 *)(r8 - 64), r2)
+# CHECK-OBJ-OLD: r3 = atomic_fetch_xor((u64 *)(r8 - 128), r3)
+# CHECK-ASM-NEW: encoding: [0xdb,0x08,0xf0,0xff,0x01,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdb,0x18,0xe0,0xff,0x51,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdb,0x28,0xc0,0xff,0x41,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0xdb,0x38,0x80,0xff,0xa1,0x00,0x00,0x00]
+stxxfadddw [r8 - 16], r0
+stxxfanddw [r8 - 32], r1
+stxxfordw [r8 - 64], r2
+stxxfxordw [r8 - 128], r3
+
+
+
+# XFADDW32, XFANDW32, XFORW32, XFXORW32 (ALU32).
+# CHECK32-OBJ-NEW: stxxfaddw [r8 - 16], w0
+# CHECK32-OBJ-NEW: stxxfandw [r8 - 32], w1
+# CHECK32-OBJ-NEW: stxxforw [r8 - 64], w2
+# CHECK32-OBJ-NEW: stxxfxorw [r8 - 128], w3
+# CHECK32-OBJ-OLD: w0 = atomic_fetch_add((u32 *)(r8 - 16), w0)
+# CHECK32-OBJ-OLD: w1 = atomic_fetch_and((u32 *)(r8 - 32), w1)
+# CHECK32-OBJ-OLD: w2 = atomic_fetch_or((u32 *)(r8 - 64), w2)
+# CHECK32-OBJ-OLD: w3 = atomic_fetch_xor((u32 *)(r8 - 128), w3)
+# CHECK32-ASM-NEW: encoding: [0xc3,0x08,0xf0,0xff,0x01,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x18,0xe0,0xff,0x51,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x28,0xc0,0xff,0x41,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x38,0x80,0xff,0xa1,0x00,0x00,0x00]
+stxxfaddw [r8 - 16], w0
+stxxfandw [r8 - 32], w1
+stxxforw [r8 - 64], w2
+stxxfxorw [r8 - 128], w3
+
+
+
+# XCHGD, XCHGW32
+# CHECK-OBJ-NEW: stxxchgdw [r8 - 16], r7
+# CHECK-OBJ-OLD: r7 = xchg_64(r8 - 16, r7)
+# CHECK32-OBJ-NEW: stxxchgw [r8 - 16], w0
+# CHECK32-OBJ-OLD: w0 = xchg32_32(r8 - 16, w0)
+# CHECK-ASM-NEW: encoding: [0xdb,0x78,0xf0,0xff,0xe1,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x08,0xf0,0xff,0xe1,0x00,0x00,0x00]
+stxxchgdw [r8 - 16], r7
+stxxchgw [r8 - 16], w0
+
+
+
+# CMPXCHGD, CMPXCHGW32
+# CHECK-OBJ-NEW: stxcmpxchgdw [r8 - 16], r5
+# CHECK-OBJ-OLD: r0 = cmpxchg_64(r8 - 16, r0, r5) 
+# CHECK32-OBJ-NEW: stxcmpxchgw [r8 - 16], w5
+# CHECK32-OBJ-OLD: w0 = cmpxchg32_32(r8 - 16, w0, w5)
+# CHECK-ASM-NEW: encoding: [0xdb,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
+stxcmpxchgdw [r8 - 16], r5
+stxcmpxchgw [r8 - 16], w5
+
+
+
+# Obsolete ldabs/ldind for completeness.
+# CHECK-OBJ-NEW: ldabsb 64 
+# CHECK-OBJ-NEW: ldabsh 128 
+# CHECK-OBJ-NEW: ldabsw 0
+# CHECK-OBJ-NEW: ldindb r5
+# CHECK-OBJ-NEW: ldindh r9
+# CHECK-OBJ-NEW: ldindw r7
+# CHECK-OBJ-OLD: r0 = *(u8 *)skb[64]
+# CHECK-OBJ-OLD: r0 = *(u16 *)skb[128]
+# CHECK-OBJ-OLD: r0 = *(u32 *)skb[0]
+# CHECK-OBJ-OLD: r0 = *(u8 *)skb[r5]
+# CHECK-OBJ-OLD: r0 = *(u16 *)skb[r9]
+# CHECK-OBJ-OLD: r0 = *(u32 *)skb[r7]
+# CHECK-ASM-NEW: encoding: [0x30,0x00,0x00,0x00,0x40,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x28,0x00,0x00,0x00,0x80,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x48,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x40,0x70,0x00,0x00,0x00,0x00,0x00,0x00]
+ldabsb 64 
+ldabsh 128 
+ldabsw 0
+ldindb r5
+ldindh r9
+ldindw r7
diff --git a/llvm/test/MC/SBF/sbf-sdiv.s b/llvm/test/MC/SBF/sbf-sdiv.s
index 75dcfeb2e3df4..1a2f627de067d 100644
--- a/llvm/test/MC/SBF/sbf-sdiv.s
+++ b/llvm/test/MC/SBF/sbf-sdiv.s
@@ -1,5 +1,7 @@
 # RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
-# RUN: llvm-objdump -d -r %t | FileCheck %s
+# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
+
+.syntax_old
 
 w1 s/= w2   // BPF_SDIV | BPF_X
 // CHECK: ec 21 00 00 00 00 00 00      w1 s/= w2
diff --git a/llvm/tools/llvm-objdump/ObjdumpOpts.td b/llvm/tools/llvm-objdump/ObjdumpOpts.td
index c3764c6e97534..49ab67c0aca02 100644
--- a/llvm/tools/llvm-objdump/ObjdumpOpts.td
+++ b/llvm/tools/llvm-objdump/ObjdumpOpts.td
@@ -252,6 +252,10 @@ def debug_vars_indent_EQ : Joined<["--"], "debug-vars-indent=">,
   HelpText<"Distance to indent the source-level variable display, "
            "relative to the start of the disassembly">;
 
+def output_asm_variant_EQ : Joined<["--"], "output-asm-variant=">,
+  MetaVarName<"uint">,
+  HelpText<"Select output assembly syntax variant">;
+
 def x86_asm_syntax_att : Flag<["--"], "x86-asm-syntax=att">,
   HelpText<"Emit AT&T-style disassembly">;
 
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 99e0440dce78d..70a81146c4343 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -349,6 +349,8 @@ bool objdump::UnwindInfo;
 static bool Wide;
 std::string objdump::Prefix;
 uint32_t objdump::PrefixStrip;
+static uint64_t OutputAsmVariant;
+static bool HasOutputAsmVariantFlag;
 
 DebugVarsFormat objdump::DbgVariables = DVDisabled;
 
@@ -1088,6 +1090,8 @@ DisassemblerTarget::DisassemblerTarget(const Target *TheTarget, ObjectFile &Obj,
   InstrAnalysis.reset(TheTarget->createMCInstrAnalysis(InstrInfo.get()));
 
   int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+  if (HasOutputAsmVariantFlag)
+    AsmPrinterVariant = OutputAsmVariant;
   InstPrinter.reset(TheTarget->createMCInstPrinter(Triple(TripleName),
                                                    AsmPrinterVariant, *AsmInfo,
                                                    *InstrInfo, *RegisterInfo));
@@ -3576,6 +3580,8 @@ static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
   }
 
   parseIntArg(InputArgs, OBJDUMP_debug_vars_indent_EQ, DbgIndent);
+  parseIntArg(InputArgs, OBJDUMP_output_asm_variant_EQ, OutputAsmVariant);
+  HasOutputAsmVariantFlag = InputArgs.hasArg(OBJDUMP_output_asm_variant_EQ);
 
   parseMachOOptions(InputArgs);
 
diff --git a/llvm/utils/TableGen/Common/CodeGenInstruction.cpp b/llvm/utils/TableGen/Common/CodeGenInstruction.cpp
index ecef9caa9c3d8..c2634bee34c7e 100644
--- a/llvm/utils/TableGen/Common/CodeGenInstruction.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenInstruction.cpp
@@ -554,6 +554,14 @@ std::string CodeGenInstruction::FlattenAsmStringVariants(StringRef Cur,
 
     ++VariantsStart; // Skip the '{'.
 
+    char VariantSeparator = '|';
+    // Check for a separator override "{?x?" where x is the new separator.
+    if ((Cur.size() - VariantsStart > 3) &&
+        Cur[VariantsStart] == '?' && Cur[VariantsStart+2] == '?') {
+      VariantSeparator = Cur[VariantsStart+1];
+      VariantsStart += 3;
+    }
+
     // Scan to the end of the variants string.
     size_t VariantsEnd = VariantsStart;
     unsigned NestedBraces = 1;
@@ -569,9 +577,8 @@ std::string CodeGenInstruction::FlattenAsmStringVariants(StringRef Cur,
     StringRef Selection =
         Cur.substr(VariantsStart, VariantsEnd - VariantsStart);
     for (unsigned i = 0; i != Variant; ++i)
-      Selection = Selection.split('|').second;
-    Res += Selection.split('|').first;
-
+      Selection = Selection.split(VariantSeparator).second;
+    Res += Selection.split(VariantSeparator).first;
     assert(VariantsEnd != Cur.size() &&
            "Unterminated variants in assembly string!");
     Cur = Cur.substr(VariantsEnd + 1);

From df42172238be665f8beaa77e4ef97a55e9e07e73 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Fri, 18 Nov 2022 09:31:11 -0500
Subject: [PATCH 005/114] [SOL] Make adjustments after upgrading to llvm 15.0

---
 lld/ELF/Arch/BPF.cpp                          | 141 ++++++++++++++++++
 lld/ELF/Arch/SBF.cpp                          |   2 +-
 .../Target/BPF/MCTargetDesc/BPFAsmBackend.cpp |   1 +
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp |   1 +
 llvm/lib/Target/SBF/BTFDebug.cpp              |   5 +-
 .../SBF/Disassembler/SBFDisassembler.cpp      |   2 +-
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |   1 +
 .../SBF/MCTargetDesc/SBFInstPrinter.cpp       |   1 +
 .../SBF/MCTargetDesc/SBFMCCodeEmitter.cpp     |  16 +-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |   9 +-
 .../Target/SBF/MCTargetDesc/SBFMCTargetDesc.h |   4 +-
 llvm/lib/Target/SBF/SBF.h                     |   2 +
 .../Target/SBF/SBFAbstractMemberAccess.cpp    |  81 +++++++++-
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |   3 +
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |   5 +-
 llvm/lib/Target/SBF/SBFTargetMachine.h        |   2 +-
 16 files changed, 245 insertions(+), 31 deletions(-)
 create mode 100644 lld/ELF/Arch/BPF.cpp

diff --git a/lld/ELF/Arch/BPF.cpp b/lld/ELF/Arch/BPF.cpp
new file mode 100644
index 0000000000000..727334325f1e0
--- /dev/null
+++ b/lld/ELF/Arch/BPF.cpp
@@ -0,0 +1,141 @@
+//===- BPF.cpp ------------------------------------------------------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "InputFiles.h"
+#include "Symbols.h"
+#include "Target.h"
+#include "lld/Common/ErrorHandler.h"
+#include "llvm/Object/ELF.h"
+#include "llvm/Support/Endian.h"
+
+using namespace llvm;
+using namespace llvm::object;
+using namespace llvm::support::endian;
+using namespace llvm::ELF;
+
+namespace lld {
+namespace elf {
+
+namespace {
+class BPF final : public TargetInfo {
+public:
+  BPF();
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  int64_t getImplicitAddend(const uint8_t *buf, RelType type) const override;
+  void relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const override;
+  uint32_t calcEFlags() const override;
+};
+} // namespace
+
+BPF::BPF() {
+  relativeRel = R_BPF_64_RELATIVE;
+  symbolicRel = R_BPF_64_64;
+}
+
+RelExpr BPF::getRelExpr(RelType type, const Symbol &s,
+                        const uint8_t *loc) const {
+  switch (type) {
+    case R_BPF_64_32:
+      return R_PC;
+    case R_BPF_64_ABS32:
+    case R_BPF_64_NODYLD32:
+    case R_BPF_64_ABS64:
+    case R_BPF_64_64:
+      return R_ABS;
+    default:
+      error(getErrorLocation(loc) + "unrecognized reloc " + toString(type));
+  }
+  return R_NONE;
+}
+
+RelType BPF::getDynRel(RelType type) const {
+  switch (type) {
+    case R_BPF_64_ABS64:
+        // R_BPF_64_ABS64 is symbolic like R_BPF_64_64, which is set as our
+        // symbolicRel in the constructor. Return R_BPF_64_64 here so that if
+        // the symbol isn't preemptible, we emit a _RELATIVE relocation instead
+        // and skip emitting the symbol.
+        //
+        // See https://github.com/solana-labs/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
+        return R_BPF_64_64;
+    default:
+        return type;
+  }
+}
+
+int64_t BPF::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  return 0;
+}
+
+void BPF::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
+  switch (rel.type) {
+    case R_BPF_64_32: {
+      // Relocation of a symbol
+      write32le(loc + 4, ((val - 8) / 8) & 0xFFFFFFFF);
+      break;
+    }
+    case R_BPF_64_ABS32:
+    case R_BPF_64_NODYLD32: {
+      // Relocation used by .BTF.ext and DWARF
+      write32le(loc, val & 0xFFFFFFFF);
+      break;
+    }
+    case R_BPF_64_64: {
+      // Relocation of a lddw instruction
+      // 64 bit address is divided into the imm of this and the following
+      // instructions, lower 32 first.
+      write32le(loc + 4, val & 0xFFFFFFFF);
+      write32le(loc + 8 + 4, val >> 32);
+      break;
+    }
+    case R_BPF_64_ABS64: {
+      // The relocation type is used for normal 64-bit data. The
+      // actual to-be-relocated data is stored at r_offset and the
+      // read/write data bitsize is 64 (8 bytes). The relocation can
+      // be resolved with the symbol value plus implicit addend.
+      write64le(loc, val);
+      break;
+    }
+    default:
+      error(getErrorLocation(loc) + "unrecognized reloc " + toString(rel.type));
+  }
+}
+
+static uint32_t getEFlags(InputFile *file) {
+  if (config->ekind == ELF64BEKind)
+    return cast<ObjFile<ELF64BE>>(file)->getObj().getHeader().e_flags;
+  return cast<ObjFile<ELF64LE>>(file)->getObj().getHeader().e_flags;
+}
+
+uint32_t BPF::calcEFlags() const {
+  uint32_t ret = 0;
+
+  // Ensure that all the object files were compiled with the same flags, as
+  // different flags indicate different ABIs.
+  for (InputFile *f : ctx->objectFiles) {
+    uint32_t flags = getEFlags(f);
+    if (ret == 0) {
+      ret = flags;
+    } else if (ret != flags) {
+      error("can not link object files with incompatible flags");
+    }
+  }
+
+  return ret;
+}
+
+TargetInfo *getBPFTargetInfo() {
+  static BPF target;
+  return &target;
+}
+
+} // namespace elf
+} // namespace lld
diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
index b5358c5e3d587..809d34b2e4387 100644
--- a/lld/ELF/Arch/SBF.cpp
+++ b/lld/ELF/Arch/SBF.cpp
@@ -120,7 +120,7 @@ uint32_t SBF::calcEFlags() const {
 
   // Ensure that all the object files were compiled with the same flags, as
   // different flags indicate different ABIs.
-  for (InputFile *f : objectFiles) {
+  for (InputFile *f : ctx->objectFiles) {
     uint32_t flags = getEFlags(f);
     if (ret == 0) {
       ret = flags;
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp b/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
index 25bfb7ae143c8..fffdaa1cdc95a 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
@@ -14,6 +14,7 @@
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/EndianStream.h"
 #include <cassert>
 #include <cstdint>
diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index 4d689b434534a..e785449e2f8aa 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -14,6 +14,7 @@
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCParser/MCAsmLexer.h"
 #include "llvm/MC/MCParser/MCParsedAsmOperand.h"
 #include "llvm/MC/MCParser/MCTargetAsmParser.h"
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index b3f6e626011d7..5cd9dcb6edac4 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -22,6 +22,7 @@
 #include "llvm/MC/MCSectionELF.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/Support/LineIterator.h"
+#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 
 using namespace llvm;
@@ -909,7 +910,7 @@ void BTFDebug::emitBTFSection() {
   MCContext &Ctx = OS.getContext();
   MCSectionELF *Sec = Ctx.getELFSection(".BTF", ELF::SHT_PROGBITS, 0);
   Sec->setAlignment(Align(4));
-  OS.SwitchSection(Sec);
+  OS.switchSection(Sec);
 
   // Emit header.
   emitCommonHeader();
@@ -949,7 +950,7 @@ void BTFDebug::emitBTFExtSection() {
   MCContext &Ctx = OS.getContext();
   MCSectionELF *Sec = Ctx.getELFSection(".BTF.ext", ELF::SHT_PROGBITS, 0);
   Sec->setAlignment(Align(4));
-  OS.SwitchSection(Sec);
+  OS.switchSection(Sec);
 
   // Emit header.
   emitCommonHeader();
diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 13f2ad814bbd8..5e59172bc1ffb 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -15,8 +15,8 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCDecoderOps.h"
 #include "llvm/MC/MCDisassembler/MCDisassembler.h"
-#include "llvm/MC/MCFixedLenDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/MathExtras.h"
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 67e553265cba6..16f13fef91661 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -13,6 +13,7 @@
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCObjectWriter.h"
+#include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/EndianStream.h"
 #include <cassert>
 #include <cstdint>
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
index 5ecf2facc5448..cd61f6c6abdd7 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
@@ -15,6 +15,7 @@
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSymbol.h"
+#include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormattedStream.h"
 using namespace llvm;
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
index 2b7fe22684b25..e54284f636b78 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
@@ -62,26 +62,18 @@ class SBFMCCodeEmitter : public MCCodeEmitter {
   void encodeInstruction(const MCInst &MI, raw_ostream &OS,
                          SmallVectorImpl<MCFixup> &Fixups,
                          const MCSubtargetInfo &STI) const override;
-
-private:
-  FeatureBitset computeAvailableFeatures(const FeatureBitset &FB) const;
-  void
-  verifyInstructionPredicates(const MCInst &MI,
-                              const FeatureBitset &AvailableFeatures) const;
 };
 
 } // end anonymous namespace
 
 MCCodeEmitter *llvm::createSBFMCCodeEmitter(const MCInstrInfo &MCII,
-                                            const MCRegisterInfo &MRI,
                                             MCContext &Ctx) {
-  return new SBFMCCodeEmitter(MCII, MRI, true);
+  return new SBFMCCodeEmitter(MCII, *Ctx.getRegisterInfo(), true);
 }
 
 MCCodeEmitter *llvm::createSBFbeMCCodeEmitter(const MCInstrInfo &MCII,
-                                              const MCRegisterInfo &MRI,
                                               MCContext &Ctx) {
-  return new SBFMCCodeEmitter(MCII, MRI, false);
+  return new SBFMCCodeEmitter(MCII, *Ctx.getRegisterInfo(), false);
 }
 
 unsigned SBFMCCodeEmitter::getMachineOpValue(const MCInst &MI,
@@ -119,9 +111,6 @@ static uint8_t SwapBits(uint8_t Val)
 void SBFMCCodeEmitter::encodeInstruction(const MCInst &MI, raw_ostream &OS,
                                          SmallVectorImpl<MCFixup> &Fixups,
                                          const MCSubtargetInfo &STI) const {
-  verifyInstructionPredicates(MI,
-                              computeAvailableFeatures(STI.getFeatureBits()));
-
   unsigned Opcode = MI.getOpcode();
   support::endian::Writer OSE(OS,
                               IsLittleEndian ? support::little : support::big);
@@ -176,5 +165,4 @@ uint64_t SBFMCCodeEmitter::getMemoryOpValue(const MCInst &MI, unsigned Op,
   return Encoding;
 }
 
-#define ENABLE_INSTR_PREDICATE_VERIFIER
 #include "SBFGenMCCodeEmitter.inc"
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 47c410ca11a71..3b02cad05554d 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -16,6 +16,7 @@
 #include "TargetInfo/SBFTargetInfo.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/MC/MCAsmBackend.h"
+#include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFStreamer.h"
@@ -28,6 +29,7 @@
 #include "llvm/Support/Host.h"
 
 #define GET_INSTRINFO_MC_DESC
+#define ENABLE_INSTR_PREDICATE_VERIFIER
 #include "SBFGenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_MC_DESC
@@ -62,15 +64,12 @@ static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
                                        bool RelaxAll) {
   MCELFStreamer *S =
       new MCELFStreamer(Ctx, std::move(MAB), std::move(OW), std::move(Emitter));
-  MCAssembler &A = S->getAssembler();
   if (RelaxAll)
-    A.setRelaxAll(true);
-
+    S->getAssembler().setRelaxAll(true);
   const MCSubtargetInfo *STI = Ctx.getSubtargetInfo();
   if (STI->getCPU() == "sbfv2") {
-    A.setELFHeaderEFlags(llvm::ELF::EF_SBF_V2);
+    S->getAssembler().setELFHeaderEFlags(llvm::ELF::EF_SBF_V2);
   }
-
   return S;
 }
 
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
index aa2460ee6523f..cbf4fc9b0a52b 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
@@ -14,6 +14,7 @@
 #define LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCTARGETDESC_H
 
 #include "llvm/Config/config.h"
+#include "llvm/MC/MCContext.h"
 #include "llvm/Support/DataTypes.h"
 
 #include <memory>
@@ -30,10 +31,8 @@ class MCTargetOptions;
 class Target;
 
 MCCodeEmitter *createSBFMCCodeEmitter(const MCInstrInfo &MCII,
-                                      const MCRegisterInfo &MRI,
                                       MCContext &Ctx);
 MCCodeEmitter *createSBFbeMCCodeEmitter(const MCInstrInfo &MCII,
-                                        const MCRegisterInfo &MRI,
                                         MCContext &Ctx);
 
 MCAsmBackend *createSBFAsmBackend(const Target &T, const MCSubtargetInfo &STI,
@@ -56,6 +55,7 @@ createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64);
 // Defines symbolic names for the SBF instructions.
 //
 #define GET_INSTRINFO_ENUM
+#define GET_INSTRINFO_MC_HELPER_DECLS
 #include "SBFGenInstrInfo.inc"
 
 #define GET_SUBTARGETINFO_ENUM
diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
index e4e9cd28a72bd..6820de3120760 100644
--- a/llvm/lib/Target/SBF/SBF.h
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -11,6 +11,8 @@
 
 #include "MCTargetDesc/SBFMCTargetDesc.h"
 #include "llvm/IR/PassManager.h"
+#include "llvm/Pass.h"
+#include "llvm/PassRegistry.h"
 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
index 3293f506dcc52..4d36183719b8b 100644
--- a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -148,6 +148,13 @@ class SBFAbstractMemberAccess final {
   // The base call is not an input of any other preserve_*
   // intrinsics.
   std::map<CallInst *, CallInfo> BaseAICalls;
+  // A map to hold <AnonRecord, TypeDef> relationships
+  std::map<DICompositeType *, DIDerivedType *> AnonRecords;
+
+  void CheckAnonRecordType(DIDerivedType *ParentTy, DIType *Ty);
+  void CheckCompositeType(DIDerivedType *ParentTy, DICompositeType *CTy);
+  void CheckDerivedType(DIDerivedType *ParentTy, DIDerivedType *DTy);
+  void ResetMetadata(struct CallInfo &CInfo);
 
   bool doTransformation(Function &F);
 
@@ -220,10 +227,80 @@ bool SBFAbstractMemberAccess::run(Function &F) {
   if (M->debug_compile_units().empty())
     return false;
 
+  // For each argument/return/local_variable type, trace the type
+  // pattern like '[derived_type]* [composite_type]' to check
+  // and remember (anon record -> typedef) relations where the
+  // anon record is defined as
+  //   typedef [const/volatile/restrict]* [anon record]
+  DISubprogram *SP = F.getSubprogram();
+  if (SP && SP->isDefinition()) {
+    for (DIType *Ty: SP->getType()->getTypeArray())
+      CheckAnonRecordType(nullptr, Ty);
+    for (const DINode *DN : SP->getRetainedNodes()) {
+      if (const auto *DV = dyn_cast<DILocalVariable>(DN))
+        CheckAnonRecordType(nullptr, DV->getType());
+    }
+  }
+
   DL = &M->getDataLayout();
   return doTransformation(F);
 }
 
+void SBFAbstractMemberAccess::ResetMetadata(struct CallInfo &CInfo) {
+  if (auto Ty = dyn_cast<DICompositeType>(CInfo.Metadata)) {
+    if (AnonRecords.find(Ty) != AnonRecords.end()) {
+      if (AnonRecords[Ty] != nullptr)
+        CInfo.Metadata = AnonRecords[Ty];
+    }
+  }
+}
+
+void SBFAbstractMemberAccess::CheckCompositeType(DIDerivedType *ParentTy,
+                                                 DICompositeType *CTy) {
+  if (!CTy->getName().empty() || !ParentTy ||
+      ParentTy->getTag() != dwarf::DW_TAG_typedef)
+    return;
+
+  if (AnonRecords.find(CTy) == AnonRecords.end()) {
+    AnonRecords[CTy] = ParentTy;
+    return;
+  }
+
+  // Two or more typedef's may point to the same anon record.
+  // If this is the case, set the typedef DIType to be nullptr
+  // to indicate the duplication case.
+  DIDerivedType *CurrTy = AnonRecords[CTy];
+  if (CurrTy == ParentTy)
+    return;
+  AnonRecords[CTy] = nullptr;
+}
+
+void SBFAbstractMemberAccess::CheckDerivedType(DIDerivedType *ParentTy,
+                                               DIDerivedType *DTy) {
+  DIType *BaseType = DTy->getBaseType();
+  if (!BaseType)
+    return;
+
+  unsigned Tag = DTy->getTag();
+  if (Tag == dwarf::DW_TAG_pointer_type)
+    CheckAnonRecordType(nullptr, BaseType);
+  else if (Tag == dwarf::DW_TAG_typedef)
+    CheckAnonRecordType(DTy, BaseType);
+  else
+    CheckAnonRecordType(ParentTy, BaseType);
+}
+
+void SBFAbstractMemberAccess::CheckAnonRecordType(DIDerivedType *ParentTy,
+                                                  DIType *Ty) {
+  if (!Ty)
+    return;
+
+  if (auto *CTy = dyn_cast<DICompositeType>(Ty))
+    return CheckCompositeType(ParentTy, CTy);
+  else if (auto *DTy = dyn_cast<DIDerivedType>(Ty))
+    return CheckDerivedType(ParentTy, DTy);
+}
+
 static bool SkipDIDerivedTag(unsigned Tag, bool skipTypedef) {
   if (Tag != dwarf::DW_TAG_typedef && Tag != dwarf::DW_TAG_const_type &&
       Tag != dwarf::DW_TAG_volatile_type &&
@@ -297,10 +374,9 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
       report_fatal_error("Missing metadata for llvm.preserve.union.access.index intrinsic");
+    ResetMetadata(CInfo);
     CInfo.AccessIndex = getConstant(Call->getArgOperand(1));
     CInfo.Base = Call->getArgOperand(0);
-    CInfo.RecordAlignment =
-        DL->getABITypeAlign(CInfo.Base->getType()->getPointerElementType());
     return true;
   }
   if (GV->getName().startswith("llvm.preserve.struct.access.index")) {
@@ -308,6 +384,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
       report_fatal_error("Missing metadata for llvm.preserve.struct.access.index intrinsic");
+    ResetMetadata(CInfo);
     CInfo.AccessIndex = getConstant(Call->getArgOperand(2));
     CInfo.Base = Call->getArgOperand(0);
     CInfo.RecordAlignment = DL->getABITypeAlign(getBaseElementType(Call));
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index 52c5ef6580e04..9d238b8b4b572 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -148,6 +148,9 @@ bool SBFAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
 }
 
 void SBFAsmPrinter::emitInstruction(const MachineInstr *MI) {
+  SBF_MC::verifyInstructionPredicates(MI->getOpcode(),
+                                      getSubtargetInfo().getFeatureBits());
+
   MCInst TmpInst;
 
   if (!BTF || !BTF->InstLower(MI, TmpInst)) {
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 2d28f3745d694..37137583a47a5 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -53,12 +53,11 @@ static std::string computeDataLayout(const Triple &TT, StringRef FS) {
   // TOOD: jle; specialize this (and elsewhere) to Solana-only once the new
   // back-end is integrated; e.g. we won't need IsSolana, etc.
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
-  bool IsSolana = true;
   return "e-m:e-p:64:64-i64:64-n32:64-S128";
 }
 
 static Reloc::Model getEffectiveRelocModel(Optional<Reloc::Model> RM) {
-  return RM.getValueOr(Reloc::PIC_);
+  return RM.value_or(Reloc::PIC_);
 }
 
 SBFTargetMachine::SBFTargetMachine(const Target &T, const Triple &TT,
@@ -149,7 +148,7 @@ void SBFPassConfig::addIRPasses() {
 }
 
 TargetTransformInfo
-SBFTargetMachine::getTargetTransformInfo(const Function &F) {
+SBFTargetMachine::getTargetTransformInfo(const Function &F) const {
   return TargetTransformInfo(SBFTTIImpl(this, F));
 }
 
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
index fef53a882d583..7a00badff12d4 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.h
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -34,7 +34,7 @@ class SBFTargetMachine : public LLVMTargetMachine {
 
   TargetPassConfig *createPassConfig(PassManagerBase &PM) override;
 
-  TargetTransformInfo getTargetTransformInfo(const Function &F) override;
+  TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
 
   TargetLoweringObjectFile *getObjFileLowering() const override {
     return TLOF.get();

From 6fe8c209fa2bd9a10068d32f265b036f12e19635 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Wed, 23 Nov 2022 16:40:08 -0500
Subject: [PATCH 006/114] [SOL] Adjust tests

---
 clang/test/CodeGen/ext-int-cc.c            | 1 +
 llvm/include/llvm/TargetParser/Triple.h    | 6 ++++++
 llvm/test/CodeGen/SBF/intrinsics.ll        | 2 +-
 llvm/test/CodeGen/SBF/rodata_1.ll          | 3 +--
 llvm/test/CodeGen/SBF/rodata_3.ll          | 4 ++--
 llvm/test/CodeGen/SBF/rodata_5.ll          | 2 +-
 llvm/unittests/TargetParser/TripleTest.cpp | 4 +++-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/clang/test/CodeGen/ext-int-cc.c b/clang/test/CodeGen/ext-int-cc.c
index 14efd54e24ffb..33a85dfbd078c 100644
--- a/clang/test/CodeGen/ext-int-cc.c
+++ b/clang/test/CodeGen/ext-int-cc.c
@@ -29,6 +29,7 @@
 // RUN: %clang_cc1 -no-enable-noundef-analysis -triple arm -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=ARM
 // RUN: %clang_cc1 -no-enable-noundef-analysis -triple loongarch64 -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=LA64
 // RUN: %clang_cc1 -no-enable-noundef-analysis -triple loongarch32 -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=LA32
+// RUN: %clang_cc1 -no-opaque-pointers -no-enable-noundef-analysis -triple sbf -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=SBF
 
 // Make sure 128 and 64 bit versions are passed like integers.
 void ParamPassing(_BitInt(128) b, _BitInt(64) c) {}
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index c1b366cd73849..d5a759a32b4dd 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -194,6 +194,7 @@ class Triple {
     SUSE,
     OpenEmbedded,
     Intel,
+    Solana,
     LastVendorType = Intel
   };
   enum OSType {
@@ -782,6 +783,11 @@ class Triple {
     return getObjectFormat() == Triple::DXContainer;
   }
 
+  /// Tests whether the OS is Solana.
+  bool isOSSolana() const {
+    return getOS() == Triple::SolanaOS;
+  }
+
   /// Tests whether the target is the PS4 platform.
   bool isPS4() const {
     return getArch() == Triple::x86_64 &&
diff --git a/llvm/test/CodeGen/SBF/intrinsics.ll b/llvm/test/CodeGen/SBF/intrinsics.ll
index b9cd138c5eff0..4e22c8ebb3770 100644
--- a/llvm/test/CodeGen/SBF/intrinsics.ll
+++ b/llvm/test/CodeGen/SBF/intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: not --crash llc -march=sbf <%s 2>&1 | FileCheck --check-prefix=CHECK-SBF %s
+; RUN: not llc < %s -march=sbf 2>&1 | FileCheck --check-prefix=CHECK-SBF %s
 
 ; CHECK-SBF: LLVM ERROR: llvm.bpf.load.* intrinsics are not supported in SBF
 
diff --git a/llvm/test/CodeGen/SBF/rodata_1.ll b/llvm/test/CodeGen/SBF/rodata_1.ll
index a2729cf32ff1f..a05923df9fdfb 100644
--- a/llvm/test/CodeGen/SBF/rodata_1.ll
+++ b/llvm/test/CodeGen/SBF/rodata_1.ll
@@ -39,10 +39,9 @@ entry:
 ; CHECK: stxb [r1 + 2], r2
 ; CHECK: mov64 r3, 0
 ; CHECK: stxh [r1 + 0], r3
-
 ; CHECK: lddw r1, g2
-; CHECK: stxdw [r1 + 0], r3
 ; CHECK: stxdw [r1 + 8], r2
+; CHECK: stxdw [r1 + 0], r3
 ; CHECK: stxw [r1 + 16], r3
 
     ret i32 0
diff --git a/llvm/test/CodeGen/SBF/rodata_3.ll b/llvm/test/CodeGen/SBF/rodata_3.ll
index 7b62c1399ed60..36f9749b611a4 100644
--- a/llvm/test/CodeGen/SBF/rodata_3.ll
+++ b/llvm/test/CodeGen/SBF/rodata_3.ll
@@ -26,10 +26,10 @@ define i32 @test() local_unnamed_addr #0 {
 entry:
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 getelementptr inbounds (%struct.test_t1, %struct.test_t1* @g, i64 0, i32 0), i8* align 4 getelementptr inbounds (%struct.test_t1, %struct.test_t1* @test.t1, i64 0, i32 0), i64 16, i1 false)
 ; CHECK-EL: lddw r1, g
-; CHECK-EL: mov64 r2, 0
-; CHECK-EL: stxdw [r1 + 8], r2
 ; CHECK-EL: mov64 r2, 1
 ; CHECK-EL: stxdw [r1 + 0], r2
+; CHECK-EL: mov64 r2, 0
+; CHECK-EL: stxdw [r1 + 8], r2
     ret i32 0
 }
 ; CHECK-EL:  .section .rodata.cst16,"aM",@progbits,16
diff --git a/llvm/test/CodeGen/SBF/rodata_5.ll b/llvm/test/CodeGen/SBF/rodata_5.ll
index 5b590083acf15..2f709884fb5e7 100644
--- a/llvm/test/CodeGen/SBF/rodata_5.ll
+++ b/llvm/test/CodeGen/SBF/rodata_5.ll
@@ -34,8 +34,8 @@ entry:
 }
 ; CHECK-NOT:    ldxh w{{[0-9]+}},
 ; CHECK-NOT:    ldxb w{{[0-9]+}},
-; CHECK:        stxb [r10 - 2], w{{[0-9]+}}
 ; CHECK:        stxh [r10 - 4], w{{[0-9]+}}
+; CHECK:        stxb [r10 - 2], w{{[0-9]+}}
 
 ; Function Attrs: argmemonly nounwind willreturn
 declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture)
diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp
index 0e298fbe322d9..676c795378b30 100644
--- a/llvm/unittests/TargetParser/TripleTest.cpp
+++ b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -1594,6 +1594,8 @@ TEST(TripleTest, Normalization) {
   }
   for (int Vendor = FirstVendorType; Vendor <= Triple::LastVendorType;
        ++Vendor) {
+    if (Vendor == Triple::Solana)
+      continue;
     StringRef C[] = {InitialC[0], InitialC[1], InitialC[2], InitialC[3]};
     C[1] = Triple::getVendorTypeName(Triple::VendorType(Vendor));
     std::string E = Join(C[0], C[1], C[2]);
@@ -1608,7 +1610,7 @@ TEST(TripleTest, Normalization) {
     } while (std::next_permutation(std::begin(J), std::end(J)));
   }
   for (int OS = FirstOSType; OS <= Triple::LastOSType; ++OS) {
-    if (OS == Triple::Win32)
+    if (OS == Triple::Win32 || OS == Triple::SolanaOS)
       continue;
     StringRef C[] = {InitialC[0], InitialC[1], InitialC[2], InitialC[3]};
     C[2] = Triple::getOSTypeName(Triple::OSType(OS));

From f2d6251e3fe5b52e4b6f48dd1deb83af0bfe15e6 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Wed, 23 Nov 2022 16:44:04 -0500
Subject: [PATCH 007/114] [SOL] Adjust github workflow

---
 .github/workflows/llvm-project-tests.yml |  3 +++
 .github/workflows/llvm-tests.yml         | 16 +++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 4ff84c511250f..1c6b97e595e6e 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -109,6 +109,8 @@ jobs:
           key: ${{ matrix.os }}
           variant: sccache
       - name: Build and Test
+        if: "!startsWith(matrix.os, 'windows') || inputs.projects != 'lld'"
+        uses: llvm/actions/build-test-llvm-project@main
         env:
           # Workaround for https://github.com/actions/virtual-environments/issues/5900.
           # This should be a no-op for non-mac OSes
@@ -138,6 +140,7 @@ jobs:
                 -DLLVM_ENABLE_ASSERTIONS=ON \
                 -DLLDB_INCLUDE_TESTS=OFF \
                 -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" \
+                -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="BPF;SBF" \
                 -DCMAKE_C_COMPILER_LAUNCHER=sccache \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
                 $extra_cmake_args \
diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml
index e2ca2ff44890e..4b37a076373f4 100644
--- a/.github/workflows/llvm-tests.yml
+++ b/.github/workflows/llvm-tests.yml
@@ -6,14 +6,16 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    branches:
-      - 'release/**'
+    ignore-forks: true
+    #branches:
+    #  - 'release/**'
     paths:
       - 'llvm/**'
       - '.github/workflows/llvm-tests.yml'
   pull_request:
-    branches:
-      - 'release/**'
+    ignore-forks: true
+    #branches:
+    #  - 'release/**'
     paths:
       - 'llvm/**'
       - '.github/workflows/llvm-tests.yml'
@@ -26,7 +28,7 @@ concurrency:
 
 jobs:
   abi-dump-setup:
-    if: github.repository_owner == 'llvm'
+    #if: github.repository_owner == 'llvm'
     runs-on: ubuntu-latest
     outputs:
       BASELINE_REF: ${{ steps.vars.outputs.BASELINE_REF }}
@@ -69,7 +71,7 @@ jobs:
           fi
 
   abi-dump:
-    if: github.repository_owner == 'llvm'
+    #if: github.repository_owner == 'llvm'
     needs: abi-dump-setup
     runs-on: ubuntu-latest
     strategy:
@@ -141,7 +143,7 @@ jobs:
           path: llvm.symbols
 
   abi-compare:
-    if: github.repository_owner == 'llvm'
+    #if: github.repository_owner == 'llvm'
     runs-on: ubuntu-latest
     needs:
       - abi-dump-setup

From 5a0ea6e7550b5c9eddc50aa7a1a11d0756d78904 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Mon, 28 Nov 2022 17:29:32 -0500
Subject: [PATCH 008/114] [SOL] Update SBF BTF with upstream changes

---
 llvm/lib/Target/SBF/BTF.def      |   1 +
 llvm/lib/Target/SBF/BTF.h        |  12 ++
 llvm/lib/Target/SBF/BTFDebug.cpp | 192 +++++++++++++++++++++++--------
 llvm/lib/Target/SBF/BTFDebug.h   |  26 ++++-
 4 files changed, 181 insertions(+), 50 deletions(-)

diff --git a/llvm/lib/Target/SBF/BTF.def b/llvm/lib/Target/SBF/BTF.def
index 0ae4194bc512e..1de0e51b47570 100644
--- a/llvm/lib/Target/SBF/BTF.def
+++ b/llvm/lib/Target/SBF/BTF.def
@@ -33,5 +33,6 @@ HANDLE_BTF_KIND(15, DATASEC)
 HANDLE_BTF_KIND(16, FLOAT)
 HANDLE_BTF_KIND(17, DECL_TAG)
 HANDLE_BTF_KIND(18, TYPE_TAG)
+HANDLE_BTF_KIND(19, ENUM64)
 
 #undef HANDLE_BTF_KIND
diff --git a/llvm/lib/Target/SBF/BTF.h b/llvm/lib/Target/SBF/BTF.h
index 89fe9e9f4c9d3..52e6182ec32f8 100644
--- a/llvm/lib/Target/SBF/BTF.h
+++ b/llvm/lib/Target/SBF/BTF.h
@@ -48,6 +48,8 @@
 #ifndef LLVM_LIB_TARGET_SBF_BTF_H
 #define LLVM_LIB_TARGET_SBF_BTF_H
 
+#include <cstdint>
+
 namespace llvm {
 namespace BTF {
 
@@ -60,6 +62,7 @@ enum {
   CommonTypeSize = 12,
   BTFArraySize = 12,
   BTFEnumSize = 8,
+  BTFEnum64Size = 12,
   BTFMemberSize = 12,
   BTFParamSize = 8,
   BTFDataSecVarSize = 12,
@@ -145,6 +148,15 @@ struct BTFEnum {
   int32_t Val;      ///< Enum member value
 };
 
+/// BTF_KIND_ENUM64 is followed by multiple "struct BTFEnum64".
+/// The exact number of BTFEnum64 is stored in the vlen (of the
+/// info in "struct CommonType").
+struct BTFEnum64 {
+  uint32_t NameOff; ///< Enum name offset in the string table
+  uint32_t Val_Lo32;     ///< Enum member lo32 value
+  uint32_t Val_Hi32;     ///< Enum member hi32 value
+};
+
 /// BTF_KIND_ARRAY is followed by one "struct BTFArray".
 struct BTFArray {
   uint32_t ElemType;  ///< Element type
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index 5cd9dcb6edac4..5f2595903c865 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -163,9 +163,10 @@ void BTFTypeInt::emitType(MCStreamer &OS) {
   OS.emitInt32(IntVal);
 }
 
-BTFTypeEnum::BTFTypeEnum(const DICompositeType *ETy, uint32_t VLen) : ETy(ETy) {
+BTFTypeEnum::BTFTypeEnum(const DICompositeType *ETy, uint32_t VLen,
+    bool IsSigned) : ETy(ETy) {
   Kind = BTF::BTF_KIND_ENUM;
-  BTFType.Info = Kind << 24 | VLen;
+  BTFType.Info = IsSigned << 31 | Kind << 24 | VLen;
   BTFType.Size = roundupToBytes(ETy->getSizeInBits());
 }
 
@@ -201,6 +202,48 @@ void BTFTypeEnum::emitType(MCStreamer &OS) {
   }
 }
 
+BTFTypeEnum64::BTFTypeEnum64(const DICompositeType *ETy, uint32_t VLen,
+    bool IsSigned) : ETy(ETy) {
+  Kind = BTF::BTF_KIND_ENUM64;
+  BTFType.Info = IsSigned << 31 | Kind << 24 | VLen;
+  BTFType.Size = roundupToBytes(ETy->getSizeInBits());
+}
+
+void BTFTypeEnum64::completeType(BTFDebug &BDebug) {
+  if (IsCompleted)
+    return;
+  IsCompleted = true;
+
+  BTFType.NameOff = BDebug.addString(ETy->getName());
+
+  DINodeArray Elements = ETy->getElements();
+  for (const auto Element : Elements) {
+    const auto *Enum = cast<DIEnumerator>(Element);
+
+    struct BTF::BTFEnum64 BTFEnum;
+    BTFEnum.NameOff = BDebug.addString(Enum->getName());
+    uint64_t Value;
+    if (Enum->isUnsigned())
+      Value = static_cast<uint64_t>(Enum->getValue().getZExtValue());
+    else
+      Value = static_cast<uint64_t>(Enum->getValue().getSExtValue());
+    BTFEnum.Val_Lo32 = Value;
+    BTFEnum.Val_Hi32 = Value >> 32;
+    EnumValues.push_back(BTFEnum);
+  }
+}
+
+void BTFTypeEnum64::emitType(MCStreamer &OS) {
+  BTFTypeBase::emitType(OS);
+  for (const auto &Enum : EnumValues) {
+    OS.emitInt32(Enum.NameOff);
+    OS.AddComment("0x" + Twine::utohexstr(Enum.Val_Lo32));
+    OS.emitInt32(Enum.Val_Lo32);
+    OS.AddComment("0x" + Twine::utohexstr(Enum.Val_Hi32));
+    OS.emitInt32(Enum.Val_Hi32);
+  }
+}
+
 BTFTypeArray::BTFTypeArray(uint32_t ElemTypeId, uint32_t NumElems) {
   Kind = BTF::BTF_KIND_ARRAY;
   BTFType.NameOff = 0;
@@ -554,6 +597,46 @@ void BTFDebug::processDeclAnnotations(DINodeArray Annotations,
   }
 }
 
+/// Generate btf_type_tag chains.
+int BTFDebug::genBTFTypeTags(const DIDerivedType *DTy, int BaseTypeId) {
+  SmallVector<const MDString *, 4> MDStrs;
+  DINodeArray Annots = DTy->getAnnotations();
+  if (Annots) {
+    // For type with "int __tag1 __tag2 *p", the MDStrs will have
+    // content: [__tag1, __tag2].
+    for (const Metadata *Annotations : Annots->operands()) {
+      const MDNode *MD = cast<MDNode>(Annotations);
+      const MDString *Name = cast<MDString>(MD->getOperand(0));
+      if (!Name->getString().equals("btf_type_tag"))
+        continue;
+      MDStrs.push_back(cast<MDString>(MD->getOperand(1)));
+    }
+  }
+
+  if (MDStrs.size() == 0)
+    return -1;
+
+  // With MDStrs [__tag1, __tag2], the output type chain looks like
+  //   PTR -> __tag2 -> __tag1 -> BaseType
+  // In the below, we construct BTF types with the order of __tag1, __tag2
+  // and PTR.
+  unsigned TmpTypeId;
+  std::unique_ptr<BTFTypeTypeTag> TypeEntry;
+  if (BaseTypeId >= 0)
+    TypeEntry =
+        std::make_unique<BTFTypeTypeTag>(BaseTypeId, MDStrs[0]->getString());
+  else
+    TypeEntry = std::make_unique<BTFTypeTypeTag>(DTy, MDStrs[0]->getString());
+  TmpTypeId = addType(std::move(TypeEntry));
+
+  for (unsigned I = 1; I < MDStrs.size(); I++) {
+    const MDString *Value = MDStrs[I];
+    TypeEntry = std::make_unique<BTFTypeTypeTag>(TmpTypeId, Value->getString());
+    TmpTypeId = addType(std::move(TypeEntry));
+  }
+  return TmpTypeId;
+}
+
 /// Handle structure/union types.
 void BTFDebug::visitStructType(const DICompositeType *CTy, bool IsStruct,
                                uint32_t &TypeId) {
@@ -635,8 +718,25 @@ void BTFDebug::visitEnumType(const DICompositeType *CTy, uint32_t &TypeId) {
   if (VLen > BTF::MAX_VLEN)
     return;
 
-  auto TypeEntry = std::make_unique<BTFTypeEnum>(CTy, VLen);
-  TypeId = addType(std::move(TypeEntry), CTy);
+  bool IsSigned = false;
+  unsigned NumBits = 32;
+  // No BaseType implies forward declaration in which case a
+  // BTFTypeEnum with Vlen = 0 is emitted.
+  if (CTy->getBaseType() != nullptr) {
+    const auto *BTy = cast<DIBasicType>(CTy->getBaseType());
+    IsSigned = BTy->getEncoding() == dwarf::DW_ATE_signed ||
+               BTy->getEncoding() == dwarf::DW_ATE_signed_char;
+    NumBits = BTy->getSizeInBits();
+  }
+
+  if (NumBits <= 32) {
+    auto TypeEntry = std::make_unique<BTFTypeEnum>(CTy, VLen, IsSigned);
+    TypeId = addType(std::move(TypeEntry), CTy);
+  } else {
+    assert(NumBits == 64);
+    auto TypeEntry = std::make_unique<BTFTypeEnum64>(CTy, VLen, IsSigned);
+    TypeId = addType(std::move(TypeEntry), CTy);
+  }
   // No need to visit base type as BTF does not encode it.
 }
 
@@ -686,9 +786,8 @@ void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
           /// pointee type will be replaced with either a real type or
           /// a forward declaration.
           auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, true);
-          auto &Fixup = FixupDerivedTypes[CTy->getName()];
-          Fixup.first = CTag == dwarf::DW_TAG_union_type;
-          Fixup.second.push_back(TypeEntry.get());
+          auto &Fixup = FixupDerivedTypes[CTy];
+          Fixup.push_back(std::make_pair(DTy, TypeEntry.get()));
           TypeId = addType(std::move(TypeEntry), DTy);
           return;
         }
@@ -697,34 +796,8 @@ void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
   }
 
   if (Tag == dwarf::DW_TAG_pointer_type) {
-    SmallVector<const MDString *, 4> MDStrs;
-    DINodeArray Annots = DTy->getAnnotations();
-    if (Annots) {
-      // For type with "int __tag1 __tag2 *p", the MDStrs will have
-      // content: [__tag1, __tag2].
-      for (const Metadata *Annotations : Annots->operands()) {
-        const MDNode *MD = cast<MDNode>(Annotations);
-        const MDString *Name = cast<MDString>(MD->getOperand(0));
-        if (!Name->getString().equals("btf_type_tag"))
-          continue;
-        MDStrs.push_back(cast<MDString>(MD->getOperand(1)));
-      }
-    }
-
-    if (MDStrs.size() > 0) {
-      // With MDStrs [__tag1, __tag2], the output type chain looks like
-      //   PTR -> __tag2 -> __tag1 -> BaseType
-      // In the below, we construct BTF types with the order of __tag1, __tag2
-      // and PTR.
-      auto TypeEntry =
-          std::make_unique<BTFTypeTypeTag>(DTy, MDStrs[0]->getString());
-      unsigned TmpTypeId = addType(std::move(TypeEntry));
-      for (unsigned I = 1; I < MDStrs.size(); I++) {
-        const MDString *Value = MDStrs[I];
-        TypeEntry =
-            std::make_unique<BTFTypeTypeTag>(TmpTypeId, Value->getString());
-        TmpTypeId = addType(std::move(TypeEntry));
-      }
+    int TmpTypeId = genBTFTypeTags(DTy, -1);
+    if (TmpTypeId >= 0) {
       auto TypeDEntry =
           std::make_unique<BTFTypeDerived>(TmpTypeId, Tag, DTy->getName());
       TypeId = addType(std::move(TypeDEntry), DTy);
@@ -775,15 +848,31 @@ void BTFDebug::visitTypeEntry(const DIType *Ty, uint32_t &TypeId,
     // already defined, we should keep moving to eventually
     // bring in types for "struct t". Otherwise, the "struct s2"
     // definition won't be correct.
+    //
+    // In the above, we have following debuginfo:
+    //  {ptr, struct_member} ->  typedef -> struct
+    // and BTF type for 'typedef' is generated while 'struct' may
+    // be in FixUp. But let us generalize the above to handle
+    //  {different types} -> [various derived types]+ -> another type.
+    // For example,
+    //  {func_param, struct_member} -> const -> ptr -> volatile -> struct
+    // We will traverse const/ptr/volatile which already have corresponding
+    // BTF types and generate type for 'struct' which might be in Fixup
+    // state.
     if (Ty && (!CheckPointer || !SeenPointer)) {
       if (const auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
-        unsigned Tag = DTy->getTag();
-        if (Tag == dwarf::DW_TAG_typedef || Tag == dwarf::DW_TAG_const_type ||
-            Tag == dwarf::DW_TAG_volatile_type ||
-            Tag == dwarf::DW_TAG_restrict_type) {
-          uint32_t TmpTypeId;
-          visitTypeEntry(DTy->getBaseType(), TmpTypeId, CheckPointer,
-                         SeenPointer);
+        while (DTy) {
+          const DIType *BaseTy = DTy->getBaseType();
+          if (!BaseTy)
+            break;
+
+          if (DIToIdMap.find(BaseTy) != DIToIdMap.end()) {
+            DTy = dyn_cast<DIDerivedType>(BaseTy);
+          } else {
+            uint32_t TmpTypeId;
+            visitTypeEntry(BaseTy, TmpTypeId, CheckPointer, SeenPointer);
+            break;
+          }
         }
       }
     }
@@ -1439,9 +1528,8 @@ void BTFDebug::processFuncPrototypes(const Function *F) {
     return;
 
   // Do not emit again if already emitted.
-  if (ProtoFunctions.find(F) != ProtoFunctions.end())
+  if (!ProtoFunctions.insert(F).second)
     return;
-  ProtoFunctions.insert(F);
 
   uint32_t ProtoTypeId;
   const std::unordered_map<uint32_t, StringRef> FuncArgNames;
@@ -1483,8 +1571,9 @@ void BTFDebug::endModule() {
 
   // Fixups
   for (auto &Fixup : FixupDerivedTypes) {
-    StringRef TypeName = Fixup.first;
-    bool IsUnion = Fixup.second.first;
+    const DICompositeType *CTy = Fixup.first;
+    StringRef TypeName = CTy->getName();
+    bool IsUnion = CTy->getTag() == dwarf::DW_TAG_union_type;
 
     // Search through struct types
     uint32_t StructTypeId = 0;
@@ -1500,8 +1589,15 @@ void BTFDebug::endModule() {
       StructTypeId = addType(std::move(FwdTypeEntry));
     }
 
-    for (auto &DType : Fixup.second.second) {
-      DType->setPointeeType(StructTypeId);
+    for (auto &TypeInfo : Fixup.second) {
+      const DIDerivedType *DTy = TypeInfo.first;
+      BTFTypeDerived *BDType = TypeInfo.second;
+
+      int TmpTypeId = genBTFTypeTags(DTy, StructTypeId);
+      if (TmpTypeId >= 0)
+        BDType->setPointeeType(TmpTypeId);
+      else
+        BDType->setPointeeType(StructTypeId);
     }
   }
 
diff --git a/llvm/lib/Target/SBF/BTFDebug.h b/llvm/lib/Target/SBF/BTFDebug.h
index 941e1bbae7f88..2222ac516284b 100644
--- a/llvm/lib/Target/SBF/BTFDebug.h
+++ b/llvm/lib/Target/SBF/BTFDebug.h
@@ -106,7 +106,7 @@ class BTFTypeEnum : public BTFTypeBase {
   std::vector<struct BTF::BTFEnum> EnumValues;
 
 public:
-  BTFTypeEnum(const DICompositeType *ETy, uint32_t NumValues);
+  BTFTypeEnum(const DICompositeType *ETy, uint32_t NumValues, bool IsSigned);
   uint32_t getSize() override {
     return BTFTypeBase::getSize() + EnumValues.size() * BTF::BTFEnumSize;
   }
@@ -221,6 +221,20 @@ class BTFTypeDeclTag : public BTFTypeBase {
   void emitType(MCStreamer &OS) override;
 };
 
+/// Handle 64-bit enumerate type.
+class BTFTypeEnum64 : public BTFTypeBase {
+  const DICompositeType *ETy;
+  std::vector<struct BTF::BTFEnum64> EnumValues;
+
+public:
+  BTFTypeEnum64(const DICompositeType *ETy, uint32_t NumValues, bool IsSigned);
+  uint32_t getSize() override {
+    return BTFTypeBase::getSize() + EnumValues.size() * BTF::BTFEnum64Size;
+  }
+  void completeType(BTFDebug &BDebug) override;
+  void emitType(MCStreamer &OS) override;
+};
+
 class BTFTypeTypeTag : public BTFTypeBase {
   const DIDerivedType *DTy;
   StringRef Tag;
@@ -292,7 +306,8 @@ class BTFDebug : public DebugHandlerBase {
   std::map<std::string, std::unique_ptr<BTFKindDataSec>> DataSecEntries;
   std::vector<BTFTypeStruct *> StructTypes;
   std::map<const GlobalVariable *, std::pair<int64_t, uint32_t>> PatchImms;
-  std::map<StringRef, std::pair<bool, std::vector<BTFTypeDerived *>>>
+  std::map<const DICompositeType *,
+           std::vector<std::pair<const DIDerivedType *, BTFTypeDerived *>>>
       FixupDerivedTypes;
   std::set<const Function *>ProtoFunctions;
 
@@ -344,6 +359,13 @@ class BTFDebug : public DebugHandlerBase {
   void processDeclAnnotations(DINodeArray Annotations, uint32_t BaseTypeId,
                               int ComponentId);
 
+  /// Generate BTF type_tag's. If BaseTypeId is nonnegative, the last
+  /// BTF type_tag in the chain points to BaseTypeId. Otherwise, it points to
+  /// the base type of DTy. Return the type id of the first BTF type_tag
+  /// in the chain. If no type_tag's are generated, a negative value
+  /// is returned.
+  int genBTFTypeTags(const DIDerivedType *DTy, int BaseTypeId);
+
   /// Generate one field relocation record.
   void generatePatchImmReloc(const MCSymbol *ORSym, uint32_t RootId,
                              const GlobalVariable *, bool IsAma);

From 2e75fc0a6e58385fb6f2e2909c52cc936bb577b5 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Mon, 12 Dec 2022 11:13:47 -0500
Subject: [PATCH 009/114] [SOL] Define __ELF__ macro for the SBF target

---
 clang/lib/Basic/Targets/BPF.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/clang/lib/Basic/Targets/BPF.cpp b/clang/lib/Basic/Targets/BPF.cpp
index 7af9965f81c6e..354f879eaa87c 100644
--- a/clang/lib/Basic/Targets/BPF.cpp
+++ b/clang/lib/Basic/Targets/BPF.cpp
@@ -69,6 +69,9 @@ void BPFTargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__BPF_FEATURE_SDIV_SMOD");
     Builder.defineMacro("__BPF_FEATURE_GOTOL");
     Builder.defineMacro("__BPF_FEATURE_ST");
+
+  if (HasSolanaFeature) {
+    Builder.defineMacro("__ELF__");
   }
 }
 

From 1911a671c4ab5b16c73cc29ca02c740b740011ba Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Mon, 30 Jan 2023 17:28:42 -0500
Subject: [PATCH 010/114] [SOL] Fix SBF target in LLDB

---
 lldb/include/lldb/Utility/ArchSpec.h                 | 10 ++++++++++
 lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 10 ++++++++++
 lldb/source/Utility/ArchSpec.cpp                     |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/lldb/include/lldb/Utility/ArchSpec.h b/lldb/include/lldb/Utility/ArchSpec.h
index 7e9bc23a75acb..9340e909e7dfc 100644
--- a/lldb/include/lldb/Utility/ArchSpec.h
+++ b/lldb/include/lldb/Utility/ArchSpec.h
@@ -101,6 +101,16 @@ class ArchSpec {
     eRISCV_tso              = 0x00000010, /// RVTSO (total store ordering)
   };
 
+  // BPF specific e_flags
+  enum BPFeflags {
+    eBPF_abi_sbf_v2 = 0x00000020,
+  };
+
+  enum SBFSubType {
+    eSBFSubType_sbf,
+    eSBFSubType_sbfv2,
+  };
+
   enum RISCVSubType {
     eRISCVSubType_unknown,
     eRISCVSubType_riscv32,
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 13e1198516f78..7f7042706afc6 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -249,6 +249,12 @@ bool ELFNote::Parse(const DataExtractor &data, lldb::offset_t *offset) {
   return true;
 }
 
+static uint32_t sbfVariantFromElfFlags(const elf::ELFHeader &header) {
+  if (header.e_flags & llvm::ELF::EF_SBF_V2)
+      return ArchSpec::eSBFSubType_sbfv2;
+  return ArchSpec::eSBFSubType_sbf;
+}
+
 static uint32_t mipsVariantFromElfFlags (const elf::ELFHeader &header) {
   const uint32_t mips_arch = header.e_flags & llvm::ELF::EF_MIPS_ARCH;
   uint32_t endian = header.e_ident[EI_DATA];
@@ -343,6 +349,10 @@ static uint32_t subTypeFromElfHeader(const elf::ELFHeader &header) {
     return riscvVariantFromElfFlags(header);
   else if (header.e_machine == llvm::ELF::EM_LOONGARCH)
     return loongarchVariantFromElfFlags(header);
+  else if (header.e_machine == llvm::ELF::EM_BPF)
+    return bpfVariantFromElfFlags(header);
+  else if (header.e_machine == llvm::ELF::EM_SBF)
+    return sbfVariantFromElfFlags(header);
 
   return LLDB_INVALID_CPUTYPE;
 }
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index b13e8ff1ec373..64f33497426b4 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -432,6 +432,10 @@ static const ArchDefinitionEntry g_elf_arch_entries[] = {
     {ArchSpec::eCore_loongarch64, llvm::ELF::EM_LOONGARCH,
      ArchSpec::eLoongArchSubType_loongarch64, 0xFFFFFFFFu,
      0xFFFFFFFFu}, // loongarch64
+    {ArchSpec::eCore_sbf, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbf,
+     0xFFFFFFFFu, 0xFFFFFFFFu}, // sbf
+    {ArchSpec::eCore_sbfv2, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv2,
+     0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv2
 };
 
 static const ArchDefinition g_elf_arch_def = {

From b72f6964f136b49b77c01f68c105e73b46acdc4d Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Tue, 7 Feb 2023 16:19:13 -0500
Subject: [PATCH 011/114] [SOL] Fix paths in solana lldb wrapper script

---
 lldb/scripts/solana/solana-lldb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100755 lldb/scripts/solana/solana-lldb

diff --git a/lldb/scripts/solana/solana-lldb b/lldb/scripts/solana/solana-lldb
new file mode 100755
index 0000000000000..5f996a5b4dcf8
--- /dev/null
+++ b/lldb/scripts/solana/solana-lldb
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+here=$(dirname "$0")
+lldb=${here}/lldb
+if ! command -v "$lldb" > /dev/null; then
+    echo "LLDB not found!" >&2
+    exit 1
+else
+    LLDB_VERSION=$("$lldb" --version | cut -d ' ' -f3)
+
+    if [ "$LLDB_VERSION" = "3.5.0" ]; then
+        cat << EOF >&2
+***
+WARNING: This version of LLDB has known issues with Rust and cannot display the contents of local variables!
+***
+EOF
+    fi
+fi
+
+script_import_rust="command script import \"${here}/lldb_lookup.py\""
+script_import_solana="command script import \"${here}/solana_lookup.py\""
+commands_file_rust="${here}/lldb_commands"
+commands_file_solana="${here}/solana_commands"
+
+# Call LLDB with the commands added to the argument list
+"$lldb" --one-line-before-file "$script_import_rust" --one-line-before-file "$script_import_solana" --source-before-file "$commands_file_rust" --source-before-file "$commands_file_solana" "$@"

From 673993a1c5a01b206ec3d6b55aa71f1f27336b31 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Wed, 15 Feb 2023 13:55:52 -0600
Subject: [PATCH 012/114] [SOL] Revive BTF/CO-RE crud from bitrot.

BTF/CO-RE has been disabled for Solana since:
https://github.com/solana-labs/llvm-project/issues/37

This patch updates related code (and all applicable unit tests) from roughly
a year of bitrot. This is in preparation for its possible use in the Move
project.

Additionally, a few other 14.0.2022-03-02 -> 15.0-2022-08-09 BPF patches
were reflected in the SBF back-end (e.g., bugfixes).
---
 .../SBF/Disassembler/SBFDisassembler.cpp      |  13 +-
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |   5 +
 .../Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp  |   2 -
 .../SBF/MCTargetDesc/SBFMCCodeEmitter.cpp     |   5 +-
 .../Target/SBF/SBFAbstractMemberAccess.cpp    |  45 ++-
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp          |  10 +-
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |   8 +-
 llvm/lib/Target/SBF/SBFCORE.h                 |   2 +
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |   3 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td           |   1 +
 .../lib/Target/SBF/SBFMISimplifyPatchable.cpp |  23 +-
 llvm/test/CodeGen/SBF/BTF/align.ll            |  34 +++
 llvm/test/CodeGen/SBF/BTF/array-1d-char.ll    |  56 ++++
 llvm/test/CodeGen/SBF/BTF/array-1d-int.ll     |  56 ++++
 llvm/test/CodeGen/SBF/BTF/array-2d-int.ll     |  62 +++++
 llvm/test/CodeGen/SBF/BTF/array-size-0.ll     |  58 ++++
 llvm/test/CodeGen/SBF/BTF/array-typedef.ll    |  70 +++++
 llvm/test/CodeGen/SBF/BTF/binary-format.ll    |  56 ++++
 .../CodeGen/SBF/BTF/builtin-btf-type-id-2.ll  |  73 +++++
 .../CodeGen/SBF/BTF/builtin-btf-type-id.ll    | 151 ++++++++++
 .../test/CodeGen/SBF/BTF/char-no-debuginfo.ll |  30 ++
 llvm/test/CodeGen/SBF/BTF/char.ll             |  41 +++
 llvm/test/CodeGen/SBF/BTF/double.ll           |  57 ++++
 llvm/test/CodeGen/SBF/BTF/empty-btf.ll        |  21 ++
 llvm/test/CodeGen/SBF/BTF/enum-basic.ll       |  50 ++++
 llvm/test/CodeGen/SBF/BTF/extern-builtin.ll   |  90 ++++++
 llvm/test/CodeGen/SBF/BTF/extern-func-arg.ll  |  78 ++++++
 llvm/test/CodeGen/SBF/BTF/extern-func-ptr.ll  |  75 +++++
 .../test/CodeGen/SBF/BTF/extern-global-var.ll |  68 +++++
 .../SBF/BTF/extern-var-func-weak-section.ll   |  96 +++++++
 .../CodeGen/SBF/BTF/extern-var-func-weak.ll   |  89 ++++++
 llvm/test/CodeGen/SBF/BTF/extern-var-func.ll  |  90 ++++++
 .../CodeGen/SBF/BTF/extern-var-section.ll     | 121 ++++++++
 .../CodeGen/SBF/BTF/extern-var-struct-weak.ll | 100 +++++++
 .../test/CodeGen/SBF/BTF/extern-var-struct.ll | 101 +++++++
 .../SBF/BTF/extern-var-weak-section.ll        | 119 ++++++++
 llvm/test/CodeGen/SBF/BTF/filename.ll         |  82 ++++++
 llvm/test/CodeGen/SBF/BTF/float.ll            |  57 ++++
 llvm/test/CodeGen/SBF/BTF/func-func-ptr.ll    | 129 +++++++++
 llvm/test/CodeGen/SBF/BTF/func-non-void.ll    |  98 +++++++
 llvm/test/CodeGen/SBF/BTF/func-source.ll      |  81 ++++++
 llvm/test/CodeGen/SBF/BTF/func-typedef.ll     | 114 ++++++++
 llvm/test/CodeGen/SBF/BTF/func-unused-arg.ll  |  94 +++++++
 llvm/test/CodeGen/SBF/BTF/func-void.ll        |  75 +++++
 llvm/test/CodeGen/SBF/BTF/fwd-no-define.ll    |  61 ++++
 llvm/test/CodeGen/SBF/BTF/fwd-with-define.ll  |  54 ++++
 .../test/CodeGen/SBF/BTF/global-var-inited.ll |  55 ++++
 .../SBF/BTF/global-var-sec-readonly.ll        |  72 +++++
 llvm/test/CodeGen/SBF/BTF/global-var-sec.ll   |  68 +++++
 llvm/test/CodeGen/SBF/BTF/int.ll              |  41 +++
 .../CodeGen/SBF/BTF/local-var-readonly-1.ll   | 104 +++++++
 .../CodeGen/SBF/BTF/local-var-readonly-2.ll   |  96 +++++++
 llvm/test/CodeGen/SBF/BTF/local-var.ll        | 107 +++++++
 llvm/test/CodeGen/SBF/BTF/longlong.ll         |  41 +++
 llvm/test/CodeGen/SBF/BTF/map-def-2.ll        |  89 ++++++
 llvm/test/CodeGen/SBF/BTF/map-def-3.ll        |  64 +++++
 llvm/test/CodeGen/SBF/BTF/map-def.ll          | 119 ++++++++
 llvm/test/CodeGen/SBF/BTF/pruning-const.ll    | 119 ++++++++
 .../SBF/BTF/pruning-multi-derived-type.ll     |  86 ++++++
 llvm/test/CodeGen/SBF/BTF/pruning-typedef.ll  | 127 +++++++++
 llvm/test/CodeGen/SBF/BTF/ptr-const-void.ll   |  42 +++
 llvm/test/CodeGen/SBF/BTF/ptr-func-1.ll       |  43 +++
 llvm/test/CodeGen/SBF/BTF/ptr-func-2.ll       |  61 ++++
 llvm/test/CodeGen/SBF/BTF/ptr-func-3.ll       |  61 ++++
 llvm/test/CodeGen/SBF/BTF/ptr-int.ll          |  45 +++
 llvm/test/CodeGen/SBF/BTF/ptr-prune-type.ll   |  83 ++++++
 llvm/test/CodeGen/SBF/BTF/ptr-void.ll         |  38 +++
 .../SBF/BTF/ptr-volatile-const-void.ll        |  46 +++
 .../test/CodeGen/SBF/BTF/ptr-volatile-void.ll |  42 +++
 llvm/test/CodeGen/SBF/BTF/restrict-ptr.ll     |  49 ++++
 llvm/test/CodeGen/SBF/BTF/short.ll            |  42 +++
 llvm/test/CodeGen/SBF/BTF/static-func.ll      |  95 +++++++
 .../SBF/BTF/static-var-derived-type.ll        | 189 +++++++++++++
 .../CodeGen/SBF/BTF/static-var-inited-sec.ll  | 129 +++++++++
 .../test/CodeGen/SBF/BTF/static-var-inited.ll | 129 +++++++++
 .../SBF/BTF/static-var-readonly-sec.ll        | 137 +++++++++
 .../CodeGen/SBF/BTF/static-var-readonly.ll    | 137 +++++++++
 llvm/test/CodeGen/SBF/BTF/static-var-sec.ll   | 129 +++++++++
 .../SBF/BTF/static-var-zerolen-array.ll       | 141 ++++++++++
 llvm/test/CodeGen/SBF/BTF/static-var.ll       | 129 +++++++++
 llvm/test/CodeGen/SBF/BTF/struct-anon-2.ll    | 105 +++++++
 llvm/test/CodeGen/SBF/BTF/struct-anon.ll      |  64 +++++
 llvm/test/CodeGen/SBF/BTF/struct-basic.ll     |  69 +++++
 .../SBF/BTF/struct-bitfield-typedef.ll        |  87 ++++++
 llvm/test/CodeGen/SBF/BTF/struct-enum.ll      |  74 +++++
 llvm/test/CodeGen/SBF/BTF/tag-1.ll            |  90 ++++++
 llvm/test/CodeGen/SBF/BTF/tag-2.ll            | 125 +++++++++
 llvm/test/CodeGen/SBF/BTF/tag-typedef.ll      |  86 ++++++
 .../CodeGen/SBF/BTF/type-tag-fixup-fwd.ll     | 130 +++++++++
 .../SBF/BTF/type-tag-fixup-resolved.ll        | 150 ++++++++++
 llvm/test/CodeGen/SBF/BTF/type-tag-var.ll     |  62 +++++
 llvm/test/CodeGen/SBF/BTF/uchar.ll            |  41 +++
 llvm/test/CodeGen/SBF/BTF/uint.ll             |  41 +++
 llvm/test/CodeGen/SBF/BTF/ulonglong.ll        |  41 +++
 .../CodeGen/SBF/BTF/union-array-typedef.ll    |  91 ++++++
 llvm/test/CodeGen/SBF/BTF/ushort.ll           |  41 +++
 llvm/test/CodeGen/SBF/BTF/weak-global-2.ll    |  65 +++++
 llvm/test/CodeGen/SBF/BTF/weak-global-3.ll    |  85 ++++++
 llvm/test/CodeGen/SBF/BTF/weak-global.ll      |  64 +++++
 .../SBF/CORE/anon-struct-argument-pragma.ll   | 100 +++++++
 .../SBF/CORE/anon-union-localvar-attr.ll      | 124 +++++++++
 .../SBF/CORE/anon-union-localvar-pragma.ll    | 127 +++++++++
 .../test/CodeGen/SBF/CORE/btf-id-duplicate.ll |  99 +++++++
 .../CodeGen/SBF/CORE/field-reloc-alu32.ll     |  75 +++++
 .../SBF/CORE/field-reloc-bitfield-1.ll        | 126 +++++++++
 .../SBF/CORE/field-reloc-bitfield-2.ll        | 124 +++++++++
 .../field-reloc-bitfield-record-align16.ll    | 105 +++++++
 .../CodeGen/SBF/CORE/field-reloc-duplicate.ll | 106 +++++++
 .../CodeGen/SBF/CORE/intrinsic-array-2.ll     |  84 ++++++
 llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll |  87 ++++++
 .../CORE/intrinsic-fieldinfo-byte-size-1.ll   | 154 ++++++++++
 .../CORE/intrinsic-fieldinfo-byte-size-2.ll   | 143 ++++++++++
 .../CORE/intrinsic-fieldinfo-byte-size-3.ll   | 134 +++++++++
 .../CORE/intrinsic-fieldinfo-byte-size-4.ll   |  87 ++++++
 .../CORE/intrinsic-fieldinfo-existence-1.ll   | 168 +++++++++++
 .../CORE/intrinsic-fieldinfo-existence-2.ll   | 125 +++++++++
 .../CORE/intrinsic-fieldinfo-existence-3.ll   | 133 +++++++++
 .../CORE/intrinsic-fieldinfo-existence-4.ll   | 109 ++++++++
 .../SBF/CORE/intrinsic-fieldinfo-lshift-1.ll  | 155 +++++++++++
 .../SBF/CORE/intrinsic-fieldinfo-lshift-2.ll  | 126 +++++++++
 .../SBF/CORE/intrinsic-fieldinfo-rshift-1.ll  | 154 ++++++++++
 .../SBF/CORE/intrinsic-fieldinfo-rshift-2.ll  | 125 +++++++++
 .../SBF/CORE/intrinsic-fieldinfo-rshift-3.ll  | 135 +++++++++
 .../CORE/intrinsic-fieldinfo-signedness-1.ll  | 168 +++++++++++
 .../CORE/intrinsic-fieldinfo-signedness-2.ll  | 156 +++++++++++
 .../CORE/intrinsic-fieldinfo-signedness-3.ll  | 153 ++++++++++
 .../test/CodeGen/SBF/CORE/intrinsic-struct.ll |  82 ++++++
 ...nsic-typeinfo-enum-value-opaque-pointer.ll | 103 +++++++
 .../SBF/CORE/intrinsic-typeinfo-enum-value.ll | 121 ++++++++
 .../SBF/CORE/intrinsic-typeinfo-type-exist.ll | 101 +++++++
 .../SBF/CORE/intrinsic-typeinfo-type-match.ll | 103 +++++++
 .../CORE/intrinsic-typeinfo-type-size-1.ll    | 101 +++++++
 .../CORE/intrinsic-typeinfo-type-size-2.ll    | 117 ++++++++
 llvm/test/CodeGen/SBF/CORE/intrinsic-union.ll |  81 ++++++
 .../CodeGen/SBF/CORE/no-elf-ama-symbol.ll     |  66 +++++
 llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll  | 158 +++++++++++
 .../SBF/CORE/offset-reloc-access-str.ll       | 100 +++++++
 .../CodeGen/SBF/CORE/offset-reloc-basic.ll    | 188 +++++++++++++
 .../SBF/CORE/offset-reloc-cast-array-1.ll     | 129 +++++++++
 .../SBF/CORE/offset-reloc-cast-array-2.ll     | 136 +++++++++
 .../SBF/CORE/offset-reloc-cast-struct-1.ll    | 117 ++++++++
 .../SBF/CORE/offset-reloc-cast-struct-2.ll    | 122 ++++++++
 .../SBF/CORE/offset-reloc-cast-struct-3.ll    | 121 ++++++++
 .../SBF/CORE/offset-reloc-cast-union-1.ll     | 122 ++++++++
 .../SBF/CORE/offset-reloc-cast-union-2.ll     | 123 ++++++++
 .../CodeGen/SBF/CORE/offset-reloc-end-load.ll |  86 ++++++
 .../CodeGen/SBF/CORE/offset-reloc-end-ret.ll  |  81 ++++++
 .../SBF/CORE/offset-reloc-fieldinfo-1.ll      | 200 +++++++++++++
 .../SBF/CORE/offset-reloc-fieldinfo-2.ll      | 263 ++++++++++++++++++
 .../CodeGen/SBF/CORE/offset-reloc-global-1.ll |  83 ++++++
 .../CodeGen/SBF/CORE/offset-reloc-global-2.ll |  99 +++++++
 .../CodeGen/SBF/CORE/offset-reloc-global-3.ll |  88 ++++++
 .../CodeGen/SBF/CORE/offset-reloc-ignore.ll   |  65 +++++
 .../SBF/CORE/offset-reloc-middle-chain.ll     | 133 +++++++++
 .../SBF/CORE/offset-reloc-multi-array-1.ll    | 105 +++++++
 .../SBF/CORE/offset-reloc-multi-array-2.ll    | 111 ++++++++
 .../SBF/CORE/offset-reloc-multilevel.ll       | 199 +++++++++++++
 .../SBF/CORE/offset-reloc-pointer-1.ll        |  87 ++++++
 .../SBF/CORE/offset-reloc-pointer-2.ll        |  89 ++++++
 .../SBF/CORE/offset-reloc-struct-anonymous.ll | 215 ++++++++++++++
 .../SBF/CORE/offset-reloc-struct-array.ll     | 218 +++++++++++++++
 .../SBF/CORE/offset-reloc-typedef-array.ll    | 101 +++++++
 .../SBF/CORE/offset-reloc-typedef-struct-2.ll |  92 ++++++
 .../SBF/CORE/offset-reloc-typedef-struct.ll   |  94 +++++++
 .../SBF/CORE/offset-reloc-typedef-union-2.ll  |  91 ++++++
 .../SBF/CORE/offset-reloc-typedef-union.ll    |  94 +++++++
 .../CodeGen/SBF/CORE/offset-reloc-typedef.ll  | 115 ++++++++
 .../CodeGen/SBF/CORE/offset-reloc-union.ll    | 222 +++++++++++++++
 .../SBF/CORE/simplifypatable-nullptr.ll       | 136 +++++++++
 llvm/test/CodeGen/SBF/CORE/store-addr.ll      | 113 ++++++++
 llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll     |  71 +++++
 llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll     |  71 +++++
 llvm/test/CodeGen/SBF/inline_asm.ll           |   4 +-
 llvm/test/CodeGen/SBF/inlineasm-wreg.ll       |   6 +-
 llvm/test/CodeGen/SBF/reloc-btf-2.ll          |  12 +-
 llvm/test/CodeGen/SBF/reloc-btf.ll            |  10 +-
 176 files changed, 16144 insertions(+), 53 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/BTF/align.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/array-1d-char.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/array-1d-int.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/array-2d-int.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/array-size-0.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/array-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/binary-format.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/char-no-debuginfo.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/char.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/double.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/empty-btf.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/enum-basic.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-builtin.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-func-arg.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-func-ptr.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-global-var.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-func-weak-section.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-func-weak.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-func.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-section.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-struct-weak.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-struct.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/extern-var-weak-section.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/filename.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/float.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/func-func-ptr.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/func-non-void.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/func-source.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/func-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/func-unused-arg.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/func-void.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/fwd-no-define.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/fwd-with-define.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/global-var-inited.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/global-var-sec-readonly.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/global-var-sec.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/int.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/local-var-readonly-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/local-var-readonly-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/local-var.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/longlong.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/map-def-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/map-def-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/map-def.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/pruning-const.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/pruning-multi-derived-type.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/pruning-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-const-void.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-func-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-func-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-func-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-int.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-prune-type.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-void.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-volatile-const-void.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ptr-volatile-void.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/restrict-ptr.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/short.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-func.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-derived-type.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-inited-sec.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-inited.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-readonly-sec.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-readonly.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-sec.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var-zerolen-array.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/static-var.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/struct-anon-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/struct-anon.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/struct-basic.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/struct-bitfield-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/struct-enum.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/tag-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/tag-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/tag-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/type-tag-fixup-fwd.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/type-tag-fixup-resolved.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/type-tag-var.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/uchar.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/uint.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ulonglong.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/union-array-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/ushort.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/weak-global-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/weak-global-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/BTF/weak-global.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/anon-struct-argument-pragma.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/anon-union-localvar-attr.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/anon-union-localvar-pragma.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/btf-id-duplicate.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/field-reloc-alu32.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-record-align16.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/field-reloc-duplicate.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-array-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-4.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-4.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-struct.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-exist.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-match.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/intrinsic-union.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/no-elf-ama-symbol.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-access-str.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-basic.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-end-load.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-end-ret.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-global-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-global-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-global-3.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-ignore.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-middle-chain.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-multilevel.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-1.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-anonymous.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-array.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-array.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union-2.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/offset-reloc-union.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
 create mode 100644 llvm/test/CodeGen/SBF/CORE/store-addr.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
 create mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 5e59172bc1ffb..042776f28bb25 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -95,7 +95,7 @@ static const unsigned GPRDecoderTable[] = {
 
 static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, unsigned RegNo,
                                            uint64_t /*Address*/,
-                                           const void * /*Decoder*/) {
+                                           const MCDisassembler * /*Decoder*/) {
   if (RegNo > 11)
     return MCDisassembler::Fail;
 
@@ -108,9 +108,9 @@ static const unsigned GPR32DecoderTable[] = {
     SBF::W0,  SBF::W1,  SBF::W2,  SBF::W3,  SBF::W4,  SBF::W5,
     SBF::W6,  SBF::W7,  SBF::W8,  SBF::W9,  SBF::W10, SBF::W11};
 
-static DecodeStatus DecodeGPR32RegisterClass(MCInst &Inst, unsigned RegNo,
-                                             uint64_t /*Address*/,
-                                             const void * /*Decoder*/) {
+static DecodeStatus
+DecodeGPR32RegisterClass(MCInst &Inst, unsigned RegNo, uint64_t /*Address*/,
+                         const MCDisassembler * /*Decoder*/) {
   if (RegNo > 11)
     return MCDisassembler::Fail;
 
@@ -120,7 +120,8 @@ static DecodeStatus DecodeGPR32RegisterClass(MCInst &Inst, unsigned RegNo,
 }
 
 static DecodeStatus decodeMemoryOpValue(MCInst &Inst, unsigned Insn,
-                                        uint64_t Address, const void *Decoder) {
+                                        uint64_t Address,
+                                        const MCDisassembler *Decoder) {
   unsigned Register = (Insn >> 16) & 0xf;
   if (Register > 11)
     return MCDisassembler::Fail;
@@ -216,4 +217,4 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
 }
 
 typedef DecodeStatus (*DecodeFunc)(MCInst &MI, unsigned insn, uint64_t Address,
-                                   const void *Decoder);
+                                   const MCDisassembler *Decoder);
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 16f13fef91661..081dfb90fed65 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -95,6 +95,11 @@ void SBFAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
     }
   } else {
     assert(Fixup.getKind() == FK_PCRel_2);
+
+    int64_t ByteOff = (int64_t)Value - 8;
+    if (ByteOff > INT16_MAX * 8 || ByteOff < INT16_MIN * 8)
+      report_fatal_error("Branch target out of insn range");
+
     Value = (uint16_t)((Value - 8) / 8);
     support::endian::write<uint16_t>(&Data[Fixup.getOffset() + 2], Value,
                                      Endian);
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
index b62248c3151e9..9c80fc301fc0d 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
@@ -41,6 +41,4 @@ SBFMCAsmInfo::SBFMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) {
   // section will be parsable, but with odd offsets and
   // line numbers, etc.
   CodePointerSize = 8;
-
-  UseIntegratedAssembler = false;
 }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
index e54284f636b78..24880f0bdc1e4 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
@@ -31,14 +31,13 @@ using namespace llvm;
 namespace {
 
 class SBFMCCodeEmitter : public MCCodeEmitter {
-  const MCInstrInfo &MCII;
   const MCRegisterInfo &MRI;
   bool IsLittleEndian;
 
 public:
-  SBFMCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri,
+  SBFMCCodeEmitter(const MCInstrInfo &, const MCRegisterInfo &mri,
                    bool IsLittleEndian)
-      : MCII(mcii), MRI(mri), IsLittleEndian(IsLittleEndian) {}
+      : MRI(mri), IsLittleEndian(IsLittleEndian) {}
   SBFMCCodeEmitter(const SBFMCCodeEmitter &) = delete;
   void operator=(const SBFMCCodeEmitter &) = delete;
   ~SBFMCCodeEmitter() override = default;
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
index 4d36183719b8b..83e24f7b9393b 100644
--- a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -123,7 +123,7 @@ class SBFAbstractMemberAccess final {
   struct CallInfo {
     uint32_t Kind;
     uint32_t AccessIndex;
-    Align RecordAlignment;
+    MaybeAlign RecordAlignment;
     MDNode *Metadata;
     Value *Base;
   };
@@ -142,9 +142,9 @@ class SBFAbstractMemberAccess final {
   Module *M = nullptr;
 
   static std::map<std::string, GlobalVariable *> GEPGlobals;
-  // A map to link preserve_*_access_index instrinsic calls.
+  // A map to link preserve_*_access_index intrinsic calls.
   std::map<CallInst *, std::pair<CallInst *, CallInfo>> AIChain;
-  // A map to hold all the base preserve_*_access_index instrinsic calls.
+  // A map to hold all the base preserve_*_access_index intrinsic calls.
   // The base call is not an input of any other preserve_*
   // intrinsics.
   std::map<CallInst *, CallInfo> BaseAICalls;
@@ -176,7 +176,7 @@ class SBFAbstractMemberAccess final {
                           uint32_t &StartBitOffset, uint32_t &EndBitOffset);
   uint32_t GetFieldInfo(uint32_t InfoKind, DICompositeType *CTy,
                         uint32_t AccessIndex, uint32_t PatchImm,
-                        Align RecordAlignment);
+                        MaybeAlign RecordAlignment);
 
   Value *computeBaseAndAccessKey(CallInst *Call, CallInfo &CInfo,
                                  std::string &AccessKey, MDNode *&BaseMeta);
@@ -410,6 +410,8 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
       report_fatal_error("Incorrect flag for llvm.bpf.preserve.type.info intrinsic");
     if (Flag == SBFCoreSharedInfo::PRESERVE_TYPE_INFO_EXISTENCE)
       CInfo.AccessIndex = SBFCoreSharedInfo::TYPE_EXISTENCE;
+    else if (Flag == SBFCoreSharedInfo::PRESERVE_TYPE_INFO_MATCH)
+      CInfo.AccessIndex = SBFCoreSharedInfo::TYPE_MATCH;
     else
       CInfo.AccessIndex = SBFCoreSharedInfo::TYPE_SIZE;
     return true;
@@ -669,10 +671,20 @@ void SBFAbstractMemberAccess::GetStorageBitRange(DIDerivedType *MemberTy,
                                                  uint32_t &EndBitOffset) {
   uint32_t MemberBitSize = MemberTy->getSizeInBits();
   uint32_t MemberBitOffset = MemberTy->getOffsetInBits();
+
+  if (RecordAlignment > 8) {
+    // If the Bits are within an aligned 8-byte, set the RecordAlignment
+    // to 8, other report the fatal error.
+    if (MemberBitOffset / 64 != (MemberBitOffset + MemberBitSize) / 64)
+      report_fatal_error("Unsupported field expression for llvm.bpf.preserve.field.info, "
+                         "requiring too big alignment");
+    RecordAlignment = Align(8);
+  }
+
   uint32_t AlignBits = RecordAlignment.value() * 8;
-  if (RecordAlignment > 8 || MemberBitSize > AlignBits)
+  if (MemberBitSize > AlignBits)
     report_fatal_error("Unsupported field expression for llvm.bpf.preserve.field.info, "
-                       "requiring too big alignment");
+                       "bitfield size greater than record alignment");
 
   StartBitOffset = MemberBitOffset & ~(AlignBits - 1);
   if ((StartBitOffset + AlignBits) < (MemberBitOffset + MemberBitSize))
@@ -685,7 +697,7 @@ uint32_t SBFAbstractMemberAccess::GetFieldInfo(uint32_t InfoKind,
                                                DICompositeType *CTy,
                                                uint32_t AccessIndex,
                                                uint32_t PatchImm,
-                                               Align RecordAlignment) {
+                                               MaybeAlign RecordAlignment) {
   if (InfoKind == SBFCoreSharedInfo::FIELD_EXISTENCE)
       return 1;
 
@@ -701,7 +713,7 @@ uint32_t SBFAbstractMemberAccess::GetFieldInfo(uint32_t InfoKind,
         PatchImm += MemberTy->getOffsetInBits() >> 3;
       } else {
         unsigned SBitOffset, NextSBitOffset;
-        GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset,
+        GetStorageBitRange(MemberTy, *RecordAlignment, SBitOffset,
                            NextSBitOffset);
         PatchImm += SBitOffset >> 3;
       }
@@ -720,7 +732,8 @@ uint32_t SBFAbstractMemberAccess::GetFieldInfo(uint32_t InfoKind,
         return SizeInBits >> 3;
 
       unsigned SBitOffset, NextSBitOffset;
-      GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset, NextSBitOffset);
+      GetStorageBitRange(MemberTy, *RecordAlignment, SBitOffset,
+                         NextSBitOffset);
       SizeInBits = NextSBitOffset - SBitOffset;
       if (SizeInBits & (SizeInBits - 1))
         report_fatal_error("Unsupported field expression for llvm.bpf.preserve.field.info");
@@ -780,7 +793,7 @@ uint32_t SBFAbstractMemberAccess::GetFieldInfo(uint32_t InfoKind,
     }
 
     unsigned SBitOffset, NextSBitOffset;
-    GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset, NextSBitOffset);
+    GetStorageBitRange(MemberTy, *RecordAlignment, SBitOffset, NextSBitOffset);
     if (NextSBitOffset - SBitOffset > 64)
       report_fatal_error("too big field size for llvm.bpf.preserve.field.info");
 
@@ -811,7 +824,7 @@ uint32_t SBFAbstractMemberAccess::GetFieldInfo(uint32_t InfoKind,
     }
 
     unsigned SBitOffset, NextSBitOffset;
-    GetStorageBitRange(MemberTy, RecordAlignment, SBitOffset, NextSBitOffset);
+    GetStorageBitRange(MemberTy, *RecordAlignment, SBitOffset, NextSBitOffset);
     if (NextSBitOffset - SBitOffset > 64)
       report_fatal_error("too big field size for llvm.bpf.preserve.field.info");
 
@@ -1000,7 +1013,8 @@ MDNode *SBFAbstractMemberAccess::computeAccessKey(CallInst *Call,
 
   int64_t PatchImm;
   std::string AccessStr("0");
-  if (CInfo.AccessIndex == SBFCoreSharedInfo::TYPE_EXISTENCE) {
+  if (CInfo.AccessIndex == SBFCoreSharedInfo::TYPE_EXISTENCE ||
+      CInfo.AccessIndex == SBFCoreSharedInfo::TYPE_MATCH) {
     PatchImm = 1;
   } else if (CInfo.AccessIndex == SBFCoreSharedInfo::TYPE_SIZE) {
     // typedef debuginfo type has size 0, get the eventual base type.
@@ -1010,8 +1024,11 @@ MDNode *SBFAbstractMemberAccess::computeAccessKey(CallInst *Call,
     // ENUM_VALUE_EXISTENCE and ENUM_VALUE
     IsInt32Ret = false;
 
-    const auto *CE = cast<ConstantExpr>(Call->getArgOperand(1));
-    const GlobalVariable *GV = cast<GlobalVariable>(CE->getOperand(0));
+    // The argument could be a global variable or a getelementptr with base to
+    // a global variable depending on whether the clang option `opaque-options`
+    // is set or not.
+    const GlobalVariable *GV =
+        cast<GlobalVariable>(Call->getArgOperand(1)->stripPointerCasts());
     assert(GV->hasInitializer());
     const ConstantDataArray *DA = cast<ConstantDataArray>(GV->getInitializer());
     assert(DA->isString());
diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
index dd13f7af8c052..b6f562fbcad73 100644
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -259,10 +259,16 @@ bool SBFAdjustOptImpl::serializeICMPCrossBB(BasicBlock &BB) {
     return false;
 
   if (Cond1Op == ICmpInst::ICMP_SGT || Cond1Op == ICmpInst::ICMP_SGE) {
-    if (Cond2Op != ICmpInst::ICMP_SLT && Cond1Op != ICmpInst::ICMP_SLE)
+    if (Cond2Op != ICmpInst::ICMP_SLT && Cond2Op != ICmpInst::ICMP_SLE)
       return false;
   } else if (Cond1Op == ICmpInst::ICMP_SLT || Cond1Op == ICmpInst::ICMP_SLE) {
-    if (Cond2Op != ICmpInst::ICMP_SGT && Cond1Op != ICmpInst::ICMP_SGE)
+    if (Cond2Op != ICmpInst::ICMP_SGT && Cond2Op != ICmpInst::ICMP_SGE)
+      return false;
+  } else if (Cond1Op == ICmpInst::ICMP_ULT || Cond1Op == ICmpInst::ICMP_ULE) {
+    if (Cond2Op != ICmpInst::ICMP_UGT && Cond2Op != ICmpInst::ICMP_UGE)
+      return false;
+  } else if (Cond1Op == ICmpInst::ICMP_UGT || Cond1Op == ICmpInst::ICMP_UGE) {
+    if (Cond2Op != ICmpInst::ICMP_ULT && Cond2Op != ICmpInst::ICMP_ULE)
       return false;
   } else {
     return false;
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index 9d238b8b4b572..5f0dfd5346dd4 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -35,6 +35,9 @@ using namespace llvm;
 #define DEBUG_TYPE "asm-printer"
 
 extern cl::opt<unsigned> SBFAsmWriterVariant;
+static cl::opt<bool> SBFEnableBTFEmission(
+    "sbf-enable-btf-emission", cl::Hidden, cl::init(false),
+    cl::desc("Enable BTF debuginfo sections to be emitted"));
 
 namespace {
 class SBFAsmPrinter : public AsmPrinter {
@@ -62,9 +65,10 @@ bool SBFAsmPrinter::doInitialization(Module &M) {
   AsmPrinter::doInitialization(M);
 
   // Only emit BTF when debuginfo available.
-  // Unsupported for Solana: https://github.com/solana-labs/llvm-project/issues/37
+  // Unsupported for Solana:
+  // https://github.com/solana-labs/llvm-project/issues/37
   if (MAI->doesSupportDebugInformation() && !M.debug_compile_units().empty() &&
-      !TM.getMCSubtargetInfo()->hasFeature(SBF::FeatureSolana) && TM.getTargetTriple().getArch() != Triple::sbf) {
+      SBFEnableBTFEmission) {
     BTF = new BTFX::BTFDebug(this);
     Handlers.push_back(HandlerInfo(std::unique_ptr<BTFX::BTFDebug>(BTF), "emit",
                                    "Debug Info Emission", "BTF",
diff --git a/llvm/lib/Target/SBF/SBFCORE.h b/llvm/lib/Target/SBF/SBFCORE.h
index a73789a4bc353..a6041218bea32 100644
--- a/llvm/lib/Target/SBF/SBFCORE.h
+++ b/llvm/lib/Target/SBF/SBFCORE.h
@@ -32,6 +32,7 @@ class SBFCoreSharedInfo {
     TYPE_SIZE,
     ENUM_VALUE_EXISTENCE,
     ENUM_VALUE,
+    TYPE_MATCH,
 
     MAX_FIELD_RELOC_KIND,
   };
@@ -46,6 +47,7 @@ class SBFCoreSharedInfo {
   enum PreserveTypeInfo : uint32_t {
     PRESERVE_TYPE_INFO_EXISTENCE = 0,
     PRESERVE_TYPE_INFO_SIZE,
+    PRESERVE_TYPE_INFO_MATCH,
 
     MAX_PRESERVE_TYPE_INFO_FLAG,
   };
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index 886eb9e9c5fd9..87b42dda5b816 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -192,8 +192,7 @@ bool SBFInstrInfo::analyzeBranch(MachineBasicBlock &MBB,
       }
 
       // If the block has any instructions after a J, delete them.
-      while (std::next(I) != MBB.end())
-        std::next(I)->eraseFromParent();
+      MBB.erase(std::next(I), MBB.end());
       Cond.clear();
       FBB = nullptr;
 
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 8fc42e2ae9635..dccadd934a909 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -389,6 +389,7 @@ def FI_ri
   let Inst{47-32} = 0;
   let Inst{31-0} = 0;
   let SBFClass = SBF_LD;
+  bit isPseudo = true;
 }
 
 def LD_pseudo
diff --git a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
index 50520a613b284..86a54147a35f7 100644
--- a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
+++ b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
@@ -34,6 +34,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/Support/Debug.h"
+#include <set>
 
 using namespace llvm;
 
@@ -52,9 +53,12 @@ struct SBFMISimplifyPatchable : public MachineFunctionPass {
   }
 
 private:
+  std::set<MachineInstr *> SkipInsts;
+
   // Initialize class variables.
   void initialize(MachineFunction &MFParm);
 
+  bool isLoadInst(unsigned Opcode);
   bool removeLD();
   void processCandidate(MachineRegisterInfo *MRI, MachineBasicBlock &MBB,
                         MachineInstr &MI, Register &SrcReg, Register &DstReg,
@@ -88,6 +92,12 @@ void SBFMISimplifyPatchable::initialize(MachineFunction &MFParm) {
   LLVM_DEBUG(dbgs() << "*** SBF simplify patchable insts pass ***\n\n");
 }
 
+bool SBFMISimplifyPatchable::isLoadInst(unsigned Opcode) {
+  return Opcode == SBF::LDD || Opcode == SBF::LDW || Opcode == SBF::LDH ||
+         Opcode == SBF::LDB || Opcode == SBF::LDW32 || Opcode == SBF::LDH32 ||
+         Opcode == SBF::LDB32;
+}
+
 void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
     MachineOperand *RelocOp, const GlobalValue *GVal) {
   const MachineInstr *Inst = RelocOp->getParent();
@@ -229,6 +239,11 @@ void SBFMISimplifyPatchable::processDstReg(MachineRegisterInfo *MRI,
 void SBFMISimplifyPatchable::processInst(MachineRegisterInfo *MRI,
     MachineInstr *Inst, MachineOperand *RelocOp, const GlobalValue *GVal) {
   unsigned Opcode = Inst->getOpcode();
+  if (isLoadInst(Opcode)) {
+    SkipInsts.insert(Inst);
+    return;
+  }
+
   if (Opcode == SBF::ADD_rr)
     checkADDrr(MRI, RelocOp, GVal);
   else if (Opcode == SBF::SLL_rr)
@@ -253,10 +268,10 @@ bool SBFMISimplifyPatchable::removeLD() {
       }
 
       // Ensure the register format is LOAD <reg>, <reg>, 0
-      if (MI.getOpcode() != SBF::LDD && MI.getOpcode() != SBF::LDW &&
-          MI.getOpcode() != SBF::LDH && MI.getOpcode() != SBF::LDB &&
-          MI.getOpcode() != SBF::LDW32 && MI.getOpcode() != SBF::LDH32 &&
-          MI.getOpcode() != SBF::LDB32)
+      if (!isLoadInst(MI.getOpcode()))
+        continue;
+
+      if (SkipInsts.find(&MI) != SkipInsts.end())
         continue;
 
       if (!MI.getOperand(0).isReg() || !MI.getOperand(1).isReg())
diff --git a/llvm/test/CodeGen/SBF/BTF/align.ll b/llvm/test/CodeGen/SBF/BTF/align.ll
new file mode 100644
index 0000000000000..dda9223d1dcb6
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/align.ll
@@ -0,0 +1,34 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=obj < %s | llvm-readelf -S - | FileCheck %s
+; Source:
+;   int foo() { return 0; }
+; Compilation flags:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind readnone willreturn
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !7 {
+entry:
+  ret i32 0, !dbg !12
+}
+; CHECK:   Name              Type            Address          Off           Size          ES Flg Lk Inf Al
+; CHECK:   .BTF              PROGBITS        0000000000000000 {{[0-9a-f]+}} {{[0-9a-f]+}} 00      0   0  4
+; CHECK:   .BTF.ext          PROGBITS        0000000000000000 {{[0-9a-f]+}} {{[0-9a-f]+}} 00      0   0  4
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind readnone willreturn "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 14.0.0 (https://github.com/llvm/llvm-project.git b1ab2a57b83e4b7224c38b534532500cc90e5b9a)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm/align")
+!2 = !{i32 7, !"Dwarf Version", i32 4}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git b1ab2a57b83e4b7224c38b534532500cc90e5b9a)"}
+!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{}
+!12 = !DILocation(line: 1, column: 13, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/array-1d-char.ll b/llvm/test/CodeGen/SBF/BTF/array-1d-char.ll
new file mode 100644
index 0000000000000..65c2b0a540a2f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/array-1d-char.ll
@@ -0,0 +1,56 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   char a[10];
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global [10 x i8] zeroinitializer, align 1, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   56
+; CHECK-NEXT:        .long   56
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   6                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=6
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 80, elements: !8)
+!7 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!8 = !{!9}
+!9 = !DISubrange(count: 10)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/array-1d-int.ll b/llvm/test/CodeGen/SBF/BTF/array-1d-int.ll
new file mode 100644
index 0000000000000..779aa23fb7e30
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/array-1d-int.ll
@@ -0,0 +1,56 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int a[10];
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global [10 x i32] zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   56
+; CHECK-NEXT:        .long   56
+; CHECK-NEXT:        .long   25
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   5                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=5
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 320, elements: !8)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{!9}
+!9 = !DISubrange(count: 10)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/array-2d-int.ll b/llvm/test/CodeGen/SBF/BTF/array-2d-int.ll
new file mode 100644
index 0000000000000..5e74ac97fe1dc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/array-2d-int.ll
@@ -0,0 +1,62 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int a[10][10];
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global [10 x [10 x i32]] zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   80
+; CHECK-NEXT:        .long   80
+; CHECK-NEXT:        .long   25
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 3)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   5                       # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=5
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 3200, elements: !8)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{!9, !9}
+!9 = !DISubrange(count: 10)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/array-size-0.ll b/llvm/test/CodeGen/SBF/BTF/array-size-0.ll
new file mode 100644
index 0000000000000..fefbfdc4fb616
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/array-size-0.ll
@@ -0,0 +1,58 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct t {};
+;   struct t a[10];
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t = type {}
+
+@a = common dso_local local_unnamed_addr global [10 x %struct.t] zeroinitializer, align 1, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   52
+; CHECK-NEXT:        .long   52
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108864                # 0x4000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 2)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   3                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .byte   116                     # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=3
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, elements: !8)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t", file: !3, line: 1, elements: !4)
+!8 = !{!9}
+!9 = !DISubrange(count: 10)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/array-typedef.ll b/llvm/test/CodeGen/SBF/BTF/array-typedef.ll
new file mode 100644
index 0000000000000..11bfd4e6bbaf0
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/array-typedef.ll
@@ -0,0 +1,70 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   typedef unsigned _int;
+;   typedef _int __int;
+;   __int a[10];
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global [10 x i32] zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!12, !13, !14}
+!llvm.ident = !{!15}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   80
+; CHECK-NEXT:        .long   80
+; CHECK-NEXT:        .long   45
+; CHECK-NEXT:        .long   1                       # BTF_KIND_TYPEDEF(id = 1)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   7                       # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   12                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 4)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   25                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "__int"                 # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "_int"                  # string offset=7
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "unsigned int"          # string offset=12
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=25
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 3, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 320, elements: !10)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !3, line: 2, baseType: !8)
+!8 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !3, line: 1, baseType: !9)
+!9 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!10 = !{!11}
+!11 = !DISubrange(count: 10)
+!12 = !{i32 2, !"Dwarf Version", i32 4}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/binary-format.ll b/llvm/test/CodeGen/SBF/BTF/binary-format.ll
new file mode 100644
index 0000000000000..5e84b67c16c1f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/binary-format.ll
@@ -0,0 +1,56 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf  -filetype=obj -o - %s | llvm-readelf -x ".BTF" -x ".BTF.ext" - | FileCheck -check-prefixes=CHECK,CHECK-EL %s
+
+; Source code:
+;   int f(int a) { return a; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -gdwarf-5 -gembed-source -S -emit-llvm t.c
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @f(i32 returned %a) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %a, metadata !12, metadata !DIExpression()), !dbg !13
+  ret i32 %a, !dbg !14
+}
+
+; CHECK:    '.BTF'
+; CHECK-EL: 0x00000000 9feb0100 18000000 00000000 30000000
+; CHECK-EL: 0x00000010 30000000 33000000 01000000 00000001
+; CHECK-EL: 0x00000020 04000000 20000001 00000000 0100000d
+; CHECK-EL: 0x00000030 01000000 05000000 01000000 07000000
+; CHECK-EL: 0x00000040 0100000c 02000000 00696e74 00610066
+; CHECK:    0x00000050 002e7465 7874002f 746d702f 742e6300
+; CHECK:    0x00000060 696e7420 6628696e 74206129 207b2072
+; CHECK:    0x00000070 65747572 6e20613b 207d00
+; CHECK:    '.BTF.ext'
+; CHECK-EL: 0x00000000 9feb0100 20000000 00000000 14000000
+; CHECK-EL: 0x00000010 14000000 2c000000 40000000 00000000
+; CHECK-EL: 0x00000020 08000000 09000000 01000000 00000000
+; CHECK-EL: 0x00000030 03000000 10000000 09000000 02000000
+; CHECK-EL: 0x00000040 00000000 0f000000 18000000 00040000
+; CHECK-EL: 0x00000050 00000000 0f000000 18000000 10040000
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp", checksumkind: CSK_MD5, checksum: "1924f0d78deb326ceb76cd8e9f450775", source: "int f(int a) { return a; }\0A")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 5}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
+!7 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, isOptimized: true, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 1, type: !10)
+!13 = !DILocation(line: 1, column: 11, scope: !7)
+!14 = !DILocation(line: 1, column: 16, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id-2.ll b/llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id-2.ll
new file mode 100644
index 0000000000000..af350faab13da
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id-2.ll
@@ -0,0 +1,73 @@
+; RUN: opt -O2 -mtriple=sbf -S -o %t1 %s
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct s {
+;     int a;
+;   };
+;   int test(void) {
+;     return __builtin_btf_type_id(*(const struct s *)0, 1);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 !dbg !7 {
+entry:
+  %0 = call i64 @llvm.bpf.btf.type.id(i32 0, i64 1), !dbg !11, !llvm.preserve.access.index !12
+  %conv = trunc i64 %0 to i32, !dbg !11
+  ret i32 %conv, !dbg !16
+}
+
+; CHECK:             .long   1                               # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+
+; CHECK:             .long   16                              # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   18
+; CHECK-NEXT:        .long   2
+
+; CHECK:             .ascii  "int"                           # string offset=1
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .byte   115                             # string offset=16
+; CHECK:             .byte   97                              # string offset=18
+; CHECK:             .byte   48                              # string offset=20
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   7
+
+; Function Attrs: nounwind readnone
+declare i64 @llvm.bpf.btf.type.id(i32, i64) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 9783e2098800b954c55ae598a1ce5c4b93444fc0)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/bpf/test")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git 9783e2098800b954c55ae598a1ce5c4b93444fc0)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !8, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DILocation(line: 5, column: 10, scope: !7)
+!12 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !13)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 32, elements: !14)
+!14 = !{!15}
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !1, line: 2, baseType: !10, size: 32)
+!16 = !DILocation(line: 5, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id.ll b/llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id.ll
new file mode 100644
index 0000000000000..e7ea449e1ae2c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/builtin-btf-type-id.ll
@@ -0,0 +1,151 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   static int (*bpf_log)(unsigned long tid, void *data, int data_size) = (void *)999;
+;   struct {
+;     char f1[100];
+;     typeof(3) f2;
+;   } tmp__abc = {1, 3};
+;   void prog1() {
+;     bpf_log(__builtin_btf_type_id(tmp__abc, 0), &tmp__abc, sizeof(tmp__abc));
+;   }
+;   void prog2() {
+;     bpf_log(__builtin_btf_type_id(&tmp__abc, 0), &tmp__abc, sizeof(tmp__abc));
+;   }
+;   void prog3() {
+;     bpf_log(__builtin_btf_type_id(tmp__abc.f1[3], 1), &tmp__abc, sizeof(tmp__abc));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+@tmp__abc = dso_local global { <{ i8, i8, [98 x i8] }>, i32 } { <{ i8, i8, [98 x i8] }> <{ i8 1, i8 3, [98 x i8] zeroinitializer }>, i32 0 }, align 4, !dbg !0
+@bpf_log = internal global i32 (i64, i8*, i32)* inttoptr (i64 999 to i32 (i64, i8*, i32)*), align 8, !dbg !17
+
+; Function Attrs: nounwind
+define dso_local void @prog1() #0 !dbg !28 {
+entry:
+  %0 = load i32 (i64, i8*, i32)*, i32 (i64, i8*, i32)** @bpf_log, align 8, !dbg !31, !tbaa !32
+  %1 = call i64 @llvm.bpf.btf.type.id(i32 0, i64 0), !dbg !36, !llvm.preserve.access.index !7
+  %call = call i32 %0(i64 %1, i8* getelementptr inbounds ({ <{ i8, i8, [98 x i8] }>, i32 }, { <{ i8, i8, [98 x i8] }>, i32 }* @tmp__abc, i32 0, i32 0, i32 0), i32 104), !dbg !31
+  ret void, !dbg !37
+}
+
+; Function Attrs: nounwind readnone
+declare i64 @llvm.bpf.btf.type.id(i32, i64) #1
+
+; Function Attrs: nounwind
+define dso_local void @prog2() #0 !dbg !38 {
+entry:
+  %0 = load i32 (i64, i8*, i32)*, i32 (i64, i8*, i32)** @bpf_log, align 8, !dbg !39, !tbaa !32
+  %1 = call i64 @llvm.bpf.btf.type.id(i32 1, i64 0), !dbg !40, !llvm.preserve.access.index !6
+  %call = call i32 %0(i64 %1, i8* getelementptr inbounds ({ <{ i8, i8, [98 x i8] }>, i32 }, { <{ i8, i8, [98 x i8] }>, i32 }* @tmp__abc, i32 0, i32 0, i32 0), i32 104), !dbg !39
+  ret void, !dbg !41
+}
+
+; Function Attrs: nounwind
+define dso_local void @prog3() #0 !dbg !42 {
+entry:
+  %0 = load i32 (i64, i8*, i32)*, i32 (i64, i8*, i32)** @bpf_log, align 8, !dbg !43, !tbaa !32
+  %1 = call i64 @llvm.bpf.btf.type.id(i32 2, i64 1), !dbg !44, !llvm.preserve.access.index !11
+  %call = call i32 %0(i64 %1, i8* getelementptr inbounds ({ <{ i8, i8, [98 x i8] }>, i32 }, { <{ i8, i8, [98 x i8] }>, i32 }* @tmp__abc, i32 0, i32 0, i32 0), i32 104), !dbg !43
+  ret void, !dbg !45
+}
+
+; CHECK-LABEL:       prog1
+; CHECK:             lddw r1, 3
+; CHECK-LABEL:       prog2
+; CHECK:             lddw r1, 10
+; CHECK-LABEL:       prog3
+; CHECK:             lddw r1, 4
+
+; CHECK:             .long   0                               # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT:        .long   67108866                        # 0x4000002
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   13
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   800                             # 0x320
+; CHECK:             .long   19                              # BTF_KIND_INT(id = 4)
+; CHECK:             .long   0                               # BTF_KIND_PTR(id = 10)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   3
+
+; CHECK:             .ascii  ".text"                         # string offset=7
+; CHECK:             .ascii  "f1"                            # string offset=13
+; CHECK:             .ascii  "f2"                            # string offset=16
+; CHECK:             .ascii  "char"                          # string offset=19
+; CHECK:             .byte   48                              # string offset=48
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   7                               # Field reloc section string offset=7
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   7
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!24, !25, !26}
+!llvm.ident = !{!27}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "tmp__abc", scope: !2, file: !3, line: 5, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git 630c2da0e967e27e2a4c678dfc6e452a74141880)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !5, globals: !16, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!4 = !{}
+!5 = !{!6, !11}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !3, line: 2, size: 832, elements: !8)
+!8 = !{!9, !14}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !7, file: !3, line: 3, baseType: !10, size: 800)
+!10 = !DICompositeType(tag: DW_TAG_array_type, baseType: !11, size: 800, elements: !12)
+!11 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!12 = !{!13}
+!13 = !DISubrange(count: 100)
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "f2", scope: !7, file: !3, line: 4, baseType: !15, size: 32, offset: 800)
+!15 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!16 = !{!0, !17}
+!17 = !DIGlobalVariableExpression(var: !18, expr: !DIExpression())
+!18 = distinct !DIGlobalVariable(name: "bpf_log", scope: !2, file: !3, line: 1, type: !19, isLocal: true, isDefinition: true)
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !20, size: 64)
+!20 = !DISubroutineType(types: !21)
+!21 = !{!15, !22, !23, !15}
+!22 = !DIBasicType(name: "long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!24 = !{i32 7, !"Dwarf Version", i32 4}
+!25 = !{i32 2, !"Debug Info Version", i32 3}
+!26 = !{i32 1, !"wchar_size", i32 4}
+!27 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git 630c2da0e967e27e2a4c678dfc6e452a74141880)"}
+!28 = distinct !DISubprogram(name: "prog1", scope: !3, file: !3, line: 6, type: !29, scopeLine: 6, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!29 = !DISubroutineType(types: !30)
+!30 = !{null}
+!31 = !DILocation(line: 7, column: 3, scope: !28)
+!32 = !{!33, !33, i64 0}
+!33 = !{!"any pointer", !34, i64 0}
+!34 = !{!"omnipotent char", !35, i64 0}
+!35 = !{!"Simple C/C++ TBAA"}
+!36 = !DILocation(line: 7, column: 11, scope: !28)
+!37 = !DILocation(line: 8, column: 1, scope: !28)
+!38 = distinct !DISubprogram(name: "prog2", scope: !3, file: !3, line: 9, type: !29, scopeLine: 9, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!39 = !DILocation(line: 10, column: 3, scope: !38)
+!40 = !DILocation(line: 10, column: 11, scope: !38)
+!41 = !DILocation(line: 11, column: 1, scope: !38)
+!42 = distinct !DISubprogram(name: "prog3", scope: !3, file: !3, line: 12, type: !29, scopeLine: 12, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!43 = !DILocation(line: 13, column: 3, scope: !42)
+!44 = !DILocation(line: 13, column: 11, scope: !42)
+!45 = !DILocation(line: 14, column: 1, scope: !42)
diff --git a/llvm/test/CodeGen/SBF/BTF/char-no-debuginfo.ll b/llvm/test/CodeGen/SBF/BTF/char-no-debuginfo.ll
new file mode 100644
index 0000000000000..befa09ec0c7bc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/char-no-debuginfo.ll
@@ -0,0 +1,30 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int g __attribute__((section("maps"))) = 5;
+;   int test() { return g; }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c
+
+@g = dso_local local_unnamed_addr global i32 5, section "maps", align 4
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test() local_unnamed_addr #0 {
+  %1 = load i32, i32* @g, align 4, !tbaa !2
+  ret i32 %1
+}
+
+; CHECK-NOT:         .section        .BTF
+; CHECK-NOT:         .section        .BTF.ext
+
+attributes #0 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 8.0.20181009 "}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"int", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/BTF/char.ll b/llvm/test/CodeGen/SBF/BTF/char.ll
new file mode 100644
index 0000000000000..7b3da2984098a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/char.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   char a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i8 0, align 1, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/double.ll b/llvm/test/CodeGen/SBF/BTF/double.ll
new file mode 100644
index 0000000000000..46f287c10bb33
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/double.ll
@@ -0,0 +1,57 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   double a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = dso_local local_unnamed_addr global double 0.000000e+00, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section .BTF,"",@progbits
+; CHECK-NEXT:        .short 60319 # 0xeb9f
+; CHECK-NEXT:        .byte 1
+; CHECK-NEXT:        .byte 0
+; CHECK-NEXT:        .long 24
+; CHECK-NEXT:        .long 0
+; CHECK-NEXT:        .long 52
+; CHECK-NEXT:        .long 52
+; CHECK-NEXT:        .long 15
+; [1] double, size=8 bytes (64 bits)
+; CHECK-NEXT:        .long 1 # BTF_KIND_FLOAT(id = 1)
+; CHECK-NEXT:        .long 268435456 # 0x10000000
+; CHECK-NEXT:        .long 8
+; [2] a, type=double (1), global
+; CHECK-NEXT:        .long 8 # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT:        .long 234881024 # 0xe000000
+; CHECK-NEXT:        .long 1
+; CHECK-NEXT:        .long 1
+; [3] .bss, 1 var, {a, offset=&a, size=8 bytes}
+; CHECK-NEXT:        .long 10 # BTF_KIND_DATASEC(id = 3)
+; CHECK-NEXT:        .long 251658241 # 0xf000001
+; CHECK-NEXT:        .long 0
+; CHECK-NEXT:        .long 2
+; CHECK-NEXT:        .long a
+; CHECK-NEXT:        .long 8
+; CHECK-NEXT:        .byte 0 # string offset=0
+; CHECK-NEXT:        .ascii "double" # string offset=1
+; CHECK-NEXT:        .byte 0
+; CHECK-NEXT:        .byte 97 # string offset=8
+; CHECK-NEXT:        .byte 0
+; CHECK-NEXT:        .ascii ".bss" # string offset=10
+; CHECK-NEXT:        .byte 0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 11.0.0 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "double", size: 64, encoding: DW_ATE_float)
+!7 = !{i32 7, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 11.0.0 "}
diff --git a/llvm/test/CodeGen/SBF/BTF/empty-btf.ll b/llvm/test/CodeGen/SBF/BTF/empty-btf.ll
new file mode 100644
index 0000000000000..1ae3a307422f1
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/empty-btf.ll
@@ -0,0 +1,21 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int test(int arg) { return arg; }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm t.c
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @test(i32 returned) local_unnamed_addr #0 {
+  ret i32 %0
+}
+
+; CHECK-NOT: BTF
+
+attributes #0 = { norecurse nounwind readnone }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 8.0.20181009 "}
diff --git a/llvm/test/CodeGen/SBF/BTF/enum-basic.ll b/llvm/test/CodeGen/SBF/BTF/enum-basic.ll
new file mode 100644
index 0000000000000..65f64944a02c1
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/enum-basic.ll
@@ -0,0 +1,50 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   enum { A = -1, B = 2 } a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ENUM(id = 1)
+; CHECK-NEXT:        .long   2248146946              # 0x86000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   -1
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .byte   65                      # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   66                      # string offset=3
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !5, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !10, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{!5}
+!5 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !3, line: 1, baseType: !6, size: 32, elements: !7)
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = !{!8, !9}
+!8 = !DIEnumerator(name: "A", value: -1)
+!9 = !DIEnumerator(name: "B", value: 2)
+!10 = !{!0}
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-builtin.ll b/llvm/test/CodeGen/SBF/BTF/extern-builtin.ll
new file mode 100644
index 0000000000000..294b65fbae505
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-builtin.ll
@@ -0,0 +1,90 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; Note that llvm.bpd.load does not apply to SBF, delete eventually.
+: XFAIL: *
+; Source code:
+;   unsigned long long load_byte(void *skb,
+;       unsigned long long off) asm("llvm.bpf.load.byte");
+;   unsigned long long test(void *skb) {
+;     return load_byte(skb, 10);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind readonly
+define dso_local i64 @test(i8* readonly %skb) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata i8* %skb, metadata !17, metadata !DIExpression()), !dbg !18
+  %call = tail call i64 @llvm.bpf.load.byte(i8* %skb, i64 10), !dbg !19
+  ret i64 %call, !dbg !20
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   60
+; CHECK-NEXT:        .long   60
+; CHECK-NEXT:        .long   78
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   5                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   64                      # 0x40
+; CHECK-NEXT:        .long   28                      # BTF_KIND_FUNC(id = 4)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "skb"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "long long unsigned int" # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=28
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=33
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=39
+; CHECK-NEXT:        .byte   0
+
+; Function Attrs: nounwind readonly
+declare !dbg !4 i64 @llvm.bpf.load.byte(i8*, i64) #1
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readonly }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 907019d835895443b198afcd992c42c9d3478fdf)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "load_byte", linkageName: "llvm.bpf.load.byte", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7, !8, !7}
+!7 = !DIBasicType(name: "long long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 907019d835895443b198afcd992c42c9d3478fdf)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !14, scopeLine: 3, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !16)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7, !8}
+!16 = !{!17}
+!17 = !DILocalVariable(name: "skb", arg: 1, scope: !13, file: !1, line: 3, type: !8)
+!18 = !DILocation(line: 0, scope: !13)
+!19 = !DILocation(line: 4, column: 10, scope: !13)
+!20 = !DILocation(line: 4, column: 3, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-func-arg.ll b/llvm/test/CodeGen/SBF/BTF/extern-func-arg.ll
new file mode 100644
index 0000000000000..8196d60c527e4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-func-arg.ll
@@ -0,0 +1,78 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int global_func(char arg);
+;   int test() { return global_func(0); }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !13 {
+entry:
+  %call = tail call i32 @global_func(i8 signext 0) #2, !dbg !16
+  ret i32 %call, !dbg !17
+}
+
+; CHECK:             .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   55                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   4
+; CHECK:             .ascii  "int"                   # string offset=1
+; CHECK:             .ascii  "test"                  # string offset=5
+; CHECK:             .ascii  "char"                  # string offset=55
+; CHECK:             .ascii  "global_func"           # string offset=60
+
+declare !dbg !4 dso_local i32 @global_func(i8 signext) local_unnamed_addr #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 987c5665e81822b32c895fd0c97a9a084b0d3106)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "global_func", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7, !8}
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 987c5665e81822b32c895fd0c97a9a084b0d3106)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !14, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7}
+!16 = !DILocation(line: 2, column: 21, scope: !13)
+!17 = !DILocation(line: 2, column: 14, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-func-ptr.ll b/llvm/test/CodeGen/SBF/BTF/extern-func-ptr.ll
new file mode 100644
index 0000000000000..90dffc95a1e30
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-func-ptr.ll
@@ -0,0 +1,75 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int do_work(int) __attribute__((section(".callback_fn")));
+;   long bpf_helper(void *callback_fn);
+;   long prog() {
+;       return bpf_helper(&do_work);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i64 @prog() local_unnamed_addr #0 !dbg !7 {
+entry:
+  %call = tail call i64 @bpf_helper(i8* bitcast (i32 (i32)* @do_work to i8*)) #2, !dbg !11
+  ret i64 %call, !dbg !12
+}
+
+; CHECK:             .long   0                               # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809                       # 0xd000001
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   51                              # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   55                              # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594                       # 0xc000002
+; CHECK-NEXT:        .long   4
+
+; CHECK:             .long   74                              # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT:        .long   251658241                       # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   do_work
+; CHECK-NEXT:        .long   0
+
+; CHECK:             .ascii  "int"                           # string offset=51
+; CHECK:             .ascii  "do_work"                       # string offset=55
+; CHECK:             .ascii  ".callback_fn"                  # string offset=74
+
+declare !dbg !13 dso_local i64 @bpf_helper(i8*) local_unnamed_addr #1
+
+declare !dbg !17 dso_local i32 @do_work(i32) #1 section ".callback_fn"
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git aa382ed8a38d5efa118e1b2617544f5c253658a9)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/btf/core")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git aa382ed8a38d5efa118e1b2617544f5c253658a9)"}
+!7 = distinct !DISubprogram(name: "prog", scope: !1, file: !1, line: 3, type: !8, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "long int", size: 64, encoding: DW_ATE_signed)
+!11 = !DILocation(line: 4, column: 12, scope: !7)
+!12 = !DILocation(line: 4, column: 5, scope: !7)
+!13 = !DISubprogram(name: "bpf_helper", scope: !1, file: !1, line: 2, type: !14, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!10, !16}
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!17 = !DISubprogram(name: "do_work", scope: !1, file: !1, line: 1, type: !18, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!18 = !DISubroutineType(types: !19)
+!19 = !{!20, !20}
+!20 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-global-var.ll b/llvm/test/CodeGen/SBF/BTF/extern-global-var.ll
new file mode 100644
index 0000000000000..0388067026bbf
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-global-var.ll
@@ -0,0 +1,68 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   extern char a;
+;   int foo() { return a; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@a = external dso_local local_unnamed_addr global i8, align 1
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !7 {
+  %1 = load i8, i8* @a, align 1, !dbg !11, !tbaa !12
+  %2 = sext i8 %1 to i32, !dbg !11
+  ret i32 %2, !dbg !15
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   52
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.20181009 "}
+!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !8, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DILocation(line: 2, column: 20, scope: !7)
+!12 = !{!13, !13, i64 0}
+!13 = !{!"omnipotent char", !14, i64 0}
+!14 = !{!"Simple C/C++ TBAA"}
+!15 = !DILocation(line: 2, column: 13, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-func-weak-section.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-func-weak-section.ll
new file mode 100644
index 0000000000000..62a7ac77e88a9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-func-weak-section.ll
@@ -0,0 +1,96 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int global_func(char c) __attribute__((weak, section("abc")));
+;   int test() {
+;      return global_func(0);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !13 {
+entry:
+  %call = tail call i32 @global_func(i8 signext 0) #2, !dbg !16
+  ret i32 %call, !dbg !17
+}
+declare !dbg !4 extern_weak dso_local i32 @global_func(i8 signext) local_unnamed_addr #1 section "abc"
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   112
+; CHECK-NEXT:        .long   112
+; CHECK-NEXT:        .long   76
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   55                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   72                      # BTF_KIND_DATASEC(id = 7)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   global_func
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global_func"           # string offset=60
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "abc"                   # string offset=72
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "global_func", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7, !8}
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !14, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7}
+!16 = !DILocation(line: 3, column: 11, scope: !13)
+!17 = !DILocation(line: 3, column: 4, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-func-weak.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-func-weak.ll
new file mode 100644
index 0000000000000..d4ea7b139e702
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-func-weak.ll
@@ -0,0 +1,89 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int global_func(char c) __attribute__((weak));
+;   int test() {
+;     return global_func(0);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !13 {
+entry:
+  %call = tail call i32 @global_func(i8 signext 0) #2, !dbg !16
+  ret i32 %call, !dbg !17
+}
+declare !dbg !4 extern_weak dso_local i32 @global_func(i8 signext) local_unnamed_addr #1
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   55                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global_func"           # string offset=60
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "global_func", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7, !8}
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !14, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7}
+!16 = !DILocation(line: 3, column: 11, scope: !13)
+!17 = !DILocation(line: 3, column: 4, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-func.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-func.ll
new file mode 100644
index 0000000000000..d7e819b3d07b7
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-func.ll
@@ -0,0 +1,90 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int global_func(char c);
+;   int test() {
+;     return global_func(0);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !13 {
+entry:
+  %call = tail call i32 @global_func(i8 signext 0) #2, !dbg !16
+  ret i32 %call, !dbg !17
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   55                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global_func"           # string offset=60
+; CHECK-NEXT:        .byte   0
+
+declare !dbg !4 dso_local i32 @global_func(i8 signext) local_unnamed_addr #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 77e5c60f04c4597ba5704d3cee61c6d359404ccd)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "global_func", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7, !8}
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 77e5c60f04c4597ba5704d3cee61c6d359404ccd)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !14, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7}
+!16 = !DILocation(line: 3, column: 10, scope: !13)
+!17 = !DILocation(line: 3, column: 3, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-section.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-section.ll
new file mode 100644
index 0000000000000..3b078ac25b00d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-section.ll
@@ -0,0 +1,121 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int global_func(char c) __attribute__((section("abc")));
+;   extern char ch __attribute__((section("abc")));
+;   int test() {
+;     return global_func(0) + ch;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@ch = external dso_local local_unnamed_addr global i8, section "abc", align 1, !dbg !0
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !16 {
+entry:
+  %call = tail call i32 @global_func(i8 signext 0) #2, !dbg !19
+  %0 = load i8, i8* @ch, align 1, !dbg !20, !tbaa !21
+  %conv = sext i8 %0 to i32, !dbg !20
+  %add = add nsw i32 %call, %conv, !dbg !24
+  ret i32 %add, !dbg !25
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   140
+; CHECK-NEXT:        .long   140
+; CHECK-NEXT:        .long   79
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   55                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   72                      # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   75                      # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   global_func
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   ch
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global_func"           # string offset=60
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ch"                    # string offset=72
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "abc"                   # string offset=75
+; CHECK-NEXT:        .byte   0
+
+declare !dbg !6 dso_local i32 @global_func(i8 signext) local_unnamed_addr #1 section "abc"
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!12, !13, !14}
+!llvm.ident = !{!15}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "ch", scope: !2, file: !3, line: 2, type: !10, isLocal: false, isDefinition: false)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 0ad024346185b3f0b5167438e126568982b1168d)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !5, globals: !11, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!4 = !{}
+!5 = !{!6}
+!6 = !DISubprogram(name: "global_func", scope: !3, file: !3, line: 1, type: !7, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !4)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!11 = !{!0}
+!12 = !{i32 2, !"Dwarf Version", i32 4}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 0ad024346185b3f0b5167438e126568982b1168d)"}
+!16 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 3, type: !17, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!17 = !DISubroutineType(types: !18)
+!18 = !{!9}
+!19 = !DILocation(line: 4, column: 10, scope: !16)
+!20 = !DILocation(line: 4, column: 27, scope: !16)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 25, scope: !16)
+!25 = !DILocation(line: 4, column: 3, scope: !16)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-struct-weak.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-struct-weak.ll
new file mode 100644
index 0000000000000..78100b5730e56
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-struct-weak.ll
@@ -0,0 +1,100 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   typedef struct t1 { int f1; } __t1;
+;   extern __t1 global __attribute__((weak));
+;   int test() { return global.f1; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+%struct.t1 = type { i32 }
+
+@global = extern_weak dso_local local_unnamed_addr global %struct.t1, align 4, !dbg !0
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !15 {
+entry:
+  %0 = load i32, i32* getelementptr (%struct.t1, %struct.t1* @global, i64 0, i32 0), align 4, !dbg !18, !tbaa !19
+  ret i32 %0, !dbg !24
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   55                      # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   60                      # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   63
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   66                      # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__t1"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=60
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=63
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global"                # string offset=66
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "global", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: false)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_typedef, name: "__t1", file: !3, line: 1, baseType: !7)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 1, size: 32, elements: !8)
+!8 = !{!9}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !7, file: !3, line: 1, baseType: !10, size: 32)
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{i32 7, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)"}
+!15 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 3, type: !16, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!10}
+!18 = !DILocation(line: 3, column: 28, scope: !15)
+!19 = !{!20, !21, i64 0}
+!20 = !{!"t1", !21, i64 0}
+!21 = !{!"int", !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 3, column: 14, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-struct.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-struct.ll
new file mode 100644
index 0000000000000..45988465b9d66
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-struct.ll
@@ -0,0 +1,101 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   typedef struct t1 { int f1; } __t1;
+;   extern __t1 global;
+;   int test() { return global.f1; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+%struct.t1 = type { i32 }
+
+@global = external dso_local local_unnamed_addr global %struct.t1, align 4, !dbg !0
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !15 {
+entry:
+  %0 = load i32, i32* getelementptr inbounds (%struct.t1, %struct.t1* @global, i64 0, i32 0), align 4, !dbg !18, !tbaa !19
+  ret i32 %0, !dbg !24
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   55                      # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   60                      # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   63
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   66                      # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__t1"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=60
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=63
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global"                # string offset=66
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "global", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: false)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 2798d63180f4cc873bdaf689705fd4f9521ae89f)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_typedef, name: "__t1", file: !3, line: 1, baseType: !7)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 1, size: 32, elements: !8)
+!8 = !{!9}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !7, file: !3, line: 1, baseType: !10, size: 32)
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 2798d63180f4cc873bdaf689705fd4f9521ae89f)"}
+!15 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 4, type: !16, scopeLine: 4, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!10}
+!18 = !DILocation(line: 4, column: 28, scope: !15)
+!19 = !{!20, !21, i64 0}
+!20 = !{!"t1", !21, i64 0}
+!21 = !{!"int", !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 14, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/BTF/extern-var-weak-section.ll b/llvm/test/CodeGen/SBF/BTF/extern-var-weak-section.ll
new file mode 100644
index 0000000000000..39a1dcf9241a5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/extern-var-weak-section.ll
@@ -0,0 +1,119 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int global_func(char c) __attribute__((weak, section("abc")));
+;   extern char ch __attribute__((weak, section("abc")));
+;   int test() {
+;     return global_func(0) + ch;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@ch = extern_weak dso_local local_unnamed_addr global i8, section "abc", align 1, !dbg !0
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !16 {
+entry:
+  %call = tail call i32 @global_func(i8 signext 0) #2, !dbg !19
+  %0 = load i8, i8* @ch, align 1, !dbg !20, !tbaa !21
+  %conv = sext i8 %0 to i32, !dbg !20
+  %add = add nsw i32 %call, %conv, !dbg !24
+  ret i32 %add, !dbg !25
+}
+declare !dbg !6 extern_weak dso_local i32 @global_func(i8 signext) local_unnamed_addr #1 section "abc"
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   140
+; CHECK-NEXT:        .long   140
+; CHECK-NEXT:        .long   79
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   55                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   72                      # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   75                      # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   global_func
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   ch
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/extern/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "global_func"           # string offset=60
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ch"                    # string offset=72
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "abc"                   # string offset=75
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!12, !13, !14}
+!llvm.ident = !{!15}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "ch", scope: !2, file: !3, line: 2, type: !10, isLocal: false, isDefinition: false)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !5, globals: !11, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/extern")
+!4 = !{}
+!5 = !{!6}
+!6 = !DISubprogram(name: "global_func", scope: !3, file: !3, line: 1, type: !7, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !4)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!11 = !{!0}
+!12 = !{i32 7, !"Dwarf Version", i32 4}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 71a9518c93fe1dce9611c24bc707e5baf1f39f0d)"}
+!16 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 3, type: !17, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!17 = !DISubroutineType(types: !18)
+!18 = !{!9}
+!19 = !DILocation(line: 4, column: 10, scope: !16)
+!20 = !DILocation(line: 4, column: 27, scope: !16)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 25, scope: !16)
+!25 = !DILocation(line: 4, column: 3, scope: !16)
diff --git a/llvm/test/CodeGen/SBF/BTF/filename.ll b/llvm/test/CodeGen/SBF/BTF/filename.ll
new file mode 100644
index 0000000000000..170e079353175
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/filename.ll
@@ -0,0 +1,82 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int test() { return 0; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: norecurse nounwind readnone uwtable
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
+  ret i32 0, !dbg !11
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   35
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/ttmp/t.c"    # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   10                      # FuncInfo section string offset=10
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin{{[0-9]+}}
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   10                      # LineInfo section string offset=10
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1038                    # Line 1 Col 14
+
+attributes #0 = { norecurse nounwind readnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "/home/yhs/ttmp/t.c", directory: "/home/yhs/ttmp")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.20181009 "}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: true, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DILocation(line: 1, column: 14, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/float.ll b/llvm/test/CodeGen/SBF/BTF/float.ll
new file mode 100644
index 0000000000000..df2e19d2ccb8f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/float.ll
@@ -0,0 +1,57 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   float a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = dso_local local_unnamed_addr global float 0.000000e+00, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section .BTF,"",@progbits
+; CHECK-NEXT:        .short 60319 # 0xeb9f
+; CHECK-NEXT:        .byte 1
+; CHECK-NEXT:        .byte 0
+; CHECK-NEXT:        .long 24
+; CHECK-NEXT:        .long 0
+; CHECK-NEXT:        .long 52
+; CHECK-NEXT:        .long 52
+; CHECK-NEXT:        .long 14
+; [1] float, size=4 bytes (32 bits)
+; CHECK-NEXT:        .long 1 # BTF_KIND_FLOAT(id = 1)
+; CHECK-NEXT:        .long 268435456 # 0x10000000
+; CHECK-NEXT:        .long 4
+; [2] a, type=float (1), global
+; CHECK-NEXT:        .long 7 # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT:        .long 234881024 # 0xe000000
+; CHECK-NEXT:        .long 1
+; CHECK-NEXT:        .long 1
+; [3] .bss, 1 var, {a, offset=&a, size=4 bytes}
+; CHECK-NEXT:        .long 9 # BTF_KIND_DATASEC(id = 3)
+; CHECK-NEXT:        .long 251658241 # 0xf000001
+; CHECK-NEXT:        .long 0
+; CHECK-NEXT:        .long 2
+; CHECK-NEXT:        .long a
+; CHECK-NEXT:        .long 4
+; CHECK-NEXT:        .byte 0 # string offset=0
+; CHECK-NEXT:        .ascii "float" # string offset=1
+; CHECK-NEXT:        .byte 0
+; CHECK-NEXT:        .byte 97 # string offset=7
+; CHECK-NEXT:        .byte 0
+; CHECK-NEXT:        .ascii ".bss" # string offset=9
+; CHECK-NEXT:        .byte 0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 11.0.0 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
+!7 = !{i32 7, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 11.0.0 "}
diff --git a/llvm/test/CodeGen/SBF/BTF/func-func-ptr.ll b/llvm/test/CodeGen/SBF/BTF/func-func-ptr.ll
new file mode 100644
index 0000000000000..a8fa3a5361eef
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/func-func-ptr.ll
@@ -0,0 +1,129 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   void (*a1)(int p1);
+;   struct t1 { void (*a1)(int p1); } b1;
+;   void f1(int p2) { }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t1 = type { void (i32)* }
+
+@a1 = common dso_local local_unnamed_addr global void (i32)* null, align 8, !dbg !0
+@b1 = common dso_local local_unnamed_addr global %struct.t1 zeroinitializer, align 8, !dbg !6
+
+; Function Attrs: nounwind readnone
+define dso_local void @f1(i32 %p2) local_unnamed_addr #0 !dbg !19 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %p2, metadata !21, metadata !DIExpression()), !dbg !22
+  ret void, !dbg !23
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   8                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 5)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   26                      # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   29
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "p2"                    # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=8
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/t.c"              # string offset=17
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=26
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "a1"                    # string offset=29
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   11                      # FuncInfo section string offset=11
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   11                      # LineInfo section string offset=11
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   17
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3091                    # Line 3 Col 19
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!15, !16, !17}
+!llvm.ident = !{!18}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a1", scope: !2, file: !3, line: 1, type: !11, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/tmp")
+!4 = !{}
+!5 = !{!0, !6}
+!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
+!7 = distinct !DIGlobalVariable(name: "b1", scope: !2, file: !3, line: 2, type: !8, isLocal: false, isDefinition: true)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 2, size: 64, elements: !9)
+!9 = !{!10}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !8, file: !3, line: 2, baseType: !11, size: 64)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DISubroutineType(types: !13)
+!13 = !{null, !14}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !{i32 2, !"Dwarf Version", i32 4}
+!16 = !{i32 2, !"Debug Info Version", i32 3}
+!17 = !{i32 1, !"wchar_size", i32 4}
+!18 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
+!19 = distinct !DISubprogram(name: "f1", scope: !3, file: !3, line: 3, type: !12, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: true, unit: !2, retainedNodes: !20)
+!20 = !{!21}
+!21 = !DILocalVariable(name: "p2", arg: 1, scope: !19, file: !3, line: 3, type: !14)
+!22 = !DILocation(line: 3, column: 13, scope: !19)
+!23 = !DILocation(line: 3, column: 19, scope: !19)
diff --git a/llvm/test/CodeGen/SBF/BTF/func-non-void.ll b/llvm/test/CodeGen/SBF/BTF/func-non-void.ll
new file mode 100644
index 0000000000000..331a7ab99b65a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/func-non-void.ll
@@ -0,0 +1,98 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int f1(int a1) { return a1; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @f1(i32 returned) local_unnamed_addr #0 !dbg !7 {
+  call void @llvm.dbg.value(metadata i32 %0, metadata !12, metadata !DIExpression()), !dbg !13
+  ret i32 %0, !dbg !14
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   8                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "a1"                    # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=8
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/DNE/t.c"              # string offset=17
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   44
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   11                      # FuncInfo section string offset=11
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   11                      # LineInfo section string offset=11
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   17
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1024                    # Line 1 Col 0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   17
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1042                    # Line 1 Col 18
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 345562) (llvm/trunk 345560)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/DNE")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 345562) (llvm/trunk 345560)"}
+!7 = distinct !DISubprogram(name: "f1", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "a1", arg: 1, scope: !7, file: !1, line: 1, type: !10)
+!13 = !DILocation(line: 1, column: 12, scope: !7)
+!14 = !DILocation(line: 1, column: 18, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/func-source.ll b/llvm/test/CodeGen/SBF/BTF/func-source.ll
new file mode 100644
index 0000000000000..f4dc37a52f481
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/func-source.ll
@@ -0,0 +1,81 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   void f(void) { }
+; Compilation flag:
+;   clang -target bpf -O2 -g -gdwarf-5 -gembed-source -S -emit-llvm t.c
+;
+; This test embeds the source code in the IR, so the line info should have
+; correct reference to the lines in the string table.
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local void @f() local_unnamed_addr #0 !dbg !7 {
+entry:
+  ret void, !dbg !10
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   35
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1                       # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .byte   102                     # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=3
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/t.c"              # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "void f(void) { }"      # string offset=18
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   3                       # FuncInfo section string offset=3
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   3                       # LineInfo section string offset=3
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   18
+; CHECK-NEXT:        .long   1040                    # Line 1 Col 16
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp", checksumkind: CSK_MD5, checksum: "978599fafe3a080b456e3d95a3710359", source: "void f(void) { }\0A")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 5}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
+!7 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, isOptimized: true, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{null}
+!10 = !DILocation(line: 1, column: 16, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/func-typedef.ll b/llvm/test/CodeGen/SBF/BTF/func-typedef.ll
new file mode 100644
index 0000000000000..dfc8e5bd6a638
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/func-typedef.ll
@@ -0,0 +1,114 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   typedef int _int;
+;   typedef _int __int;
+;   __int f(__int a) { return a; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @f(i32 returned %a) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %a, metadata !14, metadata !DIExpression()), !dbg !15
+  ret i32 %a, !dbg !16
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   35
+; CHECK-NEXT:        .long   1                       # BTF_KIND_TYPEDEF(id = 1)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   7                       # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   12                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   18                      # BTF_KIND_FUNC(id = 5)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "__int"                 # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "_int"                  # string offset=7
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=12
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   102                     # string offset=18
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=20
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/t.c"              # string offset=26
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   44
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   20                      # FuncInfo section string offset=20
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   20                      # LineInfo section string offset=20
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3072                    # Line 3 Col 0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3092                    # Line 3 Col 20
+
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
+!7 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 3, type: !8, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !13)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !10}
+!10 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 2, baseType: !11)
+!11 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !1, line: 1, baseType: !12)
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{!14}
+!14 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 3, type: !10)
+!15 = !DILocation(line: 3, column: 15, scope: !7)
+!16 = !DILocation(line: 3, column: 20, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/func-unused-arg.ll b/llvm/test/CodeGen/SBF/BTF/func-unused-arg.ll
new file mode 100644
index 0000000000000..ff071582810a8
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/func-unused-arg.ll
@@ -0,0 +1,94 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int f1(int a1) { return 0; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @f1(i32) local_unnamed_addr #0 !dbg !7 {
+  call void @llvm.dbg.value(metadata i32 %0, metadata !12, metadata !DIExpression()), !dbg !13
+  ret i32 0, !dbg !14
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   8                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "a1"                    # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=8
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/DNE/t.c"              # string offset=17
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   11                      # FuncInfo section string offset=11
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   11                      # LineInfo section string offset=11
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   17
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1042                    # Line 1 Col 18
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 345562) (llvm/trunk 345560)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/DNE")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 345562) (llvm/trunk 345560)"}
+!7 = distinct !DISubprogram(name: "f1", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "a1", arg: 1, scope: !7, file: !1, line: 1, type: !10)
+!13 = !DILocation(line: 1, column: 12, scope: !7)
+!14 = !DILocation(line: 1, column: 18, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/func-void.ll b/llvm/test/CodeGen/SBF/BTF/func-void.ll
new file mode 100644
index 0000000000000..460103383f471
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/func-void.ll
@@ -0,0 +1,75 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   void f1(void) {}
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local void @f1() local_unnamed_addr #0 !dbg !7 {
+  ret void, !dbg !10
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   19
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1                       # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=4
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/DNE/t.c"              # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   8                       # FuncInfo
+; CHECK-NEXT:        .long   4                       # FuncInfo section string offset=4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16                      # LineInfo
+; CHECK-NEXT:        .long   4                       # LineInfo section string offset=4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1040                    # Line 1 Col 16
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.0 (trunk 345562) (llvm/trunk 345560)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/DNE")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.0 (trunk 345562) (llvm/trunk 345560)"}
+!7 = distinct !DISubprogram(name: "f1", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{null}
+!10 = !DILocation(line: 1, column: 16, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/fwd-no-define.ll b/llvm/test/CodeGen/SBF/BTF/fwd-no-define.ll
new file mode 100644
index 0000000000000..1353abed37567
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/fwd-no-define.ll
@@ -0,0 +1,61 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct t1;
+;   struct t2 {struct t1 *p;} a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t2 = type { %struct.t1* }
+%struct.t1 = type opaque
+
+@a = common dso_local local_unnamed_addr global %struct.t2 zeroinitializer, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   6                       # BTF_KIND_FWD(id = 3)
+; CHECK-NEXT:        .long   117440512               # 0x7000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "t2"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   112                     # string offset=4
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=6
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t2", file: !3, line: 2, size: 64, elements: !7)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "p", scope: !6, file: !3, line: 2, baseType: !9, size: 64)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 1, flags: DIFlagFwdDecl)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/fwd-with-define.ll b/llvm/test/CodeGen/SBF/BTF/fwd-with-define.ll
new file mode 100644
index 0000000000000..1b39475b2e688
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/fwd-with-define.ll
@@ -0,0 +1,54 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct t1;
+;   struct t1 {struct t1 *p;} a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t1 = type { %struct.t1* }
+
+@a = common dso_local local_unnamed_addr global %struct.t1 zeroinitializer, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   112                     # string offset=4
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 2, size: 64, elements: !7)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "p", scope: !6, file: !3, line: 2, baseType: !9, size: 64)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !6, size: 64)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/global-var-inited.ll b/llvm/test/CodeGen/SBF/BTF/global-var-inited.ll
new file mode 100644
index 0000000000000..7766f2676002e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/global-var-inited.ll
@@ -0,0 +1,55 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int a = 3;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@a = dso_local local_unnamed_addr global i32 3, align 4, !dbg !0
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   56
+; CHECK-NEXT:        .long   56
+; CHECK-NEXT:        .long   13
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   7                       # BTF_KIND_DATASEC(id = 3)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".data"                 # string offset=7
+; CHECK-NEXT:        .byte   0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.20181009 "}
diff --git a/llvm/test/CodeGen/SBF/BTF/global-var-sec-readonly.ll b/llvm/test/CodeGen/SBF/BTF/global-var-sec-readonly.ll
new file mode 100644
index 0000000000000..a5c41c2a525b5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/global-var-sec-readonly.ll
@@ -0,0 +1,72 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   const int gv1 __attribute__((section("maps")));
+;   const int gv2 __attribute__((section("maps"))) = 5;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@gv2 = dso_local local_unnamed_addr constant i32 5, section "maps", align 4, !dbg !0
+@gv1 = dso_local local_unnamed_addr constant i32 0, section "maps", align 4, !dbg !6
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   96
+; CHECK-NEXT:        .long   96
+; CHECK-NEXT:        .long   18
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 1)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   9                       # BTF_KIND_VAR(id = 4)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   13                      # BTF_KIND_DATASEC(id = 5)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   gv2
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   gv1
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "gv2"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "gv1"                   # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "maps"                  # string offset=13
+; CHECK-NEXT:        .byte   0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "gv2", scope: !2, file: !3, line: 2, type: !8, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !{}
+!5 = !{!0, !6}
+!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
+!7 = distinct !DIGlobalVariable(name: "gv1", scope: !2, file: !3, line: 1, type: !8, isLocal: false, isDefinition: true)
+!8 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !9)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 8.0.20181009 "}
diff --git a/llvm/test/CodeGen/SBF/BTF/global-var-sec.ll b/llvm/test/CodeGen/SBF/BTF/global-var-sec.ll
new file mode 100644
index 0000000000000..8e90d3b70a858
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/global-var-sec.ll
@@ -0,0 +1,68 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int gv1 __attribute__((section("maps")));
+;   int gv2 __attribute__((section("maps"))) = 5;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@gv2 = dso_local local_unnamed_addr global i32 5, section "maps", align 4, !dbg !0
+@gv1 = dso_local local_unnamed_addr global i32 0, section "maps", align 4, !dbg !6
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   84
+; CHECK-NEXT:        .long   84
+; CHECK-NEXT:        .long   18
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_VAR(id = 2)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   9                       # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   13                      # BTF_KIND_DATASEC(id = 4)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   gv2
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   gv1
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "gv2"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "gv1"                   # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "maps"                  # string offset=13
+; CHECK-NEXT:        .byte   0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "gv2", scope: !2, file: !3, line: 2, type: !8, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !{}
+!5 = !{!0, !6}
+!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
+!7 = distinct !DIGlobalVariable(name: "gv1", scope: !2, file: !3, line: 1, type: !8, isLocal: false, isDefinition: true)
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 8.0.20181009 "}
diff --git a/llvm/test/CodeGen/SBF/BTF/int.ll b/llvm/test/CodeGen/SBF/BTF/int.ll
new file mode 100644
index 0000000000000..da97c30682272
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/int.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/local-var-readonly-1.ll b/llvm/test/CodeGen/SBF/BTF/local-var-readonly-1.ll
new file mode 100644
index 0000000000000..ff4aa9e298157
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/local-var-readonly-1.ll
@@ -0,0 +1,104 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   void foo(const void *);
+;   int test() {
+;     const char *str = "abcd";
+;     const struct {
+;       unsigned a[4];
+;     } val = { .a = {2, 3, 4, 5} };
+;     foo(str);
+;     foo(&val);
+;     return 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.anon = type { [4 x i32] }
+
+@.str = private unnamed_addr constant [5 x i8] c"abcd\00", align 1
+@__const.test.val = private unnamed_addr constant %struct.anon { [4 x i32] [i32 2, i32 3, i32 4, i32 5] }, align 4
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
+entry:
+  %val = alloca %struct.anon, align 4
+  call void @llvm.dbg.value(metadata i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i64 0, i64 0), metadata !12, metadata !DIExpression()), !dbg !25
+  %0 = bitcast %struct.anon* %val to i8*, !dbg !26
+  call void @llvm.lifetime.start.p0i8(i64 16, i8* nonnull %0) #4, !dbg !26
+  call void @llvm.dbg.declare(metadata %struct.anon* %val, metadata !16, metadata !DIExpression()), !dbg !27
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 4 dereferenceable(16) %0, i8* nonnull align 4 dereferenceable(16) bitcast (%struct.anon* @__const.test.val to i8*), i64 16, i1 false), !dbg !27
+  tail call void @foo(i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i64 0, i64 0)) #4, !dbg !28
+  call void @foo(i8* nonnull %0) #4, !dbg !29
+  call void @llvm.lifetime.end.p0i8(i64 16, i8* nonnull %0) #4, !dbg !30
+  ret i32 0, !dbg !31
+}
+
+; the initial value of "str" is stored in section .rodata.str1.1
+; the initial value of "val" is stored in section .rodata.cst16
+; CHECK-NOT:   BTF_KIND_DATASEC
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* noalias nocapture writeonly, i8* noalias nocapture readonly, i64, i1 immarg) #1
+
+declare !dbg !32 dso_local void @foo(i8*) local_unnamed_addr #3
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { nounwind readnone speculatable willreturn }
+attributes #3 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 1e92cffe18a07c12042b57504dfa7fb709b833c8)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/tmp")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 1e92cffe18a07c12042b57504dfa7fb709b833c8)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12, !16}
+!12 = !DILocalVariable(name: "str", scope: !7, file: !1, line: 3, type: !13)
+!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
+!14 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !15)
+!15 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!16 = !DILocalVariable(name: "val", scope: !7, file: !1, line: 6, type: !17)
+!17 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !18)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !7, file: !1, line: 4, size: 128, elements: !19)
+!19 = !{!20}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !18, file: !1, line: 5, baseType: !21, size: 128)
+!21 = !DICompositeType(tag: DW_TAG_array_type, baseType: !22, size: 128, elements: !23)
+!22 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!23 = !{!24}
+!24 = !DISubrange(count: 4)
+!25 = !DILocation(line: 0, scope: !7)
+!26 = !DILocation(line: 4, column: 3, scope: !7)
+!27 = !DILocation(line: 6, column: 5, scope: !7)
+!28 = !DILocation(line: 7, column: 3, scope: !7)
+!29 = !DILocation(line: 8, column: 3, scope: !7)
+!30 = !DILocation(line: 10, column: 1, scope: !7)
+!31 = !DILocation(line: 9, column: 3, scope: !7)
+!32 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !33, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!33 = !DISubroutineType(types: !34)
+!34 = !{null, !35}
+!35 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !36, size: 64)
+!36 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
diff --git a/llvm/test/CodeGen/SBF/BTF/local-var-readonly-2.ll b/llvm/test/CodeGen/SBF/BTF/local-var-readonly-2.ll
new file mode 100644
index 0000000000000..ebccb3e7718b3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/local-var-readonly-2.ll
@@ -0,0 +1,96 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   void foo(const void *);
+;   int test() {
+;     const struct {
+;       unsigned a[4];
+;       char b;
+;     } val = { .a = {2, 3, 4, 5}, .b = 4 };
+;     foo(&val);
+;     return 0;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.anon = type { [4 x i32], i8 }
+
+@__const.test.val = private unnamed_addr constant %struct.anon { [4 x i32] [i32 2, i32 3, i32 4, i32 5], i8 4 }, align 4
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
+entry:
+  %val = alloca %struct.anon, align 4
+  %0 = bitcast %struct.anon* %val to i8*, !dbg !23
+  call void @llvm.lifetime.start.p0i8(i64 20, i8* nonnull %0) #4, !dbg !23
+  call void @llvm.dbg.declare(metadata %struct.anon* %val, metadata !12, metadata !DIExpression()), !dbg !24
+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 4 dereferenceable(20) %0, i8* nonnull align 4 dereferenceable(20) bitcast (%struct.anon* @__const.test.val to i8*), i64 20, i1 false), !dbg !24
+  call void @foo(i8* nonnull %0) #4, !dbg !25
+  call void @llvm.lifetime.end.p0i8(i64 20, i8* nonnull %0) #4, !dbg !26
+  ret i32 0, !dbg !27
+}
+
+; the init value of local variable "val" is stored in .rodata section
+; CHECK:             .long   42                              # BTF_KIND_DATASEC
+; CHECK-NEXT:        .long   251658240                       # 0xf000000
+; CHECK-NEXT:        .long   0
+
+; CHECK:             .ascii  ".rodata"                       # string offset=42
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* noalias nocapture writeonly, i8* noalias nocapture readonly, i64, i1 immarg) #1
+
+declare !dbg !28 dso_local void @foo(i8*) local_unnamed_addr #3
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { nounwind readnone speculatable willreturn }
+attributes #3 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 1e92cffe18a07c12042b57504dfa7fb709b833c8)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/tmp")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 1e92cffe18a07c12042b57504dfa7fb709b833c8)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "val", scope: !7, file: !1, line: 6, type: !13)
+!13 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !14)
+!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !7, file: !1, line: 3, size: 160, elements: !15)
+!15 = !{!16, !21}
+!16 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !14, file: !1, line: 4, baseType: !17, size: 128)
+!17 = !DICompositeType(tag: DW_TAG_array_type, baseType: !18, size: 128, elements: !19)
+!18 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!19 = !{!20}
+!20 = !DISubrange(count: 4)
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !14, file: !1, line: 5, baseType: !22, size: 8, offset: 128)
+!22 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!23 = !DILocation(line: 3, column: 3, scope: !7)
+!24 = !DILocation(line: 6, column: 5, scope: !7)
+!25 = !DILocation(line: 7, column: 3, scope: !7)
+!26 = !DILocation(line: 9, column: 1, scope: !7)
+!27 = !DILocation(line: 8, column: 3, scope: !7)
+!28 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !29, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!29 = !DISubroutineType(types: !30)
+!30 = !{null, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
diff --git a/llvm/test/CodeGen/SBF/BTF/local-var.ll b/llvm/test/CodeGen/SBF/BTF/local-var.ll
new file mode 100644
index 0000000000000..a16469638fb2a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/local-var.ll
@@ -0,0 +1,107 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int foo(char a) { volatile short b = 0;  return b; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @foo(i8 signext) local_unnamed_addr #0 !dbg !7 {
+  %2 = alloca i16, align 2
+  call void @llvm.dbg.value(metadata i8 %0, metadata !13, metadata !DIExpression()), !dbg !17
+  %3 = bitcast i16* %2 to i8*, !dbg !18
+  call void @llvm.lifetime.start.p0i8(i64 2, i8* nonnull %3), !dbg !18
+  call void @llvm.dbg.declare(metadata i16* %2, metadata !14, metadata !DIExpression()), !dbg !19
+  store volatile i16 0, i16* %2, align 2, !dbg !19, !tbaa !20
+  %4 = load volatile i16, i16* %2, align 2, !dbg !24, !tbaa !20
+  %5 = sext i16 %4 to i32, !dbg !24
+  call void @llvm.lifetime.end.p0i8(i64 2, i8* nonnull %3), !dbg !25
+  ret i32 %5, !dbg !26
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   59
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   8                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   12                      # BTF_KIND_FUNC(id = 4)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=6
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=8
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=12
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=22
+; CHECK-NEXT:        .byte   0
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #2
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+attributes #2 = { argmemonly nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 8.0.20181009 "}
+!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !12)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!12 = !{!13, !14}
+!13 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 1, type: !11)
+!14 = !DILocalVariable(name: "b", scope: !7, file: !1, line: 1, type: !15)
+!15 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !16)
+!16 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!17 = !DILocation(line: 1, column: 14, scope: !7)
+!18 = !DILocation(line: 1, column: 19, scope: !7)
+!19 = !DILocation(line: 1, column: 34, scope: !7)
+!20 = !{!21, !21, i64 0}
+!21 = !{!"short", !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 1, column: 49, scope: !7)
+!25 = !DILocation(line: 1, column: 52, scope: !7)
+!26 = !DILocation(line: 1, column: 42, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/longlong.ll b/llvm/test/CodeGen/SBF/BTF/longlong.ll
new file mode 100644
index 0000000000000..334b8bae53e60
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/longlong.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   long long a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i64 0, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   15
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   16777280                # 0x1000040
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "long long int"         # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/map-def-2.ll b/llvm/test/CodeGen/SBF/BTF/map-def-2.ll
new file mode 100644
index 0000000000000..487a4ef1c003c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/map-def-2.ll
@@ -0,0 +1,89 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   struct key_type {
+;     int a1;
+;   };
+;   typedef struct map_type {
+;     struct key_type *key;
+;   } _map_type;
+;   typedef _map_type __map_type;
+;   __map_type __attribute__((section(".maps"))) hash_map;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t2.c
+
+%struct.map_type = type { %struct.key_type* }
+%struct.key_type = type { i32 }
+
+@hash_map = dso_local local_unnamed_addr global %struct.map_type zeroinitializer, section ".maps", align 8, !dbg !0
+
+; CHECK:             .long   0                               # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                               # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   13                              # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   17                              # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   28                              # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   38                              # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   47
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   51                              # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024                       # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   60                              # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT:        .long   251658241                       # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   hash_map
+; CHECK-NEXT:        .long   8
+
+; CHECK:             .ascii  "key_type"                      # string offset=1
+; CHECK:             .ascii  "a1"                            # string offset=10
+; CHECK:             .ascii  "int"                           # string offset=13
+; CHECK:             .ascii  "__map_type"                    # string offset=17
+; CHECK:             .ascii  "_map_type"                     # string offset=28
+; CHECK:             .ascii  "map_type"                      # string offset=38
+; CHECK:             .ascii  "key"                           # string offset=47
+; CHECK:             .ascii  "hash_map"                      # string offset=51
+; CHECK:             .ascii  ".maps"                         # string offset=60
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "hash_map", scope: !2, file: !3, line: 8, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git b8409c03ed90807f3d49c7d98dceea98cf461f7a)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t2.c", directory: "/tmp/home/yhs/tmp1")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_typedef, name: "__map_type", file: !3, line: 7, baseType: !7)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "_map_type", file: !3, line: 6, baseType: !8)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "map_type", file: !3, line: 4, size: 64, elements: !9)
+!9 = !{!10}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "key", scope: !8, file: !3, line: 5, baseType: !11, size: 64)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "key_type", file: !3, line: 1, size: 32, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !12, file: !3, line: 2, baseType: !15, size: 32)
+!15 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!16 = !{i32 7, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git b8409c03ed90807f3d49c7d98dceea98cf461f7a)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/map-def-3.ll b/llvm/test/CodeGen/SBF/BTF/map-def-3.ll
new file mode 100644
index 0000000000000..674a8b91fd38a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/map-def-3.ll
@@ -0,0 +1,64 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   struct key_type {
+;     int a1;
+;   };
+;   const struct key_type __attribute__((section(".maps"))) hash_map;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t3.c
+
+%struct.key_type = type { i32 }
+
+@hash_map = dso_local local_unnamed_addr constant %struct.key_type zeroinitializer, section ".maps", align 4, !dbg !0
+
+; CHECK:             .long   1                               # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   0                               # BTF_KIND_CONST(id = 2)
+; CHECK-NEXT:        .long   167772160                       # 0xa000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   5                               # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   14
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   17                              # BTF_KIND_VAR(id = 4)
+; CHECK-NEXT:        .long   234881024                       # 0xe000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   26                              # BTF_KIND_DATASEC(id = 5)
+; CHECK-NEXT:        .long   251658241                       # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   hash_map
+; CHECK-NEXT:        .long   4
+
+; CHECK:             .ascii  "int"                           # string offset=1
+; CHECK:             .ascii  "key_type"                      # string offset=5
+; CHECK:             .ascii  "a1"                            # string offset=14
+; CHECK:             .ascii  "hash_map"                      # string offset=17
+; CHECK:             .ascii  ".maps"                         # string offset=26
+
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "hash_map", scope: !2, file: !3, line: 4, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5bd074629f00d4798674b411cf00216f38016483)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t3.c", directory: "/tmp/home/yhs/tmp1")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !7)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "key_type", file: !3, line: 1, size: 32, elements: !8)
+!8 = !{!9}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !7, file: !3, line: 2, baseType: !10, size: 32)
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{i32 7, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5bd074629f00d4798674b411cf00216f38016483)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/map-def.ll b/llvm/test/CodeGen/SBF/BTF/map-def.ll
new file mode 100644
index 0000000000000..1d6514c0999fe
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/map-def.ll
@@ -0,0 +1,119 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct key_type {
+;     int a;
+;     int b;
+;   };
+;   struct map_type {
+;     struct key_type *key;
+;     unsigned *value;
+;   };
+;   struct map_type __attribute__((section(".maps"))) hash_map;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.map_type = type { %struct.key_type*, i32* }
+%struct.key_type = type { i32, i32 }
+
+@hash_map = dso_local local_unnamed_addr global %struct.map_type zeroinitializer, section ".maps", align 8, !dbg !0
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   168
+; CHECK-NEXT:        .long   168
+; CHECK-NEXT:        .long   65
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   14                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   18                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   31                      # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   44
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   64                      # 0x40
+; CHECK-NEXT:        .long   50                      # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   59                      # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   hash_map
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "key_type"              # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   98                      # string offset=12
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=14
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "unsigned int"          # string offset=18
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "map_type"              # string offset=31
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "key"                   # string offset=40
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "value"                 # string offset=44
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "hash_map"              # string offset=50
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".maps"                 # string offset=59
+; CHECK-NEXT:        .byte   0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!18, !19, !20}
+!llvm.ident = !{!21}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "hash_map", scope: !2, file: !3, line: 9, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 9.0.0 (trunk 364157) (llvm/trunk 364156)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "map_type", file: !3, line: 5, size: 128, elements: !7)
+!7 = !{!8, !15}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "key", scope: !6, file: !3, line: 6, baseType: !9, size: 64)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "key_type", file: !3, line: 1, size: 64, elements: !11)
+!11 = !{!12, !14}
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !10, file: !3, line: 2, baseType: !13, size: 32)
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !10, file: !3, line: 3, baseType: !13, size: 32, offset: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "value", scope: !6, file: !3, line: 7, baseType: !16, size: 64, offset: 64)
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64)
+!17 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!18 = !{i32 2, !"Dwarf Version", i32 4}
+!19 = !{i32 2, !"Debug Info Version", i32 3}
+!20 = !{i32 1, !"wchar_size", i32 4}
+!21 = !{!"clang version 9.0.0 (trunk 364157) (llvm/trunk 364156)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/pruning-const.ll b/llvm/test/CodeGen/SBF/BTF/pruning-const.ll
new file mode 100644
index 0000000000000..7ebe980bdd7dd
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/pruning-const.ll
@@ -0,0 +1,119 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; Source:
+;   struct tt;
+;   struct s1 { const struct tt *mp; };
+;   int test1(struct s1 *arg)
+;   {
+;     return  0;
+;   }
+;
+;   struct tt { int m1; int m2; };
+;   struct s2 { const struct tt m3; };
+;   int test2(struct s2 *arg)
+;   {
+;     return arg->m3.m1;
+;   }
+; Compilation flags:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.s1 = type { %struct.tt* }
+%struct.tt = type { i32, i32 }
+%struct.s2 = type { %struct.tt }
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @test1(%struct.s1* nocapture readnone %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* %arg, metadata !22, metadata !DIExpression()), !dbg !23
+  ret i32 0, !dbg !24
+}
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test2(%struct.s2* nocapture readonly %arg) local_unnamed_addr #1 !dbg !25 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s2* %arg, metadata !33, metadata !DIExpression()), !dbg !34
+  %m1 = getelementptr inbounds %struct.s2, %struct.s2* %arg, i64 0, i32 0, i32 0, !dbg !35
+  %0 = load i32, i32* %m1, align 4, !dbg !35, !tbaa !36
+  ret i32 %0, !dbg !42
+}
+
+; CHECK:        .long   0                       # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT:   .long   167772160               # 0xa000000
+; CHECK-NEXT:   .long   10
+
+; CHECK:        .long   60                      # BTF_KIND_STRUCT(id = 9)
+; CHECK-NEXT:   .long   67108865                # 0x4000001
+; CHECK-NEXT:   .long   8
+; CHECK-NEXT:   .long   63
+; CHECK-NEXT:   .long   4
+; CHECK-NEXT:   .long   0                       # 0x0
+
+; CHECK:        .long   66                      # BTF_KIND_STRUCT(id = 10)
+; CHECK-NEXT:   .long   67108866                # 0x4000002
+; CHECK-NEXT:   .long   8
+; CHECK-NEXT:   .long   69
+; CHECK-NEXT:   .long   6
+; CHECK-NEXT:   .long   0                       # 0x0
+; CHECK-NEXT:   .long   72
+; CHECK-NEXT:   .long   6
+; CHECK-NEXT:   .long   32                      # 0x20
+
+; CHECK:        .ascii  "s2"                    # string offset=60
+; CHECK:        .ascii  "m3"                    # string offset=63
+; CHECK:        .ascii  "tt"                    # string offset=66
+; CHECK:        .ascii  "m1"                    # string offset=69
+; CHECK:        .ascii  "m2"                    # string offset=72
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 7cfd267c518aba226b34b7fbfe8db70000b22053)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/btf")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 7cfd267c518aba226b34b7fbfe8db70000b22053)"}
+!7 = distinct !DISubprogram(name: "test1", scope: !1, file: !1, line: 3, type: !8, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !21)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 2, size: 64, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "mp", scope: !12, file: !1, line: 2, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !17)
+!17 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "tt", file: !1, line: 8, size: 64, elements: !18)
+!18 = !{!19, !20}
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "m1", scope: !17, file: !1, line: 8, baseType: !10, size: 32)
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "m2", scope: !17, file: !1, line: 8, baseType: !10, size: 32, offset: 32)
+!21 = !{!22}
+!22 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 3, type: !11)
+!23 = !DILocation(line: 0, scope: !7)
+!24 = !DILocation(line: 5, column: 3, scope: !7)
+!25 = distinct !DISubprogram(name: "test2", scope: !1, file: !1, line: 10, type: !26, scopeLine: 11, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !32)
+!26 = !DISubroutineType(types: !27)
+!27 = !{!10, !28}
+!28 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !29, size: 64)
+!29 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s2", file: !1, line: 9, size: 64, elements: !30)
+!30 = !{!31}
+!31 = !DIDerivedType(tag: DW_TAG_member, name: "m3", scope: !29, file: !1, line: 9, baseType: !16, size: 64)
+!32 = !{!33}
+!33 = !DILocalVariable(name: "arg", arg: 1, scope: !25, file: !1, line: 10, type: !28)
+!34 = !DILocation(line: 0, scope: !25)
+!35 = !DILocation(line: 12, column: 18, scope: !25)
+!36 = !{!37, !39, i64 0}
+!37 = !{!"s2", !38, i64 0}
+!38 = !{!"tt", !39, i64 0, !39, i64 4}
+!39 = !{!"int", !40, i64 0}
+!40 = !{!"omnipotent char", !41, i64 0}
+!41 = !{!"Simple C/C++ TBAA"}
+!42 = !DILocation(line: 12, column: 3, scope: !25)
diff --git a/llvm/test/CodeGen/SBF/BTF/pruning-multi-derived-type.ll b/llvm/test/CodeGen/SBF/BTF/pruning-multi-derived-type.ll
new file mode 100644
index 0000000000000..1011341a70610
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/pruning-multi-derived-type.ll
@@ -0,0 +1,86 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; Source:
+;   struct t1 {
+;     int a;
+;   };
+;   struct t2 {
+;     const struct t1 * const a;
+;   };
+;   int foo(struct t2 *arg) { return 0; }
+;   int bar(const struct t1 * const arg) { return 0; }
+; Compilation flags:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t2 = type { %struct.t1* }
+%struct.t1 = type { i32 }
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind readnone willreturn
+define dso_local i32 @foo(%struct.t2* nocapture noundef readnone %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.t2* %arg, metadata !22, metadata !DIExpression()), !dbg !23
+  ret i32 0, !dbg !24
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind readnone willreturn
+define dso_local i32 @bar(%struct.t1* nocapture noundef readnone %arg) local_unnamed_addr #0 !dbg !25 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.t1* %arg, metadata !29, metadata !DIExpression()), !dbg !30
+  ret i32 0, !dbg !31
+}
+
+; CHECK:             .long   10                              # BTF_KIND_INT(id = 7)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+
+; CHECK:             .long   69                              # BTF_KIND_STRUCT(id = 9)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   7
+
+; CHECK:             .byte   97                              # string offset=4
+; CHECK:             .ascii  "t1"                            # string offset=69
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind readnone willreturn "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git c34c8afcb85ae9142d0f783bb899c464e8bd2356)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_ptr", checksumkind: CSK_MD5, checksum: "d43a0541e830263021772349589e47a5")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git c34c8afcb85ae9142d0f783bb899c464e8bd2356)"}
+!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 7, type: !8, scopeLine: 7, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !21)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t2", file: !1, line: 4, size: 64, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 5, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !16)
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64)
+!17 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !18)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !1, line: 1, size: 32, elements: !19)
+!19 = !{!20}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !18, file: !1, line: 2, baseType: !10, size: 32)
+!21 = !{!22}
+!22 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 7, type: !11)
+!23 = !DILocation(line: 0, scope: !7)
+!24 = !DILocation(line: 7, column: 27, scope: !7)
+!25 = distinct !DISubprogram(name: "bar", scope: !1, file: !1, line: 8, type: !26, scopeLine: 8, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !28)
+!26 = !DISubroutineType(types: !27)
+!27 = !{!10, !15}
+!28 = !{!29}
+!29 = !DILocalVariable(name: "arg", arg: 1, scope: !25, file: !1, line: 8, type: !15)
+!30 = !DILocation(line: 0, scope: !25)
+!31 = !DILocation(line: 8, column: 40, scope: !25)
diff --git a/llvm/test/CodeGen/SBF/BTF/pruning-typedef.ll b/llvm/test/CodeGen/SBF/BTF/pruning-typedef.ll
new file mode 100644
index 0000000000000..5dd38e6bbeed3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/pruning-typedef.ll
@@ -0,0 +1,127 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; Source:
+;   struct tt;
+;   typedef struct tt _tt;
+;   typedef _tt __tt;
+;   struct s1 { __tt *mp; };
+;   int test1(struct s1 *arg)
+;   {
+;     return  0;
+;   }
+;
+;   struct tt { int m1; int m2; };
+;   struct s2 { __tt m3; };
+;   int test2(struct s2 *arg)
+;   {
+;     return arg->m3.m1;
+;   }
+; Compilation flags:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.s1 = type { %struct.tt* }
+%struct.tt = type { i32, i32 }
+%struct.s2 = type { %struct.tt }
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @test1(%struct.s1* nocapture readnone %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* %arg, metadata !23, metadata !DIExpression()), !dbg !24
+  ret i32 0, !dbg !25
+}
+
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test2(%struct.s2* nocapture readonly %arg) local_unnamed_addr #1 !dbg !26 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s2* %arg, metadata !34, metadata !DIExpression()), !dbg !35
+  %m1 = getelementptr inbounds %struct.s2, %struct.s2* %arg, i64 0, i32 0, i32 0, !dbg !36
+  %0 = load i32, i32* %m1, align 4, !dbg !36, !tbaa !37
+  ret i32 %0, !dbg !43
+}
+
+; CHECK:        .long   7                       # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT:   .long   134217728               # 0x8000000
+; CHECK-NEXT:   .long   5
+; CHECK-NEXT:   .long   12                      # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT:   .long   134217728               # 0x8000000
+; CHECK-NEXT:   .long   11
+
+; CHECK:        .long   69                      # BTF_KIND_STRUCT(id = 10)
+; CHECK-NEXT:   .long   67108865                # 0x4000001
+; CHECK-NEXT:   .long   8
+; CHECK-NEXT:   .long   72
+; CHECK-NEXT:   .long   4
+; CHECK-NEXT:   .long   0                       # 0x0
+
+; CHECK:        .long   75                      # BTF_KIND_STRUCT(id = 11)
+; CHECK-NEXT:   .long   67108866                # 0x4000002
+; CHECK-NEXT:   .long   8
+; CHECK-NEXT:   .long   78
+; CHECK-NEXT:   .long   7
+; CHECK-NEXT:   .long   0                       # 0x0
+; CHECK-NEXT:   .long   81
+; CHECK-NEXT:   .long   7
+; CHECK-NEXT:   .long   32                      # 0x20
+
+; CHECK:        .ascii  "__tt"                  # string offset=7
+; CHECK:        .ascii  "_tt"                   # string offset=12
+; CHECK:        .ascii  "s2"                    # string offset=69
+; CHECK:        .ascii  "m3"                    # string offset=72
+; CHECK:        .ascii  "tt"                    # string offset=75
+; CHECK:        .ascii  "m1"                    # string offset=78
+; CHECK:        .ascii  "m2"                    # string offset=81
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 7cfd267c518aba226b34b7fbfe8db70000b22053)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/btf")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 7cfd267c518aba226b34b7fbfe8db70000b22053)"}
+!7 = distinct !DISubprogram(name: "test1", scope: !1, file: !1, line: 5, type: !8, scopeLine: 6, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !22)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 4, size: 64, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "mp", scope: !12, file: !1, line: 4, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIDerivedType(tag: DW_TAG_typedef, name: "__tt", file: !1, line: 3, baseType: !17)
+!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "_tt", file: !1, line: 2, baseType: !18)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "tt", file: !1, line: 10, size: 64, elements: !19)
+!19 = !{!20, !21}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "m1", scope: !18, file: !1, line: 10, baseType: !10, size: 32)
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "m2", scope: !18, file: !1, line: 10, baseType: !10, size: 32, offset: 32)
+!22 = !{!23}
+!23 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 5, type: !11)
+!24 = !DILocation(line: 0, scope: !7)
+!25 = !DILocation(line: 7, column: 3, scope: !7)
+!26 = distinct !DISubprogram(name: "test2", scope: !1, file: !1, line: 12, type: !27, scopeLine: 13, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !33)
+!27 = !DISubroutineType(types: !28)
+!28 = !{!10, !29}
+!29 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !30, size: 64)
+!30 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s2", file: !1, line: 11, size: 64, elements: !31)
+!31 = !{!32}
+!32 = !DIDerivedType(tag: DW_TAG_member, name: "m3", scope: !30, file: !1, line: 11, baseType: !16, size: 64)
+!33 = !{!34}
+!34 = !DILocalVariable(name: "arg", arg: 1, scope: !26, file: !1, line: 12, type: !29)
+!35 = !DILocation(line: 0, scope: !26)
+!36 = !DILocation(line: 14, column: 18, scope: !26)
+!37 = !{!38, !40, i64 0}
+!38 = !{!"s2", !39, i64 0}
+!39 = !{!"tt", !40, i64 0, !40, i64 4}
+!40 = !{!"int", !41, i64 0}
+!41 = !{!"omnipotent char", !42, i64 0}
+!42 = !{!"Simple C/C++ TBAA"}
+!43 = !DILocation(line: 14, column: 3, scope: !26)
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-const-void.ll b/llvm/test/CodeGen/SBF/BTF/ptr-const-void.ll
new file mode 100644
index 0000000000000..50e2a6754a875
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-const-void.ll
@@ -0,0 +1,42 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   const void *a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@p = common dso_local local_unnamed_addr global i8* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10}
+!llvm.ident = !{!11}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 2)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "p", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!8 = !{i32 2, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-func-1.ll b/llvm/test/CodeGen/SBF/BTF/ptr-func-1.ll
new file mode 100644
index 0000000000000..ecf63ed389060
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-func-1.ll
@@ -0,0 +1,43 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   void (*a)(void);
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global void ()* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{null}
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-func-2.ll b/llvm/test/CodeGen/SBF/BTF/ptr-func-2.ll
new file mode 100644
index 0000000000000..9cbb49dce2dc7
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-func-2.ll
@@ -0,0 +1,61 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int (*a)(int a, char b);
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i32 (i32, i8)* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103810               # 0xd000002
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-func-3.ll b/llvm/test/CodeGen/SBF/BTF/ptr-func-3.ll
new file mode 100644
index 0000000000000..37d78353ee979
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-func-3.ll
@@ -0,0 +1,61 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   typedef int __int;
+;   __int (*a)(__int a, __int b);
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i32 (i32, i32)* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   68
+; CHECK-NEXT:        .long   68
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 2)
+; CHECK-NEXT:        .long   218103810               # 0xd000002
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   1                       # BTF_KIND_TYPEDEF(id = 3)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   7                       # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "__int"                 # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=7
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !9, !9}
+!9 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !3, line: 1, baseType: !10)
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-int.ll b/llvm/test/CodeGen/SBF/BTF/ptr-int.ll
new file mode 100644
index 0000000000000..c2cc70451161a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-int.ll
@@ -0,0 +1,45 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int *a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i32* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10}
+!llvm.ident = !{!11}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 2, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-prune-type.ll b/llvm/test/CodeGen/SBF/BTF/ptr-prune-type.ll
new file mode 100644
index 0000000000000..aad49284a76ae
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-prune-type.ll
@@ -0,0 +1,83 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct t {
+;     int a;
+;   };
+;   struct t2 {
+;     struct t *f1;
+;   };
+;   struct t2 __attribute__((section("prune_types"))) g;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t2 = type { %struct.t* }
+%struct.t = type { i32 }
+
+@g = dso_local local_unnamed_addr global %struct.t2 zeroinitializer, section "prune_types", align 8, !dbg !0
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   7                       # BTF_KIND_VAR(id = 3)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   9                       # BTF_KIND_DATASEC(id = 4)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   g
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   21                      # BTF_KIND_FWD(id = 5)
+; CHECK-NEXT:        .long   117440512               # 0x7000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "t2"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "f1"                    # string offset=4
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   103                     # string offset=7
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "prune_types"           # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   116                     # string offset=21
+; CHECK-NEXT:        .byte   0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 7, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 9.0.0 (trunk 364157) (llvm/trunk 364156)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t2", file: !3, line: 4, size: 64, elements: !7)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !6, file: !3, line: 5, baseType: !9, size: 64)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t", file: !3, line: 1, size: 32, elements: !11)
+!11 = !{!12}
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !10, file: !3, line: 2, baseType: !13, size: 32)
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !{i32 2, !"Dwarf Version", i32 4}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{!"clang version 9.0.0 (trunk 364157) (llvm/trunk 364156)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-void.ll b/llvm/test/CodeGen/SBF/BTF/ptr-void.ll
new file mode 100644
index 0000000000000..557b44cc9c6cb
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-void.ll
@@ -0,0 +1,38 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   void *a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i8* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-volatile-const-void.ll b/llvm/test/CodeGen/SBF/BTF/ptr-volatile-const-void.ll
new file mode 100644
index 0000000000000..881c10669a1e4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-volatile-const-void.ll
@@ -0,0 +1,46 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   volatile const void *p;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@p = common dso_local local_unnamed_addr global i8* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 2)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 3)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "p", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !8)
+!8 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: null)
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ptr-volatile-void.ll b/llvm/test/CodeGen/SBF/BTF/ptr-volatile-void.ll
new file mode 100644
index 0000000000000..21cf61309bb76
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ptr-volatile-void.ll
@@ -0,0 +1,42 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   volatile void *a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@p = common dso_local local_unnamed_addr global i8* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10}
+!llvm.ident = !{!11}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 2)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .byte   0                       # string offset=0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "p", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: null)
+!8 = !{i32 2, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/restrict-ptr.ll b/llvm/test/CodeGen/SBF/BTF/restrict-ptr.ll
new file mode 100644
index 0000000000000..c5350f302ca2a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/restrict-ptr.ll
@@ -0,0 +1,49 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   int * restrict p;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@p = common dso_local local_unnamed_addr global i32* null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   40
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_RESTRICT(id = 1)
+; CHECK-NEXT:        .long   184549376               # 0xb000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "p", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !7)
+!7 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64)
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/short.ll b/llvm/test/CodeGen/SBF/BTF/short.ll
new file mode 100644
index 0000000000000..302739ce4c89c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/short.ll
@@ -0,0 +1,42 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   short a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+
+@a = common dso_local local_unnamed_addr global i16 0, align 2, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/static-func.ll b/llvm/test/CodeGen/SBF/BTF/static-func.ll
new file mode 100644
index 0000000000000..074b88a807677
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-func.ll
@@ -0,0 +1,95 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   extern int foo(void);
+;   static __attribute__((noinline)) int test1() { return foo(); }
+;   int test2() { return test1(); }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test2() local_unnamed_addr #0 !dbg !12 {
+entry:
+  %call = tail call fastcc i32 @test1(), !dbg !13
+  ret i32 %call, !dbg !14
+}
+; Function Attrs: noinline nounwind
+define internal fastcc i32 @test1() unnamed_addr #1 !dbg !15 {
+entry:
+  %call = tail call i32 @foo() #3, !dbg !16
+  ret i32 %call, !dbg !17
+}
+declare !dbg !4 dso_local i32 @foo() local_unnamed_addr #2
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   88
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 4)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   54                      # BTF_KIND_FUNC(id = 5)
+; CHECK-NEXT:        .long   201326592               # 0xc000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 6)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   60                      # BTF_KIND_FUNC(id = 7)
+; CHECK-NEXT:        .long   201326594               # 0xc000002
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test2"                 # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/bugs/test.c" # string offset=17
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test1"                 # string offset=54
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=60
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { noinline nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!8, !9, !10}
+!llvm.ident = !{!11}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 000f95c4157aee07bd4ffc3f59ffdb6c7ecae4af)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/bugs")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{!7}
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 000f95c4157aee07bd4ffc3f59ffdb6c7ecae4af)"}
+!12 = distinct !DISubprogram(name: "test2", scope: !1, file: !1, line: 3, type: !5, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!13 = !DILocation(line: 3, column: 22, scope: !12)
+!14 = !DILocation(line: 3, column: 15, scope: !12)
+!15 = distinct !DISubprogram(name: "test1", scope: !1, file: !1, line: 2, type: !5, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !2)
+!16 = !DILocation(line: 2, column: 55, scope: !15)
+!17 = !DILocation(line: 2, column: 48, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-derived-type.ll b/llvm/test/CodeGen/SBF/BTF/static-var-derived-type.ll
new file mode 100644
index 0000000000000..0785d72cfcc0f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-derived-type.ll
@@ -0,0 +1,189 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   typedef int * int_ptr;
+;   static int * volatile v1;
+;   static const int * volatile v2;
+;   static volatile int_ptr v3 = 0;
+;   static volatile const int_ptr v4 = 0;
+;   long foo() { return (long)(v1 - v2 + v3 - v4); }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@v1 = internal global i32* null, align 8, !dbg !0
+@v2 = internal global i32* null, align 8, !dbg !8
+@v3 = internal global i32* null, align 8, !dbg !14
+@v4 = internal constant i32* null, align 8, !dbg !19
+
+; Function Attrs: norecurse nounwind
+define dso_local i64 @foo() local_unnamed_addr #0 !dbg !27 {
+  %1 = load volatile i32*, i32** @v1, align 8, !dbg !29, !tbaa !30
+  %2 = load volatile i32*, i32** @v2, align 8, !dbg !34, !tbaa !30
+  %3 = ptrtoint i32* %1 to i64, !dbg !35
+  %4 = ptrtoint i32* %2 to i64, !dbg !35
+  %5 = sub i64 %3, %4, !dbg !35
+  %6 = ashr exact i64 %5, 2, !dbg !35
+  %7 = load volatile i32*, i32** @v3, align 8, !dbg !36, !tbaa !30
+  %8 = getelementptr inbounds i32, i32* %7, i64 %6, !dbg !37
+  %9 = load volatile i32*, i32** @v4, align 8, !dbg !38, !tbaa !30
+  %10 = ptrtoint i32* %8 to i64, !dbg !39
+  %11 = ptrtoint i32* %9 to i64, !dbg !39
+  %12 = sub i64 %10, %11, !dbg !39
+  %13 = ashr exact i64 %12, 2, !dbg !39
+  ret i64 %13, !dbg !40
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   288
+; CHECK-NEXT:        .long   288
+; CHECK-NEXT:        .long   95
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   16777280                # 0x1000040
+; CHECK-NEXT:        .long   10                      # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 5)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   58                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   62                      # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 8)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 9)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 10)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   65                      # BTF_KIND_VAR(id = 11)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 12)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   13
+; CHECK-NEXT:        .long   68                      # BTF_KIND_TYPEDEF(id = 13)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   76                      # BTF_KIND_VAR(id = 14)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 15)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   79                      # BTF_KIND_VAR(id = 16)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   15
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   82                      # BTF_KIND_DATASEC(id = 17)
+; CHECK-NEXT:        .long   251658243               # 0xf000003
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   v1
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   v2
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   14
+; CHECK-NEXT:        .long   v3
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   87                      # BTF_KIND_DATASEC(id = 18)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   v4
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "long int"              # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=14
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bugs/test.c" # string offset=20
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "v1"                    # string offset=62
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "v2"                    # string offset=65
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int_ptr"               # string offset=68
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "v3"                    # string offset=76
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "v4"                    # string offset=79
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".bss"                  # string offset=82
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".rodata"               # string offset=87
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!23, !24, !25}
+!llvm.ident = !{!26}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "v1", scope: !2, file: !3, line: 2, type: !22, isLocal: true, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !5, globals: !7, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bugs")
+!4 = !{}
+!5 = !{!6}
+!6 = !DIBasicType(name: "long int", size: 64, encoding: DW_ATE_signed)
+!7 = !{!0, !8, !14, !19}
+!8 = !DIGlobalVariableExpression(var: !9, expr: !DIExpression())
+!9 = distinct !DIGlobalVariable(name: "v2", scope: !2, file: !3, line: 3, type: !10, isLocal: true, isDefinition: true)
+!10 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !11)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !13)
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIGlobalVariableExpression(var: !15, expr: !DIExpression())
+!15 = distinct !DIGlobalVariable(name: "v3", scope: !2, file: !3, line: 4, type: !16, isLocal: true, isDefinition: true)
+!16 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !17)
+!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "int_ptr", file: !3, line: 1, baseType: !18)
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64)
+!19 = !DIGlobalVariableExpression(var: !20, expr: !DIExpression())
+!20 = distinct !DIGlobalVariable(name: "v4", scope: !2, file: !3, line: 5, type: !21, isLocal: true, isDefinition: true)
+!21 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !16)
+!22 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !18)
+!23 = !{i32 2, !"Dwarf Version", i32 4}
+!24 = !{i32 2, !"Debug Info Version", i32 3}
+!25 = !{i32 1, !"wchar_size", i32 4}
+!26 = !{!"clang version 8.0.20181009 "}
+!27 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 6, type: !28, isLocal: false, isDefinition: true, scopeLine: 6, isOptimized: true, unit: !2, retainedNodes: !4)
+!28 = !DISubroutineType(types: !5)
+!29 = !DILocation(line: 6, column: 28, scope: !27)
+!30 = !{!31, !31, i64 0}
+!31 = !{!"any pointer", !32, i64 0}
+!32 = !{!"omnipotent char", !33, i64 0}
+!33 = !{!"Simple C/C++ TBAA"}
+!34 = !DILocation(line: 6, column: 33, scope: !27)
+!35 = !DILocation(line: 6, column: 31, scope: !27)
+!36 = !DILocation(line: 6, column: 38, scope: !27)
+!37 = !DILocation(line: 6, column: 36, scope: !27)
+!38 = !DILocation(line: 6, column: 43, scope: !27)
+!39 = !DILocation(line: 6, column: 41, scope: !27)
+!40 = !DILocation(line: 6, column: 14, scope: !27)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-inited-sec.ll b/llvm/test/CodeGen/SBF/BTF/static-var-inited-sec.ll
new file mode 100644
index 0000000000000..8752af0602039
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-inited-sec.ll
@@ -0,0 +1,129 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   static volatile char a __attribute__((section("maps"))) = 3;
+;   int foo() {
+;     static volatile short b __attribute__((section("maps"))) = 4;
+;     return a + b;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@foo.b = internal global i16 4, section "maps", align 2, !dbg !0
+@a = internal global i8 3, section "maps", align 1, !dbg !10
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !2 {
+  %1 = load volatile i8, i8* @a, align 1, !dbg !20, !tbaa !21
+  %2 = sext i8 %1 to i32, !dbg !20
+  %3 = load volatile i16, i16* @foo.b, align 2, !dbg !24, !tbaa !25
+  %4 = sext i16 %3 to i32, !dbg !24
+  %5 = add nsw i32 %4, %2, !dbg !27
+  ret i32 %5, !dbg !28
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   76
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   52                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .long   58                      # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   64                      # BTF_KIND_INT(id = 8)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   69                      # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   71                      # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   foo.b
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=52
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo.b"                 # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=69
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "maps"                  # string offset=71
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !3, line: 3, type: !14, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 2, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !7, retainedNodes: !8)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
+!8 = !{}
+!9 = !{!0, !10}
+!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
+!11 = distinct !DIGlobalVariable(name: "a", scope: !7, file: !3, line: 1, type: !12, isLocal: true, isDefinition: true)
+!12 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !13)
+!13 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!14 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !15)
+!15 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 8.0.20181009 "}
+!20 = !DILocation(line: 4, column: 10, scope: !2)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 14, scope: !2)
+!25 = !{!26, !26, i64 0}
+!26 = !{!"short", !22, i64 0}
+!27 = !DILocation(line: 4, column: 12, scope: !2)
+!28 = !DILocation(line: 4, column: 3, scope: !2)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-inited.ll b/llvm/test/CodeGen/SBF/BTF/static-var-inited.ll
new file mode 100644
index 0000000000000..48a527d13d5ca
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-inited.ll
@@ -0,0 +1,129 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   static volatile char a = 3;
+;   int foo() {
+;     static volatile short b = 4;
+;     return a + b;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@foo.b = internal global i16 4, align 2, !dbg !0
+@a = internal global i8 3, align 1, !dbg !10
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !2 {
+  %1 = load volatile i8, i8* @a, align 1, !dbg !20, !tbaa !21
+  %2 = sext i8 %1 to i32, !dbg !20
+  %3 = load volatile i16, i16* @foo.b, align 2, !dbg !24, !tbaa !25
+  %4 = sext i16 %3 to i32, !dbg !24
+  %5 = add nsw i32 %4, %2, !dbg !27
+  ret i32 %5, !dbg !28
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   77
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   52                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .long   58                      # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   64                      # BTF_KIND_INT(id = 8)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   69                      # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   71                      # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   foo.b
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=52
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo.b"                 # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=69
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".data"                 # string offset=71
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !3, line: 3, type: !14, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 2, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !7, retainedNodes: !8)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
+!8 = !{}
+!9 = !{!0, !10}
+!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
+!11 = distinct !DIGlobalVariable(name: "a", scope: !7, file: !3, line: 1, type: !12, isLocal: true, isDefinition: true)
+!12 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !13)
+!13 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!14 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !15)
+!15 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 8.0.20181009 "}
+!20 = !DILocation(line: 4, column: 10, scope: !2)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 14, scope: !2)
+!25 = !{!26, !26, i64 0}
+!26 = !{!"short", !22, i64 0}
+!27 = !DILocation(line: 4, column: 12, scope: !2)
+!28 = !DILocation(line: 4, column: 3, scope: !2)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-readonly-sec.ll b/llvm/test/CodeGen/SBF/BTF/static-var-readonly-sec.ll
new file mode 100644
index 0000000000000..bbbb3262988db
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-readonly-sec.ll
@@ -0,0 +1,137 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   static volatile const char __attribute__((section("maps"))) a;
+;   int foo() {
+;     static volatile const short b __attribute__((section("maps"))) = 3;
+;     return a + b;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@foo.b = internal constant i16 3, section "maps", align 2, !dbg !0
+@a = internal constant i8 0, section "maps", align 1, !dbg !10
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !2 {
+  %1 = load volatile i8, i8* @a, align 1, !dbg !22, !tbaa !23
+  %2 = sext i8 %1 to i32, !dbg !22
+  %3 = load volatile i16, i16* @foo.b, align 2, !dbg !26, !tbaa !27
+  %4 = sext i16 %3 to i32, !dbg !26
+  %5 = add nsw i32 %4, %2, !dbg !29
+  ret i32 %5, !dbg !30
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   188
+; CHECK-NEXT:        .long   188
+; CHECK-NEXT:        .long   76
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 5)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   52                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .long   58                      # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 8)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 9)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   64                      # BTF_KIND_INT(id = 10)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   69                      # BTF_KIND_VAR(id = 11)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   71                      # BTF_KIND_DATASEC(id = 12)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   foo.b
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=52
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo.b"                 # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=69
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "maps"                  # string offset=71
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!18, !19, !20}
+!llvm.ident = !{!21}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !3, line: 3, type: !15, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 2, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !7, retainedNodes: !8)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
+!8 = !{}
+!9 = !{!0, !10}
+!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
+!11 = distinct !DIGlobalVariable(name: "a", scope: !7, file: !3, line: 1, type: !12, isLocal: true, isDefinition: true)
+!12 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !13)
+!13 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !14)
+!14 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!15 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !16)
+!16 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !17)
+!17 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!18 = !{i32 2, !"Dwarf Version", i32 4}
+!19 = !{i32 2, !"Debug Info Version", i32 3}
+!20 = !{i32 1, !"wchar_size", i32 4}
+!21 = !{!"clang version 8.0.20181009 "}
+!22 = !DILocation(line: 4, column: 10, scope: !2)
+!23 = !{!24, !24, i64 0}
+!24 = !{!"omnipotent char", !25, i64 0}
+!25 = !{!"Simple C/C++ TBAA"}
+!26 = !DILocation(line: 4, column: 14, scope: !2)
+!27 = !{!28, !28, i64 0}
+!28 = !{!"short", !24, i64 0}
+!29 = !DILocation(line: 4, column: 12, scope: !2)
+!30 = !DILocation(line: 4, column: 3, scope: !2)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-readonly.ll b/llvm/test/CodeGen/SBF/BTF/static-var-readonly.ll
new file mode 100644
index 0000000000000..9358f34867772
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-readonly.ll
@@ -0,0 +1,137 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   static volatile const char a;
+;   int foo() {
+;     static volatile const short b = 3;
+;     return a + b;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@foo.b = internal constant i16 3, align 2, !dbg !0
+@a = internal constant i8 0, align 1, !dbg !10
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !2 {
+  %1 = load volatile i8, i8* @a, align 1, !dbg !22, !tbaa !23
+  %2 = sext i8 %1 to i32, !dbg !22
+  %3 = load volatile i16, i16* @foo.b, align 2, !dbg !26, !tbaa !27
+  %4 = sext i16 %3 to i32, !dbg !26
+  %5 = add nsw i32 %4, %2, !dbg !29
+  ret i32 %5, !dbg !30
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   188
+; CHECK-NEXT:        .long   188
+; CHECK-NEXT:        .long   79
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 5)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   52                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .long   58                      # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_CONST(id = 8)
+; CHECK-NEXT:        .long   167772160               # 0xa000000
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 9)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   64                      # BTF_KIND_INT(id = 10)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   69                      # BTF_KIND_VAR(id = 11)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   71                      # BTF_KIND_DATASEC(id = 12)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   foo.b
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=52
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo.b"                 # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=69
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".rodata"               # string offset=71
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!18, !19, !20}
+!llvm.ident = !{!21}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !3, line: 3, type: !15, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 2, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !7, retainedNodes: !8)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
+!8 = !{}
+!9 = !{!0, !10}
+!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
+!11 = distinct !DIGlobalVariable(name: "a", scope: !7, file: !3, line: 1, type: !12, isLocal: true, isDefinition: true)
+!12 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !13)
+!13 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !14)
+!14 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!15 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !16)
+!16 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !17)
+!17 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!18 = !{i32 2, !"Dwarf Version", i32 4}
+!19 = !{i32 2, !"Debug Info Version", i32 3}
+!20 = !{i32 1, !"wchar_size", i32 4}
+!21 = !{!"clang version 8.0.20181009 "}
+!22 = !DILocation(line: 4, column: 10, scope: !2)
+!23 = !{!24, !24, i64 0}
+!24 = !{!"omnipotent char", !25, i64 0}
+!25 = !{!"Simple C/C++ TBAA"}
+!26 = !DILocation(line: 4, column: 14, scope: !2)
+!27 = !{!28, !28, i64 0}
+!28 = !{!"short", !24, i64 0}
+!29 = !DILocation(line: 4, column: 12, scope: !2)
+!30 = !DILocation(line: 4, column: 3, scope: !2)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-sec.ll b/llvm/test/CodeGen/SBF/BTF/static-var-sec.ll
new file mode 100644
index 0000000000000..81461c8a88b5f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-sec.ll
@@ -0,0 +1,129 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   static volatile char a __attribute__((section("maps")));
+;   int foo() {
+;     static volatile short b __attribute__((section("maps")));
+;     return a + b;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@foo.b = internal global i16 0, section "maps", align 2, !dbg !0
+@a = internal global i8 0, section "maps", align 1, !dbg !10
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !2 {
+  %1 = load volatile i8, i8* @a, align 1, !dbg !20, !tbaa !21
+  %2 = sext i8 %1 to i32, !dbg !20
+  %3 = load volatile i16, i16* @foo.b, align 2, !dbg !24, !tbaa !25
+  %4 = sext i16 %3 to i32, !dbg !24
+  %5 = add nsw i32 %4, %2, !dbg !27
+  ret i32 %5, !dbg !28
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   76
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   52                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .long   58                      # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   64                      # BTF_KIND_INT(id = 8)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   69                      # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   71                      # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   foo.b
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=52
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo.b"                 # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=69
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "maps"                  # string offset=71
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !3, line: 3, type: !14, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 2, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !7, retainedNodes: !8)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
+!8 = !{}
+!9 = !{!0, !10}
+!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
+!11 = distinct !DIGlobalVariable(name: "a", scope: !7, file: !3, line: 1, type: !12, isLocal: true, isDefinition: true)
+!12 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !13)
+!13 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!14 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !15)
+!15 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 8.0.20181009 "}
+!20 = !DILocation(line: 4, column: 10, scope: !2)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 14, scope: !2)
+!25 = !{!26, !26, i64 0}
+!26 = !{!"short", !22, i64 0}
+!27 = !DILocation(line: 4, column: 12, scope: !2)
+!28 = !DILocation(line: 4, column: 3, scope: !2)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var-zerolen-array.ll b/llvm/test/CodeGen/SBF/BTF/static-var-zerolen-array.ll
new file mode 100644
index 0000000000000..dc90823d0369c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var-zerolen-array.ll
@@ -0,0 +1,141 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct t {
+;     int a;
+;     int b;
+;     char c[];
+;   };
+;   static volatile struct t sv = {3, 4, "abcdefghi"};
+;   int test() { return sv.a; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@sv = internal global { i32, i32, [10 x i8] } { i32 3, i32 4, [10 x i8] c"abcdefghi\00" }, align 4, !dbg !0
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !21 {
+  %1 = load volatile i32, i32* getelementptr inbounds ({ i32, i32, [10 x i8] }, { i32, i32, [10 x i8] }* @sv, i64 0, i32 0), align 4, !dbg !24, !tbaa !25
+  ret i32 %1, !dbg !29
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   196
+; CHECK-NEXT:        .long   196
+; CHECK-NEXT:        .long   95
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   53                      # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT:        .long   67108867                # 0x4000003
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   55
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   57
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   59
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   64                      # 0x40
+; CHECK-NEXT:        .long   61                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 7)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   66                      # BTF_KIND_INT(id = 8)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   86                      # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   89                      # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   sv
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "test"                  # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=16
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   116                     # string offset=53
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=55
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   98                      # string offset=57
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   99                      # string offset=59
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=61
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=66
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "sv"                    # string offset=86
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".data"                 # string offset=89
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!17, !18, !19}
+!llvm.ident = !{!20}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "sv", scope: !2, file: !3, line: 6, type: !6, isLocal: true, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !7)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t", file: !3, line: 1, size: 64, elements: !8)
+!8 = !{!9, !11, !12}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !7, file: !3, line: 2, baseType: !10, size: 32)
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !7, file: !3, line: 3, baseType: !10, size: 32, offset: 32)
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !7, file: !3, line: 4, baseType: !13, offset: 64)
+!13 = !DICompositeType(tag: DW_TAG_array_type, baseType: !14, elements: !15)
+!14 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!15 = !{!16}
+!16 = !DISubrange(count: -1)
+!17 = !{i32 2, !"Dwarf Version", i32 4}
+!18 = !{i32 2, !"Debug Info Version", i32 3}
+!19 = !{i32 1, !"wchar_size", i32 4}
+!20 = !{!"clang version 8.0.20181009 "}
+!21 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 7, type: !22, isLocal: false, isDefinition: true, scopeLine: 7, isOptimized: true, unit: !2, retainedNodes: !4)
+!22 = !DISubroutineType(types: !23)
+!23 = !{!10}
+!24 = !DILocation(line: 7, column: 24, scope: !21)
+!25 = !{!26, !26, i64 0}
+!26 = !{!"int", !27, i64 0}
+!27 = !{!"omnipotent char", !28, i64 0}
+!28 = !{!"Simple C/C++ TBAA"}
+!29 = !DILocation(line: 7, column: 14, scope: !21)
diff --git a/llvm/test/CodeGen/SBF/BTF/static-var.ll b/llvm/test/CodeGen/SBF/BTF/static-var.ll
new file mode 100644
index 0000000000000..2ba7957b7af85
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/static-var.ll
@@ -0,0 +1,129 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   static volatile char a;
+;   int foo() {
+;     static volatile short b;
+;     return a + b;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@foo.b = internal global i16 0, align 2, !dbg !0
+@a = internal global i8 0, align 1, !dbg !10
+
+; Function Attrs: norecurse nounwind
+define dso_local i32 @foo() local_unnamed_addr #0 !dbg !2 {
+  %1 = load volatile i8, i8* @a, align 1, !dbg !20, !tbaa !21
+  %2 = sext i8 %1 to i32, !dbg !20
+  %3 = load volatile i16, i16* @foo.b, align 2, !dbg !24, !tbaa !25
+  %4 = sext i16 %3 to i32, !dbg !24
+  %5 = add nsw i32 %4, %2, !dbg !27
+  ret i32 %5, !dbg !28
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   164
+; CHECK-NEXT:        .long   76
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808               # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   5                       # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 4)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   52                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16777232                # 0x1000010
+; CHECK-NEXT:        .long   58                      # BTF_KIND_VAR(id = 6)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_VOLATILE(id = 7)
+; CHECK-NEXT:        .long   150994944               # 0x9000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   64                      # BTF_KIND_INT(id = 8)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   69                      # BTF_KIND_VAR(id = 9)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   71                      # BTF_KIND_DATASEC(id = 10)
+; CHECK-NEXT:        .long   251658242               # 0xf000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   foo.b
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   a
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo"                   # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/home/yhs/work/tests/llvm/bug/test.c" # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "short"                 # string offset=52
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "foo.b"                 # string offset=58
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   97                      # string offset=69
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".bss"                  # string offset=71
+; CHECK-NEXT:        .byte   0
+
+attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!7}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !3, line: 3, type: !14, isLocal: true, isDefinition: true)
+!2 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 2, type: !4, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !7, retainedNodes: !8)
+!3 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/llvm/bug")
+!4 = !DISubroutineType(types: !5)
+!5 = !{!6}
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.20181009 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !8, globals: !9, nameTableKind: None)
+!8 = !{}
+!9 = !{!0, !10}
+!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
+!11 = distinct !DIGlobalVariable(name: "a", scope: !7, file: !3, line: 1, type: !12, isLocal: true, isDefinition: true)
+!12 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !13)
+!13 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!14 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !15)
+!15 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 8.0.20181009 "}
+!20 = !DILocation(line: 4, column: 10, scope: !2)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 4, column: 14, scope: !2)
+!25 = !{!26, !26, i64 0}
+!26 = !{!"short", !22, i64 0}
+!27 = !DILocation(line: 4, column: 12, scope: !2)
+!28 = !DILocation(line: 4, column: 3, scope: !2)
diff --git a/llvm/test/CodeGen/SBF/BTF/struct-anon-2.ll b/llvm/test/CodeGen/SBF/BTF/struct-anon-2.ll
new file mode 100644
index 0000000000000..0ae5c89af2b08
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/struct-anon-2.ll
@@ -0,0 +1,105 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   struct s1 {
+;     struct { int A1; } a1;
+;     struct { long B1; } *b1;
+;   };
+;   int f1(struct s1 *s1) { return 0; }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.s1 = type { %struct.anon, %struct.anon.0* }
+%struct.anon = type { i32 }
+%struct.anon.0 = type { i64 }
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @f1(%struct.s1* nocapture readnone %s1) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* %s1, metadata !25, metadata !DIExpression()), !dbg !26
+  ret i32 0, !dbg !27
+}
+
+; CHECK:             .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   64                      # 0x40
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   13                      # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 5)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 6)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   17
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   20                      # BTF_KIND_INT(id = 7)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   16777280                # 0x1000040
+
+; CHECK:             .ascii  "s1"                    # string offset=1
+; CHECK:             .ascii  "a1"                    # string offset=4
+; CHECK:             .ascii  "b1"                    # string offset=7
+; CHECK:             .ascii  "A1"                    # string offset=10
+; CHECK:             .ascii  "int"                   # string offset=13
+; CHECK:             .ascii  "B1"                    # string offset=17
+; CHECK:             .ascii  "long int"              # string offset=20
+
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git ef36f5143d83897cc6f59ff918769d29ad5a0612)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/btf/tmp")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git ef36f5143d83897cc6f59ff918769d29ad5a0612)"}
+!7 = distinct !DISubprogram(name: "f1", scope: !1, file: !1, line: 5, type: !8, scopeLine: 5, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !24)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 128, elements: !13)
+!13 = !{!14, !18}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !12, file: !1, line: 2, baseType: !15, size: 32)
+!15 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !12, file: !1, line: 2, size: 32, elements: !16)
+!16 = !{!17}
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "A1", scope: !15, file: !1, line: 2, baseType: !10, size: 32)
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !12, file: !1, line: 3, baseType: !19, size: 64, offset: 64)
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !20, size: 64)
+!20 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !12, file: !1, line: 3, size: 64, elements: !21)
+!21 = !{!22}
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "B1", scope: !20, file: !1, line: 3, baseType: !23, size: 64)
+!23 = !DIBasicType(name: "long int", size: 64, encoding: DW_ATE_signed)
+!24 = !{!25}
+!25 = !DILocalVariable(name: "s1", arg: 1, scope: !7, file: !1, line: 5, type: !11)
+!26 = !DILocation(line: 0, scope: !7)
+!27 = !DILocation(line: 5, column: 25, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/BTF/struct-anon.ll b/llvm/test/CodeGen/SBF/BTF/struct-anon.ll
new file mode 100644
index 0000000000000..150d711640171
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/struct-anon.ll
@@ -0,0 +1,64 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct { struct {int m;}; } a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.anon = type { %struct.anon.0 }
+%struct.anon.0 = type { i32 }
+
+@a = common dso_local local_unnamed_addr global %struct.anon zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!13, !14, !15}
+!llvm.ident = !{!16}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   3                       # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .byte   109                     # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=3
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !3, line: 1, size: 32, elements: !7)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_member, scope: !6, file: !3, line: 1, baseType: !9, size: 32)
+!9 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !6, file: !3, line: 1, size: 32, elements: !10)
+!10 = !{!11}
+!11 = !DIDerivedType(tag: DW_TAG_member, name: "m", scope: !9, file: !3, line: 1, baseType: !12, size: 32)
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{i32 2, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/struct-basic.ll b/llvm/test/CodeGen/SBF/BTF/struct-basic.ll
new file mode 100644
index 0000000000000..5e65eb38cdf17
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/struct-basic.ll
@@ -0,0 +1,69 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   struct t1 {char m1; int n1;} a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t1 = type { i8, i32 }
+
+@a = common dso_local local_unnamed_addr global %struct.t1 zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!12, !13, !14}
+!llvm.ident = !{!15}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   68
+; CHECK-NEXT:        .long   68
+; CHECK-NEXT:        .long   19
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   10                      # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   15                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "m1"                    # string offset=4
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "n1"                    # string offset=7
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=10
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=15
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 1, size: 64, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "m1", scope: !6, file: !3, line: 1, baseType: !9, size: 8)
+!9 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "n1", scope: !6, file: !3, line: 1, baseType: !11, size: 32, offset: 32)
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !{i32 2, !"Dwarf Version", i32 4}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/struct-bitfield-typedef.ll b/llvm/test/CodeGen/SBF/BTF/struct-bitfield-typedef.ll
new file mode 100644
index 0000000000000..00cb3a3eb529a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/struct-bitfield-typedef.ll
@@ -0,0 +1,87 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   typedef int _int;
+;   typedef _int __int;
+;   struct {char m:2; __int n:3; char p;} a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.anon = type { i8, i8, [2 x i8] }
+
+@a = common dso_local local_unnamed_addr global %struct.anon zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!15, !16, !17}
+!llvm.ident = !{!18}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   27
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   2214592515              # 0x84000003
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   50331650                # 0x3000002
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   8                       # 0x8
+; CHECK-NEXT:        .long   7                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   12                      # BTF_KIND_TYPEDEF(id = 3)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   18                      # BTF_KIND_TYPEDEF(id = 4)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   23                      # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .byte   109                     # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   110                     # string offset=3
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   112                     # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=7
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__int"                 # string offset=12
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "_int"                  # string offset=18
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=23
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 3, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !3, line: 3, size: 32, elements: !7)
+!7 = !{!8, !10, !14}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "m", scope: !6, file: !3, line: 3, baseType: !9, size: 2, flags: DIFlagBitField, extraData: i64 0)
+!9 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "n", scope: !6, file: !3, line: 3, baseType: !11, size: 3, offset: 2, flags: DIFlagBitField, extraData: i64 0)
+!11 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !3, line: 2, baseType: !12)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !3, line: 1, baseType: !13)
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "p", scope: !6, file: !3, line: 3, baseType: !9, size: 8, offset: 8)
+!15 = !{i32 2, !"Dwarf Version", i32 4}
+!16 = !{i32 2, !"Debug Info Version", i32 3}
+!17 = !{i32 1, !"wchar_size", i32 4}
+!18 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/struct-enum.ll b/llvm/test/CodeGen/SBF/BTF/struct-enum.ll
new file mode 100644
index 0000000000000..368b1241b9cb0
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/struct-enum.ll
@@ -0,0 +1,74 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   enum t1 { A , B };
+;   struct t2 { enum t1 m:2; enum t1 n; } a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t2 = type { i8, i32 }
+
+@a = common dso_local local_unnamed_addr global %struct.t2 zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!15, !16, !17}
+!llvm.ident = !{!18}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   15
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   2214592514              # 0x84000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   8                       # BTF_KIND_ENUM(id = 2)
+; CHECK-NEXT:        .long   100663298               # 0x6000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   13
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "t2"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   109                     # string offset=4
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   110                     # string offset=6
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "t1"                    # string offset=8
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   65                      # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   66                      # string offset=13
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !11, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !10, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{!5}
+!5 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "t1", file: !3, line: 1, baseType: !6, size: 32, elements: !7)
+!6 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!7 = !{!8, !9}
+!8 = !DIEnumerator(name: "A", value: 0, isUnsigned: true)
+!9 = !DIEnumerator(name: "B", value: 1, isUnsigned: true)
+!10 = !{!0}
+!11 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t2", file: !3, line: 2, size: 64, elements: !12)
+!12 = !{!13, !14}
+!13 = !DIDerivedType(tag: DW_TAG_member, name: "m", scope: !11, file: !3, line: 2, baseType: !5, size: 2, flags: DIFlagBitField, extraData: i64 0)
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "n", scope: !11, file: !3, line: 2, baseType: !5, size: 32, offset: 32)
+!15 = !{i32 2, !"Dwarf Version", i32 4}
+!16 = !{i32 2, !"Debug Info Version", i32 3}
+!17 = !{i32 1, !"wchar_size", i32 4}
+!18 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/tag-1.ll b/llvm/test/CodeGen/SBF/BTF/tag-1.ll
new file mode 100644
index 0000000000000..9c2d16d83eb1b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/tag-1.ll
@@ -0,0 +1,90 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   #define __tag1 __attribute__((btf_decl_tag("tag1")))
+;   #define __tag2 __attribute__((btf_decl_tag("tag2")))
+;   struct t1 {
+;     int a1;
+;     int a2 __tag1 __tag2;
+;   } __tag1 __tag2;
+;   struct t1 g1 __tag1 __tag2;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.t1 = type { i32, i32 }
+
+@g1 = dso_local local_unnamed_addr global %struct.t1 zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!14, !15, !16, !17}
+!llvm.ident = !{!18}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g1", scope: !2, file: !3, line: 7, type: !6, isLocal: false, isDefinition: true, annotations: !11)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 825661b8e31d0b29d78178df1e518949dfec9f9a)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_tag")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 3, size: 64, elements: !7, annotations: !11)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !6, file: !3, line: 4, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !6, file: !3, line: 5, baseType: !9, size: 32, offset: 32, annotations: !11)
+!11 = !{!12, !13}
+!12 = !{!"btf_decl_tag", !"tag1"}
+!13 = !{!"btf_decl_tag", !"tag2"}
+!14 = !{i32 7, !"Dwarf Version", i32 4}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{i32 7, !"frame-pointer", i32 2}
+!18 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git 825661b8e31d0b29d78178df1e518949dfec9f9a)"}
+
+; CHECK:             .long   1                               # BTF_KIND_STRUCT(id = 1)
+; CHECK-NEXT:        .long   67108866                        # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                              # 0x20
+; CHECK-NEXT:        .long   10                              # BTF_KIND_DECL_TAG(id = 2)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   15                              # BTF_KIND_DECL_TAG(id = 3)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   20                              # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   10                              # BTF_KIND_DECL_TAG(id = 5)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   15                              # BTF_KIND_DECL_TAG(id = 6)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   24                              # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024                       # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   10                              # BTF_KIND_DECL_TAG(id = 8)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   15                              # BTF_KIND_DECL_TAG(id = 9)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   4294967295
+
+; CHECK:             .ascii  "t1"                            # string offset=1
+; CHECK:             .ascii  "a1"                            # string offset=4
+; CHECK:             .ascii  "a2"                            # string offset=7
+; CHECK:             .ascii  "tag1"                          # string offset=10
+; CHECK:             .ascii  "tag2"                          # string offset=15
+; CHECK:             .ascii  "int"                           # string offset=20
+; CHECK:             .ascii  "g1"                            # string offset=24
diff --git a/llvm/test/CodeGen/SBF/BTF/tag-2.ll b/llvm/test/CodeGen/SBF/BTF/tag-2.ll
new file mode 100644
index 0000000000000..5973c06365291
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/tag-2.ll
@@ -0,0 +1,125 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   #define __tag1 __attribute__((btf_decl_tag("tag1")))
+;   #define __tag2 __attribute__((btf_decl_tag("tag2")))
+;   extern int bar(int a1, int a2) __tag1 __tag2;
+;   int __tag1 foo(int arg1, int *arg2 __tag1) {
+; ;   return arg1 + *arg2 + bar(arg1, arg1 + 1);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+; Function Attrs: nounwind
+define dso_local i32 @foo(i32 %arg1, i32* nocapture readonly %arg2) local_unnamed_addr #0 !dbg !8 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %arg1, metadata !14, metadata !DIExpression()), !dbg !18
+  call void @llvm.dbg.value(metadata i32* %arg2, metadata !15, metadata !DIExpression()), !dbg !18
+  %0 = load i32, i32* %arg2, align 4, !dbg !19, !tbaa !20
+  %add = add nsw i32 %0, %arg1, !dbg !24
+  %add1 = add nsw i32 %arg1, 1, !dbg !25
+  %call = tail call i32 @bar(i32 %arg1, i32 %add1) #3, !dbg !26
+  %add2 = add nsw i32 %add, %call, !dbg !27
+  ret i32 %add2, !dbg !28
+}
+
+declare !dbg !29 dso_local i32 @bar(i32, i32) local_unnamed_addr #1
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #2 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5, !6}
+!llvm.ident = !{!7}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 14.0.0 (https://github.com/llvm/llvm-project.git 4be11596b26383c6666f471f07463a3f79e11964)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_tag")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{i32 7, !"frame-pointer", i32 2}
+!7 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 4be11596b26383c6666f471f07463a3f79e11964)"}
+!8 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 4, type: !9, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !13, annotations: !16)
+!9 = !DISubroutineType(types: !10)
+!10 = !{!11, !11, !12}
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
+!13 = !{!14, !15}
+!14 = !DILocalVariable(name: "arg1", arg: 1, scope: !8, file: !1, line: 4, type: !11)
+!15 = !DILocalVariable(name: "arg2", arg: 2, scope: !8, file: !1, line: 4, type: !12, annotations: !16)
+!16 = !{!17}
+!17 = !{!"btf_decl_tag", !"tag1"}
+!18 = !DILocation(line: 0, scope: !8)
+!19 = !DILocation(line: 5, column: 17, scope: !8)
+!20 = !{!21, !21, i64 0}
+!21 = !{!"int", !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 5, column: 15, scope: !8)
+!25 = !DILocation(line: 5, column: 40, scope: !8)
+!26 = !DILocation(line: 5, column: 25, scope: !8)
+!27 = !DILocation(line: 5, column: 23, scope: !8)
+!28 = !DILocation(line: 5, column: 3, scope: !8)
+!29 = !DISubprogram(name: "bar", scope: !1, file: !1, line: 3, type: !30, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2, annotations: !32)
+!30 = !DISubroutineType(types: !31)
+!31 = !{!11, !11, !11}
+!32 = !{!17, !33}
+!33 = !{!"btf_decl_tag", !"tag2"}
+
+; CHECK:             .long   1                               # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 2)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT:        .long   218103810                       # 0xd000002
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   15                              # BTF_KIND_FUNC(id = 4)
+; CHECK-NEXT:        .long   201326593                       # 0xc000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   19                              # BTF_KIND_DECL_TAG(id = 5)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   19                              # BTF_KIND_DECL_TAG(id = 6)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   0                               # BTF_KIND_FUNC_PROTO(id = 7)
+; CHECK-NEXT:        .long   218103810                       # 0xd000002
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   72                              # BTF_KIND_FUNC(id = 8)
+; CHECK-NEXT:        .long   201326594                       # 0xc000002
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   19                              # BTF_KIND_DECL_TAG(id = 9)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   76                              # BTF_KIND_DECL_TAG(id = 10)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   4294967295
+
+; CHECK:             .ascii  "int"                           # string offset=1
+; CHECK:             .ascii  "arg1"                          # string offset=5
+; CHECK:             .ascii  "arg2"                          # string offset=10
+; CHECK:             .ascii  "foo"                           # string offset=15
+; CHECK:             .ascii  "tag1"                          # string offset=19
+; CHECK:             .ascii  "bar"                           # string offset=72
+; CHECK:             .ascii  "tag2"                          # string offset=76
diff --git a/llvm/test/CodeGen/SBF/BTF/tag-typedef.ll b/llvm/test/CodeGen/SBF/BTF/tag-typedef.ll
new file mode 100644
index 0000000000000..d8acdd73e9293
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/tag-typedef.ll
@@ -0,0 +1,86 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   #define __tag1 __attribute__((btf_decl_tag("tag1")))
+;   typedef struct { int a; } __s __tag1;
+;   typedef unsigned * __u __tag1;
+;   __s a;
+;   __u u;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%struct.__s = type { i32 }
+
+@a = dso_local local_unnamed_addr global %struct.__s zeroinitializer, align 4, !dbg !0
+@u = dso_local local_unnamed_addr global i32* null, align 8, !dbg !5
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!17, !18, !19, !20}
+!llvm.ident = !{!21}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 4, type: !12, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 14.0.0 (https://github.com/llvm/llvm-project.git 219b26fbcd70273ddfd4ead9387f7c69b7eb4570)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_tag")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "u", scope: !2, file: !3, line: 5, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__u", file: !3, line: 3, baseType: !8, annotations: !10)
+!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64)
+!9 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!10 = !{!11}
+!11 = !{!"btf_decl_tag", !"tag1"}
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s", file: !3, line: 2, baseType: !13, annotations: !10)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !3, line: 2, size: 32, elements: !14)
+!14 = !{!15}
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !3, line: 2, baseType: !16, size: 32)
+!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!17 = !{i32 7, !"Dwarf Version", i32 4}
+!18 = !{i32 2, !"Debug Info Version", i32 3}
+!19 = !{i32 1, !"wchar_size", i32 4}
+!20 = !{i32 7, !"frame-pointer", i32 2}
+!21 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 219b26fbcd70273ddfd4ead9387f7c69b7eb4570)"}
+
+; CHECK:             .long   1                               # BTF_KIND_TYPEDEF(id = 1)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   5                               # BTF_KIND_DECL_TAG(id = 2)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   0                               # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   12                              # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   10                              # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT:        .long   234881024                       # 0xe000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16                              # BTF_KIND_TYPEDEF(id = 6)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   5                               # BTF_KIND_DECL_TAG(id = 7)
+; CHECK-NEXT:        .long   285212672                       # 0x11000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   4294967295
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 8)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   20                              # BTF_KIND_INT(id = 9)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                              # 0x20
+
+; CHECK:        .ascii  "__s"                           # string offset=1
+; CHECK:        .ascii  "tag1"                          # string offset=5
+; CHECK:        .byte   97                              # string offset=10
+; CHECK:        .ascii  "int"                           # string offset=12
+; CHECK:        .ascii  "__u"                           # string offset=16
+; CHECK:        .ascii  "unsigned int"                  # string offset=20
+
diff --git a/llvm/test/CodeGen/SBF/BTF/type-tag-fixup-fwd.ll b/llvm/test/CodeGen/SBF/BTF/type-tag-fixup-fwd.ll
new file mode 100644
index 0000000000000..2523959158760
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/type-tag-fixup-fwd.ll
@@ -0,0 +1,130 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   #define __tag1 __attribute__((btf_type_tag("tag1")))
+;   #define __tag2 __attribute__((btf_type_tag("tag2")))
+;
+;   struct foo;
+;   struct map_value {
+;           struct foo __tag2 __tag1 *ptr;
+;   };
+;   void func(struct map_value *);
+;   void test(void)
+;   {
+;           struct map_value v = {};
+;           func(&v);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+%struct.map_value = type { %struct.foo* }
+%struct.foo = type opaque
+
+; Function Attrs: nounwind
+define dso_local void @test() local_unnamed_addr #0 !dbg !7 {
+entry:
+  %v = alloca %struct.map_value, align 8
+  %0 = bitcast %struct.map_value* %v to i8*, !dbg !20
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %0) #4, !dbg !20
+  call void @llvm.dbg.declare(metadata %struct.map_value* %v, metadata !11, metadata !DIExpression()), !dbg !21
+  %1 = bitcast %struct.map_value* %v to i64*, !dbg !21
+  store i64 0, i64* %1, align 8, !dbg !21
+  call void @func(%struct.map_value* noundef nonnull %v) #4, !dbg !22
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull %0) #4, !dbg !23
+  ret void, !dbg !23
+}
+
+; CHECK:             .long   0                               # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808                       # 0xd000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1                               # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT:        .long   201326593                       # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT:        .long   218103809                       # 0xd000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   62                              # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   76                              # BTF_KIND_TYPE_TAG(id = 6)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   81                              # BTF_KIND_TYPE_TAG(id = 7)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 8)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   86                              # BTF_KIND_FWD(id = 9)
+; CHECK-NEXT:        .long   117440512                       # 0x7000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   90                              # BTF_KIND_FUNC(id = 10)
+; CHECK-NEXT:        .long   201326594                       # 0xc000002
+; CHECK-NEXT:        .long   3
+
+; CHECK:             .ascii  "test"                          # string offset=1
+; CHECK:             .ascii  "map_value"                     # string offset=62
+; CHECK:             .ascii  "ptr"                           # string offset=72
+; CHECK:             .ascii  "tag2"                          # string offset=76
+; CHECK:             .ascii  "tag1"                          # string offset=81
+; CHECK:             .ascii  "foo"                           # string offset=86
+; CHECK:             .ascii  "func"                          # string offset=90
+
+; Function Attrs: argmemonly mustprogress nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: mustprogress nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+declare !dbg !24 dso_local void @func(%struct.map_value* noundef) local_unnamed_addr #3
+
+; Function Attrs: argmemonly mustprogress nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly mustprogress nofree nosync nounwind willreturn }
+attributes #2 = { mustprogress nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 25e8505f515bc9ef6c13527ffc4a902bae3a9071)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_tag_type", checksumkind: CSK_MD5, checksum: "7735a89e98603fee29d352a8e9db5acb")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 25e8505f515bc9ef6c13527ffc4a902bae3a9071)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 9, type: !8, scopeLine: 10, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !10)
+!8 = !DISubroutineType(types: !9)
+!9 = !{null}
+!10 = !{!11}
+!11 = !DILocalVariable(name: "v", scope: !7, file: !1, line: 11, type: !12)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "map_value", file: !1, line: 5, size: 64, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "ptr", scope: !12, file: !1, line: 6, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64, annotations: !17)
+!16 = !DICompositeType(tag: DW_TAG_structure_type, name: "foo", file: !1, line: 4, flags: DIFlagFwdDecl)
+!17 = !{!18, !19}
+!18 = !{!"btf_type_tag", !"tag2"}
+!19 = !{!"btf_type_tag", !"tag1"}
+!20 = !DILocation(line: 11, column: 9, scope: !7)
+!21 = !DILocation(line: 11, column: 26, scope: !7)
+!22 = !DILocation(line: 12, column: 9, scope: !7)
+!23 = !DILocation(line: 13, column: 1, scope: !7)
+!24 = !DISubprogram(name: "func", scope: !1, file: !1, line: 8, type: !25, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !28)
+!25 = !DISubroutineType(types: !26)
+!26 = !{null, !27}
+!27 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!28 = !{}
diff --git a/llvm/test/CodeGen/SBF/BTF/type-tag-fixup-resolved.ll b/llvm/test/CodeGen/SBF/BTF/type-tag-fixup-resolved.ll
new file mode 100644
index 0000000000000..533047f8fb7ad
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/type-tag-fixup-resolved.ll
@@ -0,0 +1,150 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   #define __tag1 __attribute__((btf_type_tag("tag1")))
+;   #define __tag2 __attribute__((btf_type_tag("tag2")))
+;
+;   struct foo {
+;           int i;
+;   };
+;   struct map_value {
+;           struct foo __tag2 __tag1 *ptr;
+;   };
+;   void func(struct map_value *, struct foo *);
+;   void test(void)
+;   {
+;           struct map_value v = {};
+;           func(&v, v.ptr);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+%struct.map_value = type { %struct.foo* }
+%struct.foo = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local void @test() local_unnamed_addr #0 !dbg !7 {
+entry:
+  %v = alloca %struct.map_value, align 8
+  %0 = bitcast %struct.map_value* %v to i8*, !dbg !23
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %0) #4, !dbg !23
+  call void @llvm.dbg.declare(metadata %struct.map_value* %v, metadata !11, metadata !DIExpression()), !dbg !24
+  %1 = bitcast %struct.map_value* %v to i64*, !dbg !24
+  store i64 0, i64* %1, align 8, !dbg !24
+  call void @func(%struct.map_value* noundef nonnull %v, %struct.foo* noundef null) #4, !dbg !25
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull %0) #4, !dbg !26
+  ret void, !dbg !26
+}
+
+; CHECK:             .long   0                               # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808                       # 0xd000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   1                               # BTF_KIND_FUNC(id = 2)
+; CHECK-NEXT:        .long   201326593                       # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # BTF_KIND_FUNC_PROTO(id = 3)
+; CHECK-NEXT:        .long   218103810                       # 0xd000002
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   63                              # BTF_KIND_STRUCT(id = 5)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 6)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 7)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   77                              # BTF_KIND_STRUCT(id = 8)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   81
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   83                              # BTF_KIND_INT(id = 9)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   87                              # BTF_KIND_FUNC(id = 10)
+; CHECK-NEXT:        .long   201326594                       # 0xc000002
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   92                              # BTF_KIND_TYPE_TAG(id = 11)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   97                              # BTF_KIND_TYPE_TAG(id = 12)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   11
+
+; CHECK:             .ascii  "test"                          # string offset=1
+; CHECK:             .ascii  "map_value"                     # string offset=63
+; CHECK:             .ascii  "ptr"                           # string offset=73
+; CHECK:             .ascii  "foo"                           # string offset=77
+; CHECK:             .byte   105                             # string offset=81
+; CHECK:             .ascii  "int"                           # string offset=83
+; CHECK:             .ascii  "func"                          # string offset=87
+; CHECK:             .ascii  "tag2"                          # string offset=92
+; CHECK:             .ascii  "tag1"                          # string offset=97
+
+; Function Attrs: argmemonly mustprogress nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: mustprogress nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+declare !dbg !27 dso_local void @func(%struct.map_value* noundef, %struct.foo* noundef) local_unnamed_addr #3
+
+; Function Attrs: argmemonly mustprogress nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly mustprogress nofree nosync nounwind willreturn }
+attributes #2 = { mustprogress nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 25e8505f515bc9ef6c13527ffc4a902bae3a9071)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp//home/yhs/work/tests/llvm/btf_tag_type", checksumkind: CSK_MD5, checksum: "8b3b8281c3b4240403467e0c9461251d")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 25e8505f515bc9ef6c13527ffc4a902bae3a9071)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 11, type: !8, scopeLine: 12, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !10)
+!8 = !DISubroutineType(types: !9)
+!9 = !{null}
+!10 = !{!11}
+!11 = !DILocalVariable(name: "v", scope: !7, file: !1, line: 13, type: !12)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "map_value", file: !1, line: 7, size: 64, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "ptr", scope: !12, file: !1, line: 8, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64, annotations: !20)
+!16 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "foo", file: !1, line: 4, size: 32, elements: !17)
+!17 = !{!18}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !16, file: !1, line: 5, baseType: !19, size: 32)
+!19 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!20 = !{!21, !22}
+!21 = !{!"btf_type_tag", !"tag2"}
+!22 = !{!"btf_type_tag", !"tag1"}
+!23 = !DILocation(line: 13, column: 9, scope: !7)
+!24 = !DILocation(line: 13, column: 26, scope: !7)
+!25 = !DILocation(line: 14, column: 9, scope: !7)
+!26 = !DILocation(line: 15, column: 1, scope: !7)
+!27 = !DISubprogram(name: "func", scope: !1, file: !1, line: 10, type: !28, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !32)
+!28 = !DISubroutineType(types: !29)
+!29 = !{null, !30, !31}
+!30 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!32 = !{}
diff --git a/llvm/test/CodeGen/SBF/BTF/type-tag-var.ll b/llvm/test/CodeGen/SBF/BTF/type-tag-var.ll
new file mode 100644
index 0000000000000..d2d5932bcea2b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/type-tag-var.ll
@@ -0,0 +1,62 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   #define __tag1 __attribute__((btf_type_tag("tag1")))
+;   #define __tag2 __attribute__((btf_type_tag("tag2")))
+;   int __tag1 * __tag1 __tag2 *g;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@g = dso_local local_unnamed_addr global i32** null, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!12, !13, !14, !15}
+!llvm.ident = !{!16}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 3, type: !5, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 14.0.0 (https://github.com/llvm/llvm-project.git 077b2e0cf1e97c4d97ca5ceab3ec0192ed11c66e)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/btf_tag_type")
+!4 = !{!0}
+!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !6, size: 64, annotations: !10)
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64, annotations: !8)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{!9}
+!9 = !{!"btf_type_tag", !"tag1"}
+!10 = !{!9, !11}
+!11 = !{!"btf_type_tag", !"tag2"}
+
+; CHECK:             .long   1                               # BTF_KIND_TYPE_TAG(id = 1)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   6                               # BTF_KIND_TYPE_TAG(id = 2)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 3)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                               # BTF_KIND_TYPE_TAG(id = 4)
+; CHECK-NEXT:        .long   301989888                       # 0x12000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   0                               # BTF_KIND_PTR(id = 5)
+; CHECK-NEXT:        .long   33554432                        # 0x2000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   11                              # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   15                              # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024                       # 0xe000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   1
+
+; CHECK:             .ascii  "tag1"                          # string offset=1
+; CHECK:             .ascii  "tag2"                          # string offset=6
+; CHECK:             .ascii  "int"                           # string offset=11
+; CHECK:             .byte   103                             # string offset=15
+
+!12 = !{i32 7, !"Dwarf Version", i32 4}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{i32 7, !"frame-pointer", i32 2}
+!16 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 077b2e0cf1e97c4d97ca5ceab3ec0192ed11c66e)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/uchar.ll b/llvm/test/CodeGen/SBF/BTF/uchar.ll
new file mode 100644
index 0000000000000..80543f3715d95
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/uchar.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   unsigned char a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i8 0, align 1, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   15
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   8                       # 0x8
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "unsigned char"         # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "unsigned char", size: 8, encoding: DW_ATE_unsigned_char)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/uint.ll b/llvm/test/CodeGen/SBF/BTF/uint.ll
new file mode 100644
index 0000000000000..48419cc4742a8
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/uint.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   unsigned a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   14
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "unsigned int"          # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ulonglong.ll b/llvm/test/CodeGen/SBF/BTF/ulonglong.ll
new file mode 100644
index 0000000000000..b631e64f581d4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ulonglong.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   unsigned long long a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i64 0, align 8, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   64                      # 0x40
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "long long unsigned int" # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "long long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/union-array-typedef.ll b/llvm/test/CodeGen/SBF/BTF/union-array-typedef.ll
new file mode 100644
index 0000000000000..1e56731437142
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/union-array-typedef.ll
@@ -0,0 +1,91 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   typedef int _int;
+;   union t {char m[4]; _int n;} a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+%union.t = type { i32 }
+
+@a = common dso_local local_unnamed_addr global %union.t zeroinitializer, align 4, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   120
+; CHECK-NEXT:        .long   120
+; CHECK-NEXT:        .long   41
+; CHECK-NEXT:        .long   1                       # BTF_KIND_UNION(id = 1)
+; CHECK-NEXT:        .long   83886082                # 0x5000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   7                       # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 3)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   12                      # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   32                      # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   37                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .byte   116                     # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   109                     # string offset=3
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   110                     # string offset=5
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "char"                  # string offset=7
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=12
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "_int"                  # string offset=32
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=37
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "t", file: !3, line: 2, size: 32, elements: !7)
+!7 = !{!8, !13}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "m", scope: !6, file: !3, line: 2, baseType: !9, size: 32)
+!9 = !DICompositeType(tag: DW_TAG_array_type, baseType: !10, size: 32, elements: !11)
+!10 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!11 = !{!12}
+!12 = !DISubrange(count: 4)
+!13 = !DIDerivedType(tag: DW_TAG_member, name: "n", scope: !6, file: !3, line: 2, baseType: !14, size: 32)
+!14 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !3, line: 1, baseType: !15)
+!15 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 8.0.0 (trunk 345296) (llvm/trunk 345297)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/ushort.ll b/llvm/test/CodeGen/SBF/BTF/ushort.ll
new file mode 100644
index 0000000000000..742c353fcdb15
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/ushort.ll
@@ -0,0 +1,41 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+
+; Source code:
+;   unsigned short a;
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@a = common dso_local local_unnamed_addr global i16 0, align 2, !dbg !0
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   1                       # BTF_KIND_INT(id = 1)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   16                      # 0x10
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "unsigned short"        # string offset=1
+; CHECK-NEXT:        .byte   0
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/home/yhs/tmp")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "unsigned short", size: 16, encoding: DW_ATE_unsigned)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 8.0.0 (trunk 344789) (llvm/trunk 344782)"}
diff --git a/llvm/test/CodeGen/SBF/BTF/weak-global-2.ll b/llvm/test/CodeGen/SBF/BTF/weak-global-2.ll
new file mode 100644
index 0000000000000..38a0b14721a1e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/weak-global-2.ll
@@ -0,0 +1,65 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   char g __attribute__((weak)) = 2;
+;   int test() {
+;     return g;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@g = weak dso_local local_unnamed_addr global i8 2, align 1, !dbg !0
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !11 {
+entry:
+  %0 = load i8, i8* @g, align 1, !dbg !15, !tbaa !16
+  %conv = sext i8 %0 to i32, !dbg !15
+  ret i32 %conv, !dbg !19
+}
+
+; CHECK:             .long   55                      # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   62                      # BTF_KIND_DATASEC(id = 6)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   g
+; CHECK-NEXT:        .long   1
+
+; CHECK:             .ascii  "char"                  # string offset=55
+; CHECK:             .byte   103                     # string offset=60
+; CHECK:             .ascii  ".data"                 # string offset=62
+
+
+attributes #0 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git edf6717d8d30034da932b95350898e03c90a5082)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/global")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!7 = !{i32 7, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git edf6717d8d30034da932b95350898e03c90a5082)"}
+!11 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 2, type: !12, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DILocation(line: 3, column: 10, scope: !11)
+!16 = !{!17, !17, i64 0}
+!17 = !{!"omnipotent char", !18, i64 0}
+!18 = !{!"Simple C/C++ TBAA"}
+!19 = !DILocation(line: 3, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/BTF/weak-global-3.ll b/llvm/test/CodeGen/SBF/BTF/weak-global-3.ll
new file mode 100644
index 0000000000000..f072e8cad453e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/weak-global-3.ll
@@ -0,0 +1,85 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   const volatile char g __attribute__((weak)) = 2;
+;   int test() {
+;     return g;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@g = weak_odr dso_local constant i8 2, align 1, !dbg !0
+
+; Function Attrs: nofree norecurse nounwind willreturn
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !13 {
+entry:
+  %0 = load volatile i8, i8* @g, align 1, !dbg !17, !tbaa !18
+  %conv = sext i8 %0 to i32, !dbg !17
+  ret i32 %conv, !dbg !21
+}
+
+; CHECK:             .long   0                               # BTF_KIND_FUNC_PROTO(id = 1)
+; CHECK-NEXT:        .long   218103808                       # 0xd000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                               # BTF_KIND_INT(id = 2)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+; CHECK-NEXT:        .long   5                               # BTF_KIND_FUNC(id = 3)
+; CHECK-NEXT:        .long   201326593                       # 0xc000001
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   0                               # BTF_KIND_CONST(id = 4)
+; CHECK-NEXT:        .long   167772160                       # 0xa000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                               # BTF_KIND_VOLATILE(id = 5)
+; CHECK-NEXT:        .long   150994944                       # 0x9000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   47                              # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                        # 0x1000008
+; CHECK-NEXT:        .long   52                              # BTF_KIND_VAR(id = 7)
+; CHECK-NEXT:        .long   234881024                       # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   54                              # BTF_KIND_DATASEC(id = 8)
+; CHECK-NEXT:        .long   251658241                       # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   g
+; CHECK-NEXT:        .long   1
+
+; CHECK:             .ascii  "int"                           # string offset=1
+; CHECK:             .ascii  "test"                          # string offset=5
+; CHECK:             .ascii  "char"                          # string offset=47
+; CHECK:             .byte   103                             # string offset=52
+; CHECK:             .ascii  ".rodata"                       # string offset=54
+
+attributes #0 = { nofree norecurse nounwind willreturn "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 9cc417cbca1cece0d55fa3d1e15682943a06139e)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/btf/tests")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !7)
+!7 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !8)
+!8 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git 9cc417cbca1cece0d55fa3d1e15682943a06139e)"}
+!13 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 2, type: !14, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!16}
+!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!17 = !DILocation(line: 3, column: 10, scope: !13)
+!18 = !{!19, !19, i64 0}
+!19 = !{!"omnipotent char", !20, i64 0}
+!20 = !{!"Simple C/C++ TBAA"}
+!21 = !DILocation(line: 3, column: 3, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/BTF/weak-global.ll b/llvm/test/CodeGen/SBF/BTF/weak-global.ll
new file mode 100644
index 0000000000000..3116517f31c0b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/BTF/weak-global.ll
@@ -0,0 +1,64 @@
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source code:
+;   char g __attribute__((weak));
+;   int test() {
+;     return g;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm test.c
+
+@g = weak dso_local local_unnamed_addr global i8 0, align 1, !dbg !0
+; Function Attrs: norecurse nounwind readonly
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !11 {
+entry:
+  %0 = load i8, i8* @g, align 1, !dbg !15, !tbaa !16
+  %conv = sext i8 %0 to i32, !dbg !15
+  ret i32 %conv, !dbg !19
+}
+
+; CHECK:             .long   55                      # BTF_KIND_INT(id = 4)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   16777224                # 0x1000008
+; CHECK-NEXT:        .long   60                      # BTF_KIND_VAR(id = 5)
+; CHECK-NEXT:        .long   234881024               # 0xe000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   62                      # BTF_KIND_DATASEC(id = 6)
+; CHECK-NEXT:        .long   251658241               # 0xf000001
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   g
+; CHECK-NEXT:        .long   1
+
+; CHECK:             .ascii  "char"                  # string offset=55
+; CHECK:             .byte   103                     # string offset=60
+; CHECK:             .ascii  ".bss"                  # string offset=62
+
+attributes #0 = { norecurse nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git edf6717d8d30034da932b95350898e03c90a5082)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/global")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!7 = !{i32 7, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git edf6717d8d30034da932b95350898e03c90a5082)"}
+!11 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 2, type: !12, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !4)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DILocation(line: 3, column: 10, scope: !11)
+!16 = !{!17, !17, i64 0}
+!17 = !{!"omnipotent char", !18, i64 0}
+!18 = !{!"Simple C/C++ TBAA"}
+!19 = !DILocation(line: 3, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/anon-struct-argument-pragma.ll b/llvm/test/CodeGen/SBF/CORE/anon-struct-argument-pragma.ll
new file mode 100644
index 0000000000000..3ccbaa1b5688d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/anon-struct-argument-pragma.ll
@@ -0,0 +1,100 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+;
+; Source:
+;   #pragma clang attribute push (__attribute__((preserve_access_index)), apply_to = record)
+;   typedef struct {
+;       union {
+;               void	*kernel;
+;               void	*user;
+;       };
+;       unsigned is_kernel : 1;
+;   } sockptr_t;
+;   #pragma clang attribute pop
+;   int test(sockptr_t *arg) {
+;     return arg->is_kernel;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -g -Xclang -disable-llvm-passes test.c
+
+%struct.sockptr_t = type { %union.anon, i8 }
+%union.anon = type { ptr }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(ptr noundef %arg) #0 !dbg !7 {
+entry:
+  %arg.addr = alloca ptr, align 8
+  store ptr %arg, ptr %arg.addr, align 8, !tbaa !25
+  call void @llvm.dbg.declare(metadata ptr %arg.addr, metadata !24, metadata !DIExpression()), !dbg !29
+  %0 = load ptr, ptr %arg.addr, align 8, !dbg !30, !tbaa !25
+  %1 = call ptr @llvm.preserve.struct.access.index.p0.p0(ptr elementtype(%struct.sockptr_t) %0, i32 1, i32 1), !dbg !31, !llvm.preserve.access.index !13
+  %bf.load = load i8, ptr %1, align 8, !dbg !31
+  %bf.clear = and i8 %bf.load, 1, !dbg !31
+  %bf.cast = zext i8 %bf.clear to i32, !dbg !31
+  ret i32 %bf.cast, !dbg !32
+}
+
+; CHECK:             .long   1                               # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                               # BTF_KIND_STRUCT(id = 3)
+
+; CHECK:             .ascii  "sockptr_t"                     # string offset=1
+; CHECK:             .ascii  ".text"                         # string offset=59
+; CHECK:             .ascii  "0:1"                           # string offset=65
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   59                              # Field reloc section string offset=59
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp[[#]]
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   65
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nocallback nofree nosync nounwind readnone willreturn
+declare ptr @llvm.preserve.struct.access.index.p0.p0(ptr, i32 immarg, i32 immarg) #2
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { nocallback nofree nosync nounwind readnone willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git d81a8759c969344c1e96992aab30f5b5a9d5ffd3)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/test/anon", checksumkind: CSK_MD5, checksum: "7ba33bf2146cc86b1c8396f6d3eace81")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git d81a8759c969344c1e96992aab30f5b5a9d5ffd3)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 10, type: !8, scopeLine: 10, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !23)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "sockptr_t", file: !1, line: 8, baseType: !13)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !1, line: 2, size: 128, elements: !14)
+!14 = !{!15, !21}
+!15 = !DIDerivedType(tag: DW_TAG_member, scope: !13, file: !1, line: 3, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, scope: !13, file: !1, line: 3, size: 64, elements: !17)
+!17 = !{!18, !20}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "kernel", scope: !16, file: !1, line: 4, baseType: !19, size: 64)
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "user", scope: !16, file: !1, line: 5, baseType: !19, size: 64)
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "is_kernel", scope: !13, file: !1, line: 7, baseType: !22, size: 1, offset: 64, flags: DIFlagBitField, extraData: i64 64)
+!22 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!23 = !{!24}
+!24 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 10, type: !11)
+!25 = !{!26, !26, i64 0}
+!26 = !{!"any pointer", !27, i64 0}
+!27 = !{!"omnipotent char", !28, i64 0}
+!28 = !{!"Simple C/C++ TBAA"}
+!29 = !DILocation(line: 10, column: 21, scope: !7)
+!30 = !DILocation(line: 11, column: 10, scope: !7)
+!31 = !DILocation(line: 11, column: 15, scope: !7)
+!32 = !DILocation(line: 11, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/anon-union-localvar-attr.ll b/llvm/test/CodeGen/SBF/CORE/anon-union-localvar-attr.ll
new file mode 100644
index 0000000000000..b218747c30458
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/anon-union-localvar-attr.ll
@@ -0,0 +1,124 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+;
+; Source:
+;   typedef union {
+;       struct {
+;               void	*kernel;
+;               void	*user;
+;       };
+;       unsigned is_kernel : 1;
+;   } __attribute__((preserve_access_index)) sockptr_t;
+;   void *foo(void);
+;   int test() {
+;     sockptr_t *arg = foo();
+;     return __builtin_preserve_field_info(arg->is_kernel, 1);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -g -Xclang -disable-llvm-passes test.c
+
+%union.sockptr_t = type { %struct.anon }
+%struct.anon = type { ptr, ptr }
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 !dbg !7 {
+entry:
+  %arg = alloca ptr, align 8
+  call void @llvm.lifetime.start.p0(i64 8, ptr %arg) #6, !dbg !25
+  call void @llvm.dbg.declare(metadata ptr %arg, metadata !12, metadata !DIExpression()), !dbg !26
+  %call = call ptr @foo(), !dbg !27
+  store ptr %call, ptr %arg, align 8, !dbg !26, !tbaa !28
+  %0 = load ptr, ptr %arg, align 8, !dbg !32, !tbaa !28
+  %1 = call ptr @llvm.preserve.struct.access.index.p0.p0(ptr elementtype(%union.sockptr_t) %0, i32 0, i32 1), !dbg !33, !llvm.preserve.access.index !15
+  %2 = call i32 @llvm.bpf.preserve.field.info.p0(ptr %1, i64 1), !dbg !34
+  call void @llvm.lifetime.end.p0(i64 8, ptr %arg) #6, !dbg !35
+  ret i32 %2, !dbg !36
+}
+
+; CHECK:             .long   56                              # BTF_KIND_TYPEDEF(id = 7)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0                               # BTF_KIND_UNION(id = 8)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "sockptr_t"                     # string offset=56
+; CHECK:             .ascii  "0:1"                           # string offset=101
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp[[#]]
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   101
+; CHECK-NEXT:        .long   1
+
+; Function Attrs: argmemonly nocallback nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture) #1
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+declare !dbg !37 dso_local ptr @foo() #3
+
+; Function Attrs: nocallback nofree nosync nounwind readnone willreturn
+declare ptr @llvm.preserve.struct.access.index.p0.p0(ptr, i32 immarg, i32 immarg) #4
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0(ptr, i64 immarg) #5
+
+; Function Attrs: argmemonly nocallback nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0(i64 immarg, ptr nocapture) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly nocallback nofree nosync nounwind willreturn }
+attributes #2 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #4 = { nocallback nofree nosync nounwind readnone willreturn }
+attributes #5 = { nounwind readnone }
+attributes #6 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 8c7d5118961e7ffc0304126ec2122d21e2eb1f79)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/test/anon", checksumkind: CSK_MD5, checksum: "03904da5c5e53b14bb1effb6d9d5e025")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 8c7d5118961e7ffc0304126ec2122d21e2eb1f79)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 9, type: !8, scopeLine: 9, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "arg", scope: !7, file: !1, line: 10, type: !13)
+!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
+!14 = !DIDerivedType(tag: DW_TAG_typedef, name: "sockptr_t", file: !1, line: 7, baseType: !15)
+!15 = distinct !DICompositeType(tag: DW_TAG_union_type, file: !1, line: 1, size: 128, elements: !16)
+!16 = !{!17, !23}
+!17 = !DIDerivedType(tag: DW_TAG_member, scope: !15, file: !1, line: 2, baseType: !18, size: 128)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !15, file: !1, line: 2, size: 128, elements: !19)
+!19 = !{!20, !22}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "kernel", scope: !18, file: !1, line: 3, baseType: !21, size: 64)
+!21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "user", scope: !18, file: !1, line: 4, baseType: !21, size: 64, offset: 64)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "is_kernel", scope: !15, file: !1, line: 6, baseType: !24, size: 1, flags: DIFlagBitField, extraData: i64 0)
+!24 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!25 = !DILocation(line: 10, column: 3, scope: !7)
+!26 = !DILocation(line: 10, column: 14, scope: !7)
+!27 = !DILocation(line: 10, column: 20, scope: !7)
+!28 = !{!29, !29, i64 0}
+!29 = !{!"any pointer", !30, i64 0}
+!30 = !{!"omnipotent char", !31, i64 0}
+!31 = !{!"Simple C/C++ TBAA"}
+!32 = !DILocation(line: 11, column: 40, scope: !7)
+!33 = !DILocation(line: 11, column: 45, scope: !7)
+!34 = !DILocation(line: 11, column: 10, scope: !7)
+!35 = !DILocation(line: 12, column: 1, scope: !7)
+!36 = !DILocation(line: 11, column: 3, scope: !7)
+!37 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 8, type: !38, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !40)
+!38 = !DISubroutineType(types: !39)
+!39 = !{!21}
+!40 = !{}
diff --git a/llvm/test/CodeGen/SBF/CORE/anon-union-localvar-pragma.ll b/llvm/test/CodeGen/SBF/CORE/anon-union-localvar-pragma.ll
new file mode 100644
index 0000000000000..9c6663bf8ce06
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/anon-union-localvar-pragma.ll
@@ -0,0 +1,127 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+;
+; Source:
+;   #pragma clang attribute push (__attribute__((preserve_access_index)), apply_to = record)
+;   typedef union {
+;       struct {
+;               void	*kernel;
+;               void	*user;
+;       };
+;       unsigned is_kernel : 1;
+;   } sockptr_t;
+;   #pragma clang attribute pop
+;   void *foo(void);
+;   int test() {
+;     sockptr_t *arg = foo();
+;     return __builtin_preserve_field_info(arg->is_kernel, 1);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -g -Xclang -disable-llvm-passes test.c
+
+%union.sockptr_t = type { %struct.anon }
+%struct.anon = type { ptr, ptr }
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 !dbg !7 {
+entry:
+  %arg = alloca ptr, align 8
+  call void @llvm.lifetime.start.p0(i64 8, ptr %arg) #6, !dbg !25
+  call void @llvm.dbg.declare(metadata ptr %arg, metadata !12, metadata !DIExpression()), !dbg !26
+  %call = call ptr @foo(), !dbg !27
+  store ptr %call, ptr %arg, align 8, !dbg !26, !tbaa !28
+  %0 = load ptr, ptr %arg, align 8, !dbg !32, !tbaa !28
+  %1 = call ptr @llvm.preserve.struct.access.index.p0.p0(ptr elementtype(%union.sockptr_t) %0, i32 0, i32 1), !dbg !33, !llvm.preserve.access.index !15
+  %2 = call i32 @llvm.bpf.preserve.field.info.p0(ptr %1, i64 1), !dbg !34
+  call void @llvm.lifetime.end.p0(i64 8, ptr %arg) #6, !dbg !35
+  ret i32 %2, !dbg !36
+}
+
+; CHECK:             .long   56                              # BTF_KIND_TYPEDEF(id = 7)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   0                               # BTF_KIND_UNION(id = 8)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "sockptr_t"                     # string offset=56
+; CHECK:             .ascii  "0:1"                           # string offset=101
+
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp[[#]]
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   101
+; CHECK-NEXT:        .long   1
+
+; Function Attrs: argmemonly nocallback nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture) #1
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+declare !dbg !37 dso_local ptr @foo() #3
+
+; Function Attrs: nocallback nofree nosync nounwind readnone willreturn
+declare ptr @llvm.preserve.struct.access.index.p0.p0(ptr, i32 immarg, i32 immarg) #4
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0(ptr, i64 immarg) #5
+
+; Function Attrs: argmemonly nocallback nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0(i64 immarg, ptr nocapture) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly nocallback nofree nosync nounwind willreturn }
+attributes #2 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #4 = { nocallback nofree nosync nounwind readnone willreturn }
+attributes #5 = { nounwind readnone }
+attributes #6 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 8c7d5118961e7ffc0304126ec2122d21e2eb1f79)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/test/anon", checksumkind: CSK_MD5, checksum: "2c5f698241a8b5ddf345a5743dfca258")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"frame-pointer", i32 2}
+!6 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 8c7d5118961e7ffc0304126ec2122d21e2eb1f79)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 11, type: !8, scopeLine: 11, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12}
+!12 = !DILocalVariable(name: "arg", scope: !7, file: !1, line: 12, type: !13)
+!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
+!14 = !DIDerivedType(tag: DW_TAG_typedef, name: "sockptr_t", file: !1, line: 8, baseType: !15)
+!15 = distinct !DICompositeType(tag: DW_TAG_union_type, file: !1, line: 2, size: 128, elements: !16)
+!16 = !{!17, !23}
+!17 = !DIDerivedType(tag: DW_TAG_member, scope: !15, file: !1, line: 3, baseType: !18, size: 128)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !15, file: !1, line: 3, size: 128, elements: !19)
+!19 = !{!20, !22}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "kernel", scope: !18, file: !1, line: 4, baseType: !21, size: 64)
+!21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "user", scope: !18, file: !1, line: 5, baseType: !21, size: 64, offset: 64)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "is_kernel", scope: !15, file: !1, line: 7, baseType: !24, size: 1, flags: DIFlagBitField, extraData: i64 0)
+!24 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!25 = !DILocation(line: 12, column: 3, scope: !7)
+!26 = !DILocation(line: 12, column: 14, scope: !7)
+!27 = !DILocation(line: 12, column: 20, scope: !7)
+!28 = !{!29, !29, i64 0}
+!29 = !{!"any pointer", !30, i64 0}
+!30 = !{!"omnipotent char", !31, i64 0}
+!31 = !{!"Simple C/C++ TBAA"}
+!32 = !DILocation(line: 13, column: 40, scope: !7)
+!33 = !DILocation(line: 13, column: 45, scope: !7)
+!34 = !DILocation(line: 13, column: 10, scope: !7)
+!35 = !DILocation(line: 14, column: 1, scope: !7)
+!36 = !DILocation(line: 13, column: 3, scope: !7)
+!37 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 10, type: !38, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !40)
+!38 = !DISubroutineType(types: !39)
+!39 = !{!21}
+!40 = !{}
diff --git a/llvm/test/CodeGen/SBF/CORE/btf-id-duplicate.ll b/llvm/test/CodeGen/SBF/CORE/btf-id-duplicate.ll
new file mode 100644
index 0000000000000..c45449929e31d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/btf-id-duplicate.ll
@@ -0,0 +1,99 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+; RUN: opt -passes='default<O2>' -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+;
+; Source:
+;   struct s1 { int a; int b; };
+;   int foo(struct s1 *arg) { return __builtin_btf_type_id(*arg, 0); }
+;   int bar(struct s1 *arg) { return __builtin_btf_type_id(*arg, 0); }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -g -Xclang -disable-llvm-passes test.c
+
+%struct.s1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @foo(%struct.s1* %arg) #0 !dbg !7 {
+entry:
+  %arg.addr = alloca %struct.s1*, align 8
+  store %struct.s1* %arg, %struct.s1** %arg.addr, align 8, !tbaa !18
+  call void @llvm.dbg.declare(metadata %struct.s1** %arg.addr, metadata !17, metadata !DIExpression()), !dbg !22
+  %0 = call i64 @llvm.bpf.btf.type.id(i32 0, i64 0), !dbg !23, !llvm.preserve.access.index !12
+  %conv = trunc i64 %0 to i32, !dbg !23
+  ret i32 %conv, !dbg !24
+}
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nounwind readnone
+declare i64 @llvm.bpf.btf.type.id(i32, i64) #2
+
+; Function Attrs: nounwind
+define dso_local i32 @bar(%struct.s1* %arg) #0 !dbg !25 {
+entry:
+  %arg.addr = alloca %struct.s1*, align 8
+  store %struct.s1* %arg, %struct.s1** %arg.addr, align 8, !tbaa !18
+  call void @llvm.dbg.declare(metadata %struct.s1** %arg.addr, metadata !27, metadata !DIExpression()), !dbg !28
+  %0 = call i64 @llvm.bpf.btf.type.id(i32 1, i64 0), !dbg !29, !llvm.preserve.access.index !12
+  %conv = trunc i64 %0 to i32, !dbg !29
+  ret i32 %conv, !dbg !30
+}
+
+; CHECK:             .long   1                               # BTF_KIND_STRUCT(id = 2)
+
+; CHECK:             .ascii  "s1"                            # string offset=1
+; CHECK:             .ascii  ".text"                         # string offset=20
+; CHECK:             .byte   48                              # string offset=26
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   20                              # Field reloc section string offset=20
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   6
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git c1c153c3c70641a23c4a9540a897ff2d4eb4c5b2)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/home/yhs/work/tests/dup")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git c1c153c3c70641a23c4a9540a897ff2d4eb4c5b2)"}
+!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !16)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 64, elements: !13)
+!13 = !{!14, !15}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !12, file: !1, line: 1, baseType: !10, size: 32, offset: 32)
+!16 = !{!17}
+!17 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 2, type: !11)
+!18 = !{!19, !19, i64 0}
+!19 = !{!"any pointer", !20, i64 0}
+!20 = !{!"omnipotent char", !21, i64 0}
+!21 = !{!"Simple C/C++ TBAA"}
+!22 = !DILocation(line: 2, column: 20, scope: !7)
+!23 = !DILocation(line: 2, column: 34, scope: !7)
+!24 = !DILocation(line: 2, column: 27, scope: !7)
+!25 = distinct !DISubprogram(name: "bar", scope: !1, file: !1, line: 3, type: !8, scopeLine: 3, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !26)
+!26 = !{!27}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !25, file: !1, line: 3, type: !11)
+!28 = !DILocation(line: 3, column: 20, scope: !25)
+!29 = !DILocation(line: 3, column: 34, scope: !25)
+!30 = !DILocation(line: 3, column: 27, scope: !25)
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-alu32.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-alu32.ll
new file mode 100644
index 0000000000000..c39a7678dd04a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-alu32.ll
@@ -0,0 +1,75 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct b { int d; int e; } c;
+;   int f() {
+;     return __builtin_preserve_field_info(c.e, 0);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.b = type { i32, i32 }
+
+@c = common dso_local global %struct.b zeroinitializer, align 4, !dbg !0
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @f() local_unnamed_addr #0 !dbg !15 {
+entry:
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.bs(%struct.b* elementtype(%struct.b) nonnull @c, i32 1, i32 1), !dbg !18, !llvm.preserve.access.index !6
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %0, i64 0), !dbg !19
+  ret i32 %1, !dbg !20
+}
+
+; CHECK:             mov64 r0, 4
+; CHECK:             exit
+
+; CHECK:             .long   13                      # BTF_KIND_STRUCT(id = 4)
+
+; CHECK:             .ascii  ".text"                 # string offset=7
+; CHECK:             .byte   98                      # string offset=13
+; CHECK:             .ascii  "0:1"                   # string offset=19
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   7                       # Field reloc section string offset=7
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   19
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.bs(%struct.b*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "c", scope: !2, file: !3, line: 1, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git d5509db439a1bb3f0822c42398c8b5921a665478)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!4 = !{}
+!5 = !{!0}
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "b", file: !3, line: 1, size: 64, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !6, file: !3, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "e", scope: !6, file: !3, line: 1, baseType: !9, size: 32, offset: 32)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git d5509db439a1bb3f0822c42398c8b5921a665478)"}
+!15 = distinct !DISubprogram(name: "f", scope: !3, file: !3, line: 2, type: !16, scopeLine: 2, isDefinition: true, isOptimized: true, unit: !2, retainedNodes: !4)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9}
+!18 = !DILocation(line: 3, column: 42, scope: !15)
+!19 = !DILocation(line: 3, column: 10, scope: !15)
+!20 = !DILocation(line: 3, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll
new file mode 100644
index 0000000000000..af61a51ca2119
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll
@@ -0,0 +1,126 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK-ALU32 %s
+; Source code:
+;   struct s {
+;     unsigned long long f1;
+;     unsigned f2;
+;     unsigned f3;
+;     unsigned f4;
+;     unsigned char f5;
+;     unsigned bf1:5,
+;              bf2:1;
+;   };
+;   enum {FIELD_TYPE_OFFSET = 0, FIELD_TYPE_SIZE = 1, FIELD_TYPE_LSHIFT_U64 = 4,};
+;   int test(struct s *arg) {
+;     return __builtin_preserve_field_info(arg->bf2, FIELD_TYPE_OFFSET) +
+;            __builtin_preserve_field_info(arg->bf2, FIELD_TYPE_SIZE) +
+;            __builtin_preserve_field_info(arg->bf2, FIELD_TYPE_LSHIFT_U64);
+;   }
+; Compilation flag:
+;   clang -target bpfel -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i64, i32, i32, i32, i8, i8 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%struct.s* %arg) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !30, metadata !DIExpression()), !dbg !31
+  %0 = tail call i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 5, i32 6), !dbg !32, !llvm.preserve.access.index !18
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %0, i64 0), !dbg !33
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %0, i64 1), !dbg !34
+  %add = add i32 %2, %1, !dbg !35
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %0, i64 4), !dbg !36
+  %add1 = add i32 %add, %3, !dbg !37
+  ret i32 %add1, !dbg !38
+}
+
+; CHECK:             mov64 r1, 20
+; CHECK:             mov64 r0, 4
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK-EL:          mov64 r1, 50
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = 2)
+
+; CHECK:             .byte   115                     # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=89
+; CHECK:             .ascii  "0:6"                   # string offset=95
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   89                      # Field reloc section string offset=89
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   95
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   95
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   95
+; CHECK-NEXT:        .long   4
+
+; Function Attrs: nounwind readnone
+declare i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.ss(%struct.s*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git bc6913e314806882e2b537b5b03996800078d2ad)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 10, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6, !7, !8}
+!6 = !DIEnumerator(name: "FIELD_TYPE_OFFSET", value: 0, isUnsigned: true)
+!7 = !DIEnumerator(name: "FIELD_TYPE_SIZE", value: 1, isUnsigned: true)
+!8 = !DIEnumerator(name: "FIELD_TYPE_LSHIFT_U64", value: 4, isUnsigned: true)
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git bc6913e314806882e2b537b5b03996800078d2ad)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 11, type: !14, scopeLine: 11, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !29)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!16, !17}
+!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !18, size: 64)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 192, elements: !19)
+!19 = !{!20, !22, !23, !24, !25, !27, !28}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !18, file: !1, line: 2, baseType: !21, size: 64)
+!21 = !DIBasicType(name: "long long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "f2", scope: !18, file: !1, line: 3, baseType: !4, size: 32, offset: 64)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "f3", scope: !18, file: !1, line: 4, baseType: !4, size: 32, offset: 96)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "f4", scope: !18, file: !1, line: 5, baseType: !4, size: 32, offset: 128)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "f5", scope: !18, file: !1, line: 6, baseType: !26, size: 8, offset: 160)
+!26 = !DIBasicType(name: "unsigned char", size: 8, encoding: DW_ATE_unsigned_char)
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "bf1", scope: !18, file: !1, line: 7, baseType: !4, size: 5, offset: 168, flags: DIFlagBitField, extraData: i64 168)
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "bf2", scope: !18, file: !1, line: 8, baseType: !4, size: 1, offset: 173, flags: DIFlagBitField, extraData: i64 168)
+!29 = !{!30}
+!30 = !DILocalVariable(name: "arg", arg: 1, scope: !13, file: !1, line: 11, type: !17)
+!31 = !DILocation(line: 0, scope: !13)
+!32 = !DILocation(line: 12, column: 45, scope: !13)
+!33 = !DILocation(line: 12, column: 10, scope: !13)
+!34 = !DILocation(line: 13, column: 10, scope: !13)
+!35 = !DILocation(line: 12, column: 69, scope: !13)
+!36 = !DILocation(line: 14, column: 10, scope: !13)
+!37 = !DILocation(line: 13, column: 67, scope: !13)
+!38 = !DILocation(line: 12, column: 3, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-2.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-2.ll
new file mode 100644
index 0000000000000..78354493464a4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-2.ll
@@ -0,0 +1,124 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK-ALU32 %s
+; Source code:
+;   struct s {
+;     char f1;
+;     char bf1:6,
+;          bf2:2,
+;          bf3:5,
+;          bf4:3;
+;   };
+;   enum {FIELD_TYPE_OFFSET = 0, FIELD_TYPE_SIZE = 1, FIELD_TYPE_LSHIFT_U64 = 4,};
+;   int test(struct s *arg) {
+;     return __builtin_preserve_field_info(arg->bf4, FIELD_TYPE_OFFSET) +
+;            __builtin_preserve_field_info(arg->bf4, FIELD_TYPE_SIZE) +
+;            __builtin_preserve_field_info(arg->bf4, FIELD_TYPE_LSHIFT_U64);
+;   }
+; For this case, the IR type has the same starting storage offset for fields
+; bf1, bf1, bf3 and bf4 and the ABI alignment is 1 byte. So for bf4 access,
+; the starting offset has to be at the beginning of field bf3.
+; Compilation flag:
+;   clang -target bpfel -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type <{ i8, i16 }>
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%struct.s* %arg) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !27, metadata !DIExpression()), !dbg !28
+  %0 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 1, i32 4), !dbg !29, !llvm.preserve.access.index !18
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 0), !dbg !30
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 1), !dbg !31
+  %add = add i32 %2, %1, !dbg !32
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 4), !dbg !33
+  %add1 = add i32 %add, %3, !dbg !34
+  ret i32 %add1, !dbg !35
+}
+
+; CHECK:             mov64 r1, 2
+; CHECK:             mov64 r0, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK-EL:          mov64 r1, 56
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = 2)
+
+; CHECK:             .byte   115                     # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=40
+; CHECK:             .ascii  "0:4"                   # string offset=46
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   40                      # Field reloc section string offset=40
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   46
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   46
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   46
+; CHECK-NEXT:        .long   4
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.ss(%struct.s*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 630ca91834ecc06349cb3b4bd2982c1b85b5ad96)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 8, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6, !7, !8}
+!6 = !DIEnumerator(name: "FIELD_TYPE_OFFSET", value: 0, isUnsigned: true)
+!7 = !DIEnumerator(name: "FIELD_TYPE_SIZE", value: 1, isUnsigned: true)
+!8 = !DIEnumerator(name: "FIELD_TYPE_LSHIFT_U64", value: 4, isUnsigned: true)
+!9 = !{i32 2, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 630ca91834ecc06349cb3b4bd2982c1b85b5ad96)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 9, type: !14, scopeLine: 9, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !26)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!16, !17}
+!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !18, size: 64)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 24, elements: !19)
+!19 = !{!20, !22, !23, !24, !25}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !18, file: !1, line: 2, baseType: !21, size: 8)
+!21 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "bf1", scope: !18, file: !1, line: 3, baseType: !21, size: 6, offset: 8, flags: DIFlagBitField, extraData: i64 8)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "bf2", scope: !18, file: !1, line: 4, baseType: !21, size: 2, offset: 14, flags: DIFlagBitField, extraData: i64 8)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "bf3", scope: !18, file: !1, line: 5, baseType: !21, size: 5, offset: 16, flags: DIFlagBitField, extraData: i64 8)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "bf4", scope: !18, file: !1, line: 6, baseType: !21, size: 3, offset: 21, flags: DIFlagBitField, extraData: i64 8)
+!26 = !{!27}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !13, file: !1, line: 9, type: !17)
+!28 = !DILocation(line: 0, scope: !13)
+!29 = !DILocation(line: 10, column: 45, scope: !13)
+!30 = !DILocation(line: 10, column: 10, scope: !13)
+!31 = !DILocation(line: 11, column: 10, scope: !13)
+!32 = !DILocation(line: 10, column: 69, scope: !13)
+!33 = !DILocation(line: 12, column: 10, scope: !13)
+!34 = !DILocation(line: 11, column: 67, scope: !13)
+!35 = !DILocation(line: 10, column: 3, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-record-align16.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-record-align16.ll
new file mode 100644
index 0000000000000..a32df0da09b0b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-record-align16.ll
@@ -0,0 +1,105 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; Source code:
+;   struct t2 {
+;       int a[8];
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;   };
+;
+;   struct t1 {
+;       int f1: 1;
+;       int f2: 2;
+;       long: 61;
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;       long: 64;
+;       struct t2 f3;
+;   } __attribute__((preserve_access_index));
+;
+;   struct t1 g;
+;   int foo() {
+;     return g.f1;
+;   }
+; Compilation flag:
+;   clang -target bpfel -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; ModuleID = 'test.c'
+source_filename = "test.c"
+target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
+target triple = "sbf"
+
+%struct.t1 = type { i512, %struct.t2 }
+%struct.t2 = type { [8 x i32], i256 }
+
+@g = dso_local global %struct.t1 zeroinitializer, align 4, !dbg !0
+
+; Function Attrs: nounwind
+define dso_local i32 @foo() #0 !dbg !22 {
+entry:
+  %0 = call i512* @llvm.preserve.struct.access.index.p0i512.p0s_struct.t1s(%struct.t1* elementtype(%struct.t1) @g, i32 0, i32 0), !dbg !26, !llvm.preserve.access.index !5
+  %bf.load = load i512, i512* %0, align 4, !dbg !26
+  %bf.shl = shl i512 %bf.load, 511, !dbg !26
+  %bf.ashr = ashr i512 %bf.shl, 511, !dbg !26
+  %bf.cast = trunc i512 %bf.ashr to i32, !dbg !26
+  ret i32 %bf.cast, !dbg !27
+}
+
+; CHECK:        .long   68                              # BTF_KIND_STRUCT(id = 4)
+
+; CHECK:        .ascii  ".text"                         # string offset=9
+; CHECK:        .ascii  "t1"                            # string offset=68
+; CHECK:        .ascii  "0:0"                           # string offset=105
+
+; CHECK:        .long   16                              # FieldReloc
+; CHECK:        .long   9                               # Field reloc section string offset=9
+; CHECK:        .long   1
+; CHECK:        .long   .Ltmp[[#]]
+; CHECK:        .long   4
+; CHECK:        .long   105
+; CHECK:        .long   0
+
+; Function Attrs: nofree nosync nounwind readnone willreturn
+declare i512* @llvm.preserve.struct.access.index.p0i512.p0s_struct.t1s(%struct.t1*, i32 immarg, i32 immarg) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nofree nosync nounwind readnone willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!17, !18, !19, !20}
+!llvm.ident = !{!21}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 23, type: !5, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 468279d2d249e44ffa3535a613245b4ceb81a908)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/bitfield/simple", checksumkind: CSK_MD5, checksum: "b9c80125731b87136772eec36d0b48a3")
+!4 = !{!0}
+!5 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 9, size: 1024, elements: !6)
+!6 = !{!7, !9, !10}
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "f1", scope: !5, file: !3, line: 10, baseType: !8, size: 1, flags: DIFlagBitField, extraData: i64 0)
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "f2", scope: !5, file: !3, line: 11, baseType: !8, size: 2, offset: 1, flags: DIFlagBitField, extraData: i64 0)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "f3", scope: !5, file: !3, line: 20, baseType: !11, size: 512, offset: 512)
+!11 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t2", file: !3, line: 1, size: 512, elements: !12)
+!12 = !{!13}
+!13 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !11, file: !3, line: 2, baseType: !14, size: 256)
+!14 = !DICompositeType(tag: DW_TAG_array_type, baseType: !8, size: 256, elements: !15)
+!15 = !{!16}
+!16 = !DISubrange(count: 8)
+!17 = !{i32 7, !"Dwarf Version", i32 5}
+!18 = !{i32 2, !"Debug Info Version", i32 3}
+!19 = !{i32 1, !"wchar_size", i32 4}
+!20 = !{i32 7, !"frame-pointer", i32 2}
+!21 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 468279d2d249e44ffa3535a613245b4ceb81a908)"}
+!22 = distinct !DISubprogram(name: "foo", scope: !3, file: !3, line: 24, type: !23, scopeLine: 24, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !25)
+!23 = !DISubroutineType(types: !24)
+!24 = !{!8}
+!25 = !{}
+!26 = !DILocation(line: 25, column: 12, scope: !22)
+!27 = !DILocation(line: 25, column: 3, scope: !22)
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-duplicate.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-duplicate.ll
new file mode 100644
index 0000000000000..f3b85d7666c16
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-duplicate.ll
@@ -0,0 +1,106 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+; RUN: opt -passes='default<O2>' -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -o - %t1 | FileCheck %s
+;
+; Source:
+;   struct s1 { int a; int b; } __attribute__((preserve_access_index));
+;   int foo(struct s1 *arg) { return arg->a; }
+;   int bar(struct s1 *arg) { return arg->a; }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -g -Xclang -disable-llvm-passes test.c
+
+%struct.s1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @foo(%struct.s1* %arg) #0 !dbg !7 {
+entry:
+  %arg.addr = alloca %struct.s1*, align 8
+  store %struct.s1* %arg, %struct.s1** %arg.addr, align 8, !tbaa !18
+  call void @llvm.dbg.declare(metadata %struct.s1** %arg.addr, metadata !17, metadata !DIExpression()), !dbg !22
+  %0 = load %struct.s1*, %struct.s1** %arg.addr, align 8, !dbg !23, !tbaa !18
+  %1 = call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %0, i32 0, i32 0), !dbg !24, !llvm.preserve.access.index !12
+  %2 = load i32, i32* %1, align 4, !dbg !24, !tbaa !25
+  ret i32 %2, !dbg !28
+}
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind
+define dso_local i32 @bar(%struct.s1* %arg) #0 !dbg !29 {
+entry:
+  %arg.addr = alloca %struct.s1*, align 8
+  store %struct.s1* %arg, %struct.s1** %arg.addr, align 8, !tbaa !18
+  call void @llvm.dbg.declare(metadata %struct.s1** %arg.addr, metadata !31, metadata !DIExpression()), !dbg !32
+  %0 = load %struct.s1*, %struct.s1** %arg.addr, align 8, !dbg !33, !tbaa !18
+  %1 = call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %0, i32 0, i32 0), !dbg !34, !llvm.preserve.access.index !12
+  %2 = load i32, i32* %1, align 4, !dbg !34, !tbaa !25
+  ret i32 %2, !dbg !35
+}
+
+; CHECK:             .long   1                               # BTF_KIND_STRUCT(id = 2)
+
+; CHECK:             .ascii  "s1"                            # string offset=1
+; CHECK:             .ascii  ".text"                         # string offset=20
+; CHECK:             .ascii  "0:0"                           # string offset=26
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   20                              # Field reloc section string offset=20
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   0
+
+attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+attributes #2 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git 2f40e20613758b3e11a15494c09f4b6973673d6b)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git 2f40e20613758b3e11a15494c09f4b6973673d6b)"}
+!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !16)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 64, elements: !13)
+!13 = !{!14, !15}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !12, file: !1, line: 1, baseType: !10, size: 32, offset: 32)
+!16 = !{!17}
+!17 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 2, type: !11)
+!18 = !{!19, !19, i64 0}
+!19 = !{!"any pointer", !20, i64 0}
+!20 = !{!"omnipotent char", !21, i64 0}
+!21 = !{!"Simple C/C++ TBAA"}
+!22 = !DILocation(line: 2, column: 20, scope: !7)
+!23 = !DILocation(line: 2, column: 34, scope: !7)
+!24 = !DILocation(line: 2, column: 39, scope: !7)
+!25 = !{!26, !27, i64 0}
+!26 = !{!"s1", !27, i64 0, !27, i64 4}
+!27 = !{!"int", !20, i64 0}
+!28 = !DILocation(line: 2, column: 27, scope: !7)
+!29 = distinct !DISubprogram(name: "bar", scope: !1, file: !1, line: 3, type: !8, scopeLine: 3, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !30)
+!30 = !{!31}
+!31 = !DILocalVariable(name: "arg", arg: 1, scope: !29, file: !1, line: 3, type: !11)
+!32 = !DILocation(line: 3, column: 20, scope: !29)
+!33 = !DILocation(line: 3, column: 34, scope: !29)
+!34 = !DILocation(line: 3, column: 39, scope: !29)
+!35 = !DILocation(line: 3, column: 27, scope: !29)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-array-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-array-2.ll
new file mode 100644
index 0000000000000..4756ae5dc097e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-array-2.ll
@@ -0,0 +1,84 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+
+; Source:
+;   enum { FIELD_EXISTENCE = 2, };
+;   struct s1 { int a1; };
+;   int test() {
+;     struct s1 *v = 0;
+;     return __builtin_preserve_field_info(v[0], FIELD_EXISTENCE);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s1 = type { i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !17 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* null, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = tail call %struct.s1* @llvm.preserve.array.access.index.p0s_struct.s1s.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) null, i32 0, i32 0), !dbg !23, !llvm.preserve.access.index !8
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0s_struct.s1s(%struct.s1* %0, i64 2), !dbg !24
+  ret i32 %1, !dbg !25
+}
+
+; CHECK:             .long   16                      # BTF_KIND_STRUCT(id = 4)
+
+; CHECK:             .ascii  ".text"                 # string offset=10
+; CHECK:             .ascii  "s1"                    # string offset=16
+; CHECK:             .byte   48                      # string offset=22
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   10                      # Field reloc section string offset=10
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   22
+; CHECK-NEXT:        .long   2
+
+; Function Attrs: nounwind readnone
+declare %struct.s1* @llvm.preserve.array.access.index.p0s_struct.s1s.p0s_struct.s1s(%struct.s1*, i32 immarg, i32 immarg) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0s_struct.s1s(%struct.s1*, i64 immarg) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!13, !14, !15}
+!llvm.ident = !{!16}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 32791937d7aceb0a5e1eaabf1bb1a6dbe1639792)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_EXISTENCE", value: 2, isUnsigned: true)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64)
+!9 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 2, size: 32, elements: !10)
+!10 = !{!11}
+!11 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !9, file: !1, line: 2, baseType: !12, size: 32)
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{i32 7, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 32791937d7aceb0a5e1eaabf1bb1a6dbe1639792)"}
+!17 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !18, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !20)
+!18 = !DISubroutineType(types: !19)
+!19 = !{!12}
+!20 = !{!21}
+!21 = !DILocalVariable(name: "v", scope: !17, file: !1, line: 4, type: !8)
+!22 = !DILocation(line: 0, scope: !17)
+!23 = !DILocation(line: 5, column: 40, scope: !17)
+!24 = !DILocation(line: 5, column: 10, scope: !17)
+!25 = !DILocation(line: 5, column: 3, scope: !17)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll
new file mode 100644
index 0000000000000..bda5d106f50d5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll
@@ -0,0 +1,87 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -opaque-pointers -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -opaque-pointers -o - %t1 | FileCheck %s
+;
+; Source code:
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   struct s { int a; int b; };
+;   int get_value(const void *addr);
+;   int test(struct s *arg) { return get_value(_(&arg[2].b)); }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.s* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !17, metadata !DIExpression()), !dbg !18
+  %0 = tail call %struct.s* @llvm.preserve.array.access.index.p0s_struct.ss.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 0, i32 2), !dbg !19, !llvm.preserve.access.index !11
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* elementtype(%struct.s) %0, i32 1, i32 1), !dbg !19, !llvm.preserve.access.index !12
+  %2 = bitcast i32* %1 to i8*, !dbg !19
+  %call = tail call i32 @get_value(i8* %2) #4, !dbg !20
+  ret i32 %call, !dbg !21
+}
+; CHECK-LABEL: test
+; CHECK:       [[RELOC:.Ltmp[0-9]+]]
+; CHECK:       mov64 r2, 20
+; CHECK:       add64 r1, r2
+; CHECK:       call get_value
+; CHECK:       exit
+;
+; CHECK:      .section        .BTF.ext,"",@progbits
+; CHECK:      .long   16                      # FieldReloc
+; CHECK-NEXT: .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT: .long   1
+; CHECK-NEXT: .long   [[RELOC]]
+; CHECK-NEXT: .long   2
+; CHECK-NEXT: .long   26
+; CHECK-NEXT: .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.s* @llvm.preserve.array.access.index.p0s_struct.ss.p0s_struct.ss(%struct.s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 365789)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 9.0.0 (trunk 365789)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !8, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !16)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 2, size: 64, elements: !13)
+!13 = !{!14, !15}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 2, baseType: !10, size: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !12, file: !1, line: 2, baseType: !10, size: 32, offset: 32)
+!16 = !{!17}
+!17 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 4, type: !11)
+!18 = !DILocation(line: 0, scope: !7)
+!19 = !DILocation(line: 4, column: 44, scope: !7)
+!20 = !DILocation(line: 4, column: 34, scope: !7)
+!21 = !DILocation(line: 4, column: 27, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-1.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-1.ll
new file mode 100644
index 0000000000000..896b3bdfaad70
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-1.ll
@@ -0,0 +1,154 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1:7; int a2:4; int a3:5; int a4:16;} __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_BYTE_SIZE = 1, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_BYTE_SIZE);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2, FIELD_BYTE_SIZE);
+;     unsigned r3 = __builtin_preserve_field_info(arg->b2.a3, FIELD_BYTE_SIZE);
+;     unsigned r4 = __builtin_preserve_field_info(arg->b2.a4, FIELD_BYTE_SIZE);
+;     /* r1: 4, r2: 4, r3: 4, r4: 4 */
+;     return r1 + r2 + r3 + r4;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { i32 }
+%struct.s1 = type { i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !28, metadata !DIExpression()), !dbg !33
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !34, !llvm.preserve.access.index !16
+  %b2 = bitcast %union.u1* %0 to %struct.s1*, !dbg !34
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !35, !llvm.preserve.access.index !21
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 1), !dbg !36
+  call void @llvm.dbg.value(metadata i32 %2, metadata !29, metadata !DIExpression()), !dbg !33
+  %3 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 1), !dbg !37, !llvm.preserve.access.index !21
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %3, i64 1), !dbg !38
+  call void @llvm.dbg.value(metadata i32 %4, metadata !30, metadata !DIExpression()), !dbg !33
+  %5 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 2), !dbg !39, !llvm.preserve.access.index !21
+  %6 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %5, i64 1), !dbg !40
+  call void @llvm.dbg.value(metadata i32 %6, metadata !31, metadata !DIExpression()), !dbg !33
+  %7 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 3), !dbg !41, !llvm.preserve.access.index !21
+  %8 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %7, i64 1), !dbg !42
+  call void @llvm.dbg.value(metadata i32 %8, metadata !32, metadata !DIExpression()), !dbg !33
+  %add = add i32 %4, %2, !dbg !43
+  %add4 = add i32 %add, %6, !dbg !44
+  %add5 = add i32 %add4, %8, !dbg !45
+  ret i32 %add5, !dbg !46
+}
+
+; CHECK:             mov64 r1, 4
+; CHECK:             mov64 r0, 4
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 4
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 4
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=43
+; CHECK:             .ascii  "0:1:0"                 # string offset=49
+; CHECK:             .ascii  "0:1:1"                 # string offset=92
+; CHECK:             .ascii  "0:1:2"                 # string offset=98
+; CHECK:             .ascii  "0:1:3"                 # string offset=104
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   49
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   98
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   1
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_BYTE_SIZE", value: 1, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 32, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 2, baseType: !20, size: 32)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 32, elements: !22)
+!22 = !{!23, !24, !25, !26}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !21, file: !1, line: 1, baseType: !14, size: 7, flags: DIFlagBitField, extraData: i64 0)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !21, file: !1, line: 1, baseType: !14, size: 4, offset: 7, flags: DIFlagBitField, extraData: i64 0)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !21, file: !1, line: 1, baseType: !14, size: 5, offset: 11, flags: DIFlagBitField, extraData: i64 0)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "a4", scope: !21, file: !1, line: 1, baseType: !14, size: 16, offset: 16, flags: DIFlagBitField, extraData: i64 0)
+!27 = !{!28, !29, !30, !31, !32}
+!28 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 4, type: !15)
+!29 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 5, type: !4)
+!30 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 6, type: !4)
+!31 = !DILocalVariable(name: "r3", scope: !11, file: !1, line: 7, type: !4)
+!32 = !DILocalVariable(name: "r4", scope: !11, file: !1, line: 8, type: !4)
+!33 = !DILocation(line: 0, scope: !11)
+!34 = !DILocation(line: 5, column: 52, scope: !11)
+!35 = !DILocation(line: 5, column: 55, scope: !11)
+!36 = !DILocation(line: 5, column: 17, scope: !11)
+!37 = !DILocation(line: 6, column: 55, scope: !11)
+!38 = !DILocation(line: 6, column: 17, scope: !11)
+!39 = !DILocation(line: 7, column: 55, scope: !11)
+!40 = !DILocation(line: 7, column: 17, scope: !11)
+!41 = !DILocation(line: 8, column: 55, scope: !11)
+!42 = !DILocation(line: 8, column: 17, scope: !11)
+!43 = !DILocation(line: 10, column: 13, scope: !11)
+!44 = !DILocation(line: 10, column: 18, scope: !11)
+!45 = !DILocation(line: 10, column: 23, scope: !11)
+!46 = !DILocation(line: 10, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-2.ll
new file mode 100644
index 0000000000000..4bb7dfe914595
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-2.ll
@@ -0,0 +1,143 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1; char a2; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_BYTE_SIZE = 1, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2, FIELD_BYTE_SIZE);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a1, FIELD_BYTE_SIZE);
+;     unsigned r3 = __builtin_preserve_field_info(arg->b2.a2, FIELD_BYTE_SIZE);
+;     /* r1: 8, r2: 4, r3: 1 */
+;     return r1 + r2 + r3;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { i32, i8 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !27, metadata !DIExpression()), !dbg !31
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !32, !llvm.preserve.access.index !16
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !32
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0s_struct.s1s(%struct.s1* %b2, i64 1), !dbg !33
+  call void @llvm.dbg.value(metadata i32 %1, metadata !28, metadata !DIExpression()), !dbg !31
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !34, !llvm.preserve.access.index !21
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %2, i64 1), !dbg !35
+  call void @llvm.dbg.value(metadata i32 %3, metadata !29, metadata !DIExpression()), !dbg !31
+  %4 = tail call i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 1), !dbg !36, !llvm.preserve.access.index !21
+  %5 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %4, i64 1), !dbg !37
+  call void @llvm.dbg.value(metadata i32 %5, metadata !30, metadata !DIExpression()), !dbg !31
+  %add = add i32 %3, %1, !dbg !38
+  %add3 = add i32 %add, %5, !dbg !39
+  ret i32 %add3, !dbg !40
+}
+
+; CHECK:             mov64 r1, 8
+; CHECK:             mov64 r0, 4
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=42
+; CHECK:             .ascii  "0:1"                   # string offset=48
+; CHECK:             .ascii  "0:1:0"                 # string offset=89
+; CHECK:             .ascii  "0:1:1"                 # string offset=95
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   42                      # Field reloc section string offset=42
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   89
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   95
+; CHECK-NEXT:        .long   1
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0s_struct.s1s(%struct.s1*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_BYTE_SIZE", value: 1, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !26)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 64, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 2, baseType: !20, size: 64)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 64, elements: !22)
+!22 = !{!23, !24}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !21, file: !1, line: 1, baseType: !14, size: 32)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !21, file: !1, line: 1, baseType: !25, size: 8, offset: 32)
+!25 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!26 = !{!27, !28, !29, !30}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 4, type: !15)
+!28 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 5, type: !4)
+!29 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 6, type: !4)
+!30 = !DILocalVariable(name: "r3", scope: !11, file: !1, line: 7, type: !4)
+!31 = !DILocation(line: 0, scope: !11)
+!32 = !DILocation(line: 5, column: 52, scope: !11)
+!33 = !DILocation(line: 5, column: 17, scope: !11)
+!34 = !DILocation(line: 6, column: 55, scope: !11)
+!35 = !DILocation(line: 6, column: 17, scope: !11)
+!36 = !DILocation(line: 7, column: 55, scope: !11)
+!37 = !DILocation(line: 7, column: 17, scope: !11)
+!38 = !DILocation(line: 9, column: 13, scope: !11)
+!39 = !DILocation(line: 9, column: 18, scope: !11)
+!40 = !DILocation(line: 9, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-3.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-3.ll
new file mode 100644
index 0000000000000..c624fd2547615
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-3.ll
@@ -0,0 +1,134 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1[10][10]; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_BYTE_SIZE = 1, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1[5], FIELD_BYTE_SIZE);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a1[5][5], FIELD_BYTE_SIZE);
+;     /* r1: 40, r2: 4 */
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { [10 x [10 x i32]] }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !18 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !31, metadata !DIExpression()), !dbg !34
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !35, !llvm.preserve.access.index !22
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !35
+  %1 = tail call [10 x [10 x i32]]* @llvm.preserve.struct.access.index.p0a10a10i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !36, !llvm.preserve.access.index !27
+  %2 = tail call [10 x i32]* @llvm.preserve.array.access.index.p0a10i32.p0a10a10i32([10 x [10 x i32]]* elementtype([10 x [10 x i32]]) %1, i32 1, i32 5), !dbg !37, !llvm.preserve.access.index !8
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0a10i32([10 x i32]* %2, i64 1), !dbg !38
+  call void @llvm.dbg.value(metadata i32 %3, metadata !32, metadata !DIExpression()), !dbg !34
+  %4 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]* elementtype([10 x i32]) %2, i32 1, i32 5), !dbg !39, !llvm.preserve.access.index !12
+  %5 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %4, i64 1), !dbg !40
+  call void @llvm.dbg.value(metadata i32 %5, metadata !33, metadata !DIExpression()), !dbg !34
+  %add = add i32 %5, %3, !dbg !41
+  ret i32 %add, !dbg !42
+}
+
+; CHECK:             mov64 r1, 40
+; CHECK:             mov64 r0, 4
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=54
+; CHECK:             .ascii  "0:1:0:5"               # string offset=60
+; CHECK:             .ascii  "0:1:0:5:5"             # string offset=105
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   54                      # Field reloc section string offset=54
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   60
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   105
+; CHECK-NEXT:        .long   1
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x [10 x i32]]* @llvm.preserve.struct.access.index.p0a10a10i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x i32]* @llvm.preserve.array.access.index.p0a10i32.p0a10a10i32([10 x [10 x i32]]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0a10i32([10 x i32]*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_BYTE_SIZE", value: 1, isUnsigned: true)
+!7 = !{!8, !12}
+!8 = !DICompositeType(tag: DW_TAG_array_type, baseType: !9, size: 3200, elements: !10)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !{!11, !11}
+!11 = !DISubrange(count: 10)
+!12 = !DICompositeType(tag: DW_TAG_array_type, baseType: !9, size: 320, elements: !13)
+!13 = !{!11}
+!14 = !{i32 2, !"Dwarf Version", i32 4}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)"}
+!18 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !19, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !30)
+!19 = !DISubroutineType(types: !20)
+!20 = !{!9, !21}
+!21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !22, size: 64)
+!22 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 3200, elements: !23)
+!23 = !{!24, !25}
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !22, file: !1, line: 2, baseType: !9, size: 32)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !22, file: !1, line: 2, baseType: !26, size: 3200)
+!26 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !27)
+!27 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 3200, elements: !28)
+!28 = !{!29}
+!29 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !27, file: !1, line: 1, baseType: !8, size: 3200)
+!30 = !{!31, !32, !33}
+!31 = !DILocalVariable(name: "arg", arg: 1, scope: !18, file: !1, line: 4, type: !21)
+!32 = !DILocalVariable(name: "r1", scope: !18, file: !1, line: 5, type: !4)
+!33 = !DILocalVariable(name: "r2", scope: !18, file: !1, line: 6, type: !4)
+!34 = !DILocation(line: 0, scope: !18)
+!35 = !DILocation(line: 5, column: 52, scope: !18)
+!36 = !DILocation(line: 5, column: 55, scope: !18)
+!37 = !DILocation(line: 5, column: 47, scope: !18)
+!38 = !DILocation(line: 5, column: 17, scope: !18)
+!39 = !DILocation(line: 6, column: 47, scope: !18)
+!40 = !DILocation(line: 6, column: 17, scope: !18)
+!41 = !DILocation(line: 8, column: 13, scope: !18)
+!42 = !DILocation(line: 8, column: 3, scope: !18)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-4.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-4.ll
new file mode 100644
index 0000000000000..6bc6e184d1124
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-byte-size-4.ll
@@ -0,0 +1,87 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef struct s1 { int a1; int a2:4; int a3;} __s1;
+;   enum { FIELD_BYTE_SIZE = 1, };
+;   int test(__s1 *arg) {
+;     return __builtin_preserve_field_info(arg->a2, FIELD_BYTE_SIZE);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s1 = type { i32, i8, i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%struct.s1* readnone %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* %arg, metadata !23, metadata !DIExpression()), !dbg !24
+  %0 = tail call i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %arg, i32 1, i32 1), !dbg !25, !llvm.preserve.access.index !17
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %0, i64 1), !dbg !26
+  ret i32 %1, !dbg !27
+}
+
+; CHECK:             mov64 r0, 4
+; CHECK:             exit
+
+; CHECK:             .long   6                       # BTF_KIND_STRUCT(id = 3)
+
+; CHECK:             .ascii  "s1"                    # string offset=6
+; CHECK:             .ascii  ".text"                 # string offset=31
+; CHECK:             .ascii  "0:1"                   # string offset=37
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   31                      # Field reloc section string offset=31
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   37
+; CHECK-NEXT:        .long   1
+
+; Function Attrs: nounwind readnone
+declare i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 6c63b5d6a1cb84a75807804337c855a41c976260)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 2, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_BYTE_SIZE", value: 1, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 6c63b5d6a1cb84a75807804337c855a41c976260)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !12, scopeLine: 3, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !22)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !17)
+!17 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 96, elements: !18)
+!18 = !{!19, !20, !21}
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !17, file: !1, line: 1, baseType: !14, size: 32)
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !17, file: !1, line: 1, baseType: !14, size: 4, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !17, file: !1, line: 1, baseType: !14, size: 32, offset: 64)
+!22 = !{!23}
+!23 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 3, type: !15)
+!24 = !DILocation(line: 0, scope: !11)
+!25 = !DILocation(line: 4, column: 45, scope: !11)
+!26 = !DILocation(line: 4, column: 10, scope: !11)
+!27 = !DILocation(line: 4, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-1.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-1.ll
new file mode 100644
index 0000000000000..84a347eff5626
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-1.ll
@@ -0,0 +1,168 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef unsigned __uint;
+;   struct s1 { int a1; __uint a2:9; __uint a3:4; };
+;   union u1 { int b1; __uint b2:9; __uint b3:4; };
+;   enum { FIELD_EXISTENCE = 2, };
+;   int test(struct s1 *arg1, union u1 *arg2) {
+;     unsigned r1 = __builtin_preserve_field_info(arg1->a1, FIELD_EXISTENCE);
+;     unsigned r2 = __builtin_preserve_field_info(arg1->a3, FIELD_EXISTENCE);
+;     unsigned r3 = __builtin_preserve_field_info(arg2->b1, FIELD_EXISTENCE);
+;     unsigned r4 = __builtin_preserve_field_info(arg2->b3, FIELD_EXISTENCE);
+;     return r1 + r2 + r3 + r4;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s1 = type { i32, i16 }
+%union.u1 = type { i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%struct.s1* %arg1, %union.u1* %arg2) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* %arg1, metadata !29, metadata !DIExpression()), !dbg !35
+  call void @llvm.dbg.value(metadata %union.u1* %arg2, metadata !30, metadata !DIExpression()), !dbg !35
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %arg1, i32 0, i32 0), !dbg !36, !llvm.preserve.access.index !16
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %0, i64 2), !dbg !37
+  call void @llvm.dbg.value(metadata i32 %1, metadata !31, metadata !DIExpression()), !dbg !35
+  %2 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %arg1, i32 1, i32 2), !dbg !38, !llvm.preserve.access.index !16
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %2, i64 2), !dbg !39
+  call void @llvm.dbg.value(metadata i32 %3, metadata !32, metadata !DIExpression()), !dbg !35
+  %4 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg2, i32 0), !dbg !40, !llvm.preserve.access.index !23
+  %b1 = getelementptr inbounds %union.u1, %union.u1* %4, i64 0, i32 0, !dbg !40
+  %5 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %b1, i64 2), !dbg !41
+  call void @llvm.dbg.value(metadata i32 %5, metadata !33, metadata !DIExpression()), !dbg !35
+  %6 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_union.u1s(%union.u1* elementtype(%union.u1) %arg2, i32 0, i32 2), !dbg !42, !llvm.preserve.access.index !23
+  %7 = bitcast i32* %6 to i8*, !dbg !42
+  %8 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %7, i64 2), !dbg !43
+  call void @llvm.dbg.value(metadata i32 %8, metadata !34, metadata !DIExpression()), !dbg !35
+  %add = add i32 %3, %1, !dbg !44
+  %add1 = add i32 %add, %5, !dbg !45
+  %add2 = add i32 %add1, %8, !dbg !46
+  ret i32 %add2, !dbg !47
+}
+
+; CHECK:             mov64 r1, 1
+; CHECK:             mov64 r0, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK:             .long   37                      # BTF_KIND_UNION(id = 7)
+; CHECK:             .ascii  "s1"                    # string offset=1
+; CHECK:             .ascii  "u1"                    # string offset=37
+; CHECK:             .ascii  ".text"                 # string offset=64
+; CHECK:             .ascii  "0:0"                   # string offset=70
+; CHECK:             .ascii  "0:2"                   # string offset=111
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   64                      # Field reloc section string offset=64
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   70
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   111
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   70
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   111
+; CHECK-NEXT:        .long   2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_union.u1s(%union.u1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 4, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_EXISTENCE", value: 2, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !12, scopeLine: 5, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !28)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15, !22}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 2, size: 64, elements: !17)
+!17 = !{!18, !19, !21}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !16, file: !1, line: 2, baseType: !20, size: 9, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__uint", file: !1, line: 1, baseType: !4)
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !16, file: !1, line: 2, baseType: !20, size: 4, offset: 41, flags: DIFlagBitField, extraData: i64 32)
+!22 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !23, size: 64)
+!23 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 3, size: 32, elements: !24)
+!24 = !{!25, !26, !27}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !23, file: !1, line: 3, baseType: !14, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !23, file: !1, line: 3, baseType: !20, size: 9, flags: DIFlagBitField, extraData: i64 0)
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "b3", scope: !23, file: !1, line: 3, baseType: !20, size: 4, flags: DIFlagBitField, extraData: i64 0)
+!28 = !{!29, !30, !31, !32, !33, !34}
+!29 = !DILocalVariable(name: "arg1", arg: 1, scope: !11, file: !1, line: 5, type: !15)
+!30 = !DILocalVariable(name: "arg2", arg: 2, scope: !11, file: !1, line: 5, type: !22)
+!31 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 6, type: !4)
+!32 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 7, type: !4)
+!33 = !DILocalVariable(name: "r3", scope: !11, file: !1, line: 8, type: !4)
+!34 = !DILocalVariable(name: "r4", scope: !11, file: !1, line: 9, type: !4)
+!35 = !DILocation(line: 0, scope: !11)
+!36 = !DILocation(line: 6, column: 53, scope: !11)
+!37 = !DILocation(line: 6, column: 17, scope: !11)
+!38 = !DILocation(line: 7, column: 53, scope: !11)
+!39 = !DILocation(line: 7, column: 17, scope: !11)
+!40 = !DILocation(line: 8, column: 53, scope: !11)
+!41 = !DILocation(line: 8, column: 17, scope: !11)
+!42 = !DILocation(line: 9, column: 53, scope: !11)
+!43 = !DILocation(line: 9, column: 17, scope: !11)
+!44 = !DILocation(line: 10, column: 13, scope: !11)
+!45 = !DILocation(line: 10, column: 18, scope: !11)
+!46 = !DILocation(line: 10, column: 23, scope: !11)
+!47 = !DILocation(line: 10, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-2.ll
new file mode 100644
index 0000000000000..f79d02795da83
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-2.ll
@@ -0,0 +1,125 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef unsigned __uint;
+;   struct s1 { int a1; __uint a2:9; __uint a3:4; };
+;   union u1 { int b1; struct s1 b2; };
+;   enum { FIELD_EXISTENCE = 2, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_EXISTENCE);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a3, FIELD_EXISTENCE);
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { i32, i16 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !27, metadata !DIExpression()), !dbg !30
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !31, !llvm.preserve.access.index !16
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !31
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !32, !llvm.preserve.access.index !20
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 2), !dbg !33
+  call void @llvm.dbg.value(metadata i32 %2, metadata !28, metadata !DIExpression()), !dbg !30
+  %3 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 2), !dbg !34, !llvm.preserve.access.index !20
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %3, i64 2), !dbg !35
+  call void @llvm.dbg.value(metadata i32 %4, metadata !29, metadata !DIExpression()), !dbg !30
+  %add = add i32 %4, %2, !dbg !36
+  ret i32 %add, !dbg !37
+}
+
+; CHECK:             mov64 r1, 1
+; CHECK:             mov64 r0, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=55
+; CHECK:             .ascii  "0:1:0"                 # string offset=61
+; CHECK:             .ascii  "0:1:2"                 # string offset=104
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   55                      # Field reloc section string offset=55
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   61
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   2
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 4, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_EXISTENCE", value: 2, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !12, scopeLine: 5, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !26)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 3, size: 64, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 3, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 3, baseType: !20, size: 64)
+!20 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 2, size: 64, elements: !21)
+!21 = !{!22, !23, !25}
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !20, file: !1, line: 2, baseType: !14, size: 32)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !20, file: !1, line: 2, baseType: !24, size: 9, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!24 = !DIDerivedType(tag: DW_TAG_typedef, name: "__uint", file: !1, line: 1, baseType: !4)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !20, file: !1, line: 2, baseType: !24, size: 4, offset: 41, flags: DIFlagBitField, extraData: i64 32)
+!26 = !{!27, !28, !29}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 5, type: !15)
+!28 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 6, type: !4)
+!29 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 7, type: !4)
+!30 = !DILocation(line: 0, scope: !11)
+!31 = !DILocation(line: 6, column: 52, scope: !11)
+!32 = !DILocation(line: 6, column: 55, scope: !11)
+!33 = !DILocation(line: 6, column: 17, scope: !11)
+!34 = !DILocation(line: 7, column: 55, scope: !11)
+!35 = !DILocation(line: 7, column: 17, scope: !11)
+!36 = !DILocation(line: 8, column: 13, scope: !11)
+!37 = !DILocation(line: 8, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-3.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-3.ll
new file mode 100644
index 0000000000000..c50d135479b47
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-3.ll
@@ -0,0 +1,133 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1[10][10]; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_EXISTENCE = 2, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1[5], FIELD_EXISTENCE);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a1[5][5], FIELD_EXISTENCE);
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { [10 x [10 x i32]] }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !18 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !31, metadata !DIExpression()), !dbg !34
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !35, !llvm.preserve.access.index !22
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !35
+  %1 = tail call [10 x [10 x i32]]* @llvm.preserve.struct.access.index.p0a10a10i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !36, !llvm.preserve.access.index !27
+  %2 = tail call [10 x i32]* @llvm.preserve.array.access.index.p0a10i32.p0a10a10i32([10 x [10 x i32]]* elementtype([10 x [10 x i32]]) %1, i32 1, i32 5), !dbg !37, !llvm.preserve.access.index !8
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0a10i32([10 x i32]* %2, i64 2), !dbg !38
+  call void @llvm.dbg.value(metadata i32 %3, metadata !32, metadata !DIExpression()), !dbg !34
+  %4 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]* elementtype([10 x i32]) %2, i32 1, i32 5), !dbg !39, !llvm.preserve.access.index !12
+  %5 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %4, i64 2), !dbg !40
+  call void @llvm.dbg.value(metadata i32 %5, metadata !33, metadata !DIExpression()), !dbg !34
+  %add = add i32 %5, %3, !dbg !41
+  ret i32 %add, !dbg !42
+}
+
+; CHECK:             mov64 r1, 1
+; CHECK:             mov64 r0, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=54
+; CHECK:             .ascii  "0:1:0:5"               # string offset=60
+; CHECK:             .ascii  "0:1:0:5:5"             # string offset=105
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   54                      # Field reloc section string offset=54
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   60
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   105
+; CHECK-NEXT:        .long   2
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x [10 x i32]]* @llvm.preserve.struct.access.index.p0a10a10i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x i32]* @llvm.preserve.array.access.index.p0a10i32.p0a10a10i32([10 x [10 x i32]]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0a10i32([10 x i32]*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_EXISTENCE", value: 2, isUnsigned: true)
+!7 = !{!8, !12}
+!8 = !DICompositeType(tag: DW_TAG_array_type, baseType: !9, size: 3200, elements: !10)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !{!11, !11}
+!11 = !DISubrange(count: 10)
+!12 = !DICompositeType(tag: DW_TAG_array_type, baseType: !9, size: 320, elements: !13)
+!13 = !{!11}
+!14 = !{i32 2, !"Dwarf Version", i32 4}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)"}
+!18 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !19, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !30)
+!19 = !DISubroutineType(types: !20)
+!20 = !{!9, !21}
+!21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !22, size: 64)
+!22 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 3200, elements: !23)
+!23 = !{!24, !25}
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !22, file: !1, line: 2, baseType: !9, size: 32)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !22, file: !1, line: 2, baseType: !26, size: 3200)
+!26 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !27)
+!27 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 3200, elements: !28)
+!28 = !{!29}
+!29 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !27, file: !1, line: 1, baseType: !8, size: 3200)
+!30 = !{!31, !32, !33}
+!31 = !DILocalVariable(name: "arg", arg: 1, scope: !18, file: !1, line: 4, type: !21)
+!32 = !DILocalVariable(name: "r1", scope: !18, file: !1, line: 5, type: !4)
+!33 = !DILocalVariable(name: "r2", scope: !18, file: !1, line: 6, type: !4)
+!34 = !DILocation(line: 0, scope: !18)
+!35 = !DILocation(line: 5, column: 52, scope: !18)
+!36 = !DILocation(line: 5, column: 55, scope: !18)
+!37 = !DILocation(line: 5, column: 47, scope: !18)
+!38 = !DILocation(line: 5, column: 17, scope: !18)
+!39 = !DILocation(line: 6, column: 47, scope: !18)
+!40 = !DILocation(line: 6, column: 17, scope: !18)
+!41 = !DILocation(line: 7, column: 13, scope: !18)
+!42 = !DILocation(line: 7, column: 3, scope: !18)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-4.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-4.ll
new file mode 100644
index 0000000000000..4e9a018302676
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-existence-4.ll
@@ -0,0 +1,109 @@
+; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+; Source code:
+;   #define BPF_FIELD_EXISTS 2
+;   unsigned test1() {
+;     struct t {
+;       int val;
+;     } bar;
+;     return __builtin_preserve_field_info((&bar)[1], BPF_FIELD_EXISTS);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+%struct.t = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test1() #0 !dbg !6 {
+entry:
+  %bar = alloca %struct.t, align 4
+  %0 = bitcast %struct.t* %bar to i8*, !dbg !20
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #5, !dbg !20
+  call void @llvm.dbg.declare(metadata %struct.t* %bar, metadata !11, metadata !DIExpression()), !dbg !21
+  %1 = call %struct.t* @llvm.preserve.array.access.index.p0s_struct.ts.p0s_struct.ts(%struct.t* elementtype(%struct.t) %bar, i32 0, i32 1), !dbg !22, !llvm.preserve.access.index !4
+  %2 = call i32 @llvm.bpf.preserve.field.info.p0s_struct.ts(%struct.t* %1, i64 2), !dbg !23
+  %3 = bitcast %struct.t* %bar to i8*, !dbg !24
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* %3) #5, !dbg !24
+  ret i32 %2, !dbg !25
+}
+
+; CHECK:             mov64 r0, 1
+; CHECK-NEXT:        exit
+
+; CHECK:             .long   26                              # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT:        .long   67108865                        # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   32                              # BTF_KIND_INT(id = 5)
+; CHECK-NEXT:        .long   16777216                        # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                        # 0x1000020
+
+; CHECK:             .byte   116                             # string offset=26
+; CHECK:             .ascii  "val"                           # string offset=28
+; CHECK:             .ascii  "int"                           # string offset=32
+; CHECK:             .byte   49                              # string offset=36
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   {{[0-9]+}}                      # Field reloc section string
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   2
+
+; Function Attrs: argmemonly nofree nosync nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+; Function Attrs: nofree nosync nounwind readnone willreturn
+declare %struct.t* @llvm.preserve.array.access.index.p0s_struct.ts.p0s_struct.ts(%struct.t*, i32 immarg, i32 immarg) #3
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0s_struct.ts(%struct.t*, i64 immarg) #4
+
+; Function Attrs: argmemonly nofree nosync nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { argmemonly nofree nosync nounwind willreturn }
+attributes #2 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { nofree nosync nounwind readnone willreturn }
+attributes #4 = { nounwind readnone }
+attributes #5 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!15, !16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 2e0ee68dc85c0a2b7e65e489a60ab363393b06a8)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t", scope: !6, file: !1, line: 3, size: 32, elements: !12)
+!6 = distinct !DISubprogram(name: "test1", scope: !1, file: !1, line: 2, type: !7, scopeLine: 2, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !10)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9}
+!9 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!10 = !{!11}
+!11 = !DILocalVariable(name: "bar", scope: !6, file: !1, line: 5, type: !5)
+!12 = !{!13}
+!13 = !DIDerivedType(tag: DW_TAG_member, name: "val", scope: !5, file: !1, line: 4, baseType: !14, size: 32)
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !{i32 7, !"Dwarf Version", i32 4}
+!16 = !{i32 2, !"Debug Info Version", i32 3}
+!17 = !{i32 1, !"wchar_size", i32 4}
+!18 = !{i32 7, !"frame-pointer", i32 2}
+!19 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git 2e0ee68dc85c0a2b7e65e489a60ab363393b06a8)"}
+!20 = !DILocation(line: 3, column: 3, scope: !6)
+!21 = !DILocation(line: 5, column: 5, scope: !6)
+!22 = !DILocation(line: 6, column: 40, scope: !6)
+!23 = !DILocation(line: 6, column: 10, scope: !6)
+!24 = !DILocation(line: 7, column: 1, scope: !6)
+!25 = !DILocation(line: 6, column: 3, scope: !6)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-1.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-1.ll
new file mode 100644
index 0000000000000..9396868d18f94
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-1.ll
@@ -0,0 +1,155 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1:7; int a2:4; int a3:5; int a4:16;} __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_LSHIFT_U64 = 4, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_LSHIFT_U64);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2, FIELD_LSHIFT_U64);
+;     unsigned r3 = __builtin_preserve_field_info(arg->b2.a3, FIELD_LSHIFT_U64);
+;     unsigned r4 = __builtin_preserve_field_info(arg->b2.a4, FIELD_LSHIFT_U64);
+;     /* big endian:    r1: 32, r2: 39, r3: 43, r4: 48 */
+;     /* little endian: r1: 57, r2: 53, r3: 48, r4: 32 */
+;     return r1 + r2 + r3 + r4;
+;   }
+; Compilation flag:
+;   clang -target bpfel -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { i32 }
+%struct.s1 = type { i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !28, metadata !DIExpression()), !dbg !33
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !34, !llvm.preserve.access.index !16
+  %b2 = bitcast %union.u1* %0 to %struct.s1*, !dbg !34
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !35, !llvm.preserve.access.index !21
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 4), !dbg !36
+  call void @llvm.dbg.value(metadata i32 %2, metadata !29, metadata !DIExpression()), !dbg !33
+  %3 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 1), !dbg !37, !llvm.preserve.access.index !21
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %3, i64 4), !dbg !38
+  call void @llvm.dbg.value(metadata i32 %4, metadata !30, metadata !DIExpression()), !dbg !33
+  %5 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 2), !dbg !39, !llvm.preserve.access.index !21
+  %6 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %5, i64 4), !dbg !40
+  call void @llvm.dbg.value(metadata i32 %6, metadata !31, metadata !DIExpression()), !dbg !33
+  %7 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 3), !dbg !41, !llvm.preserve.access.index !21
+  %8 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %7, i64 4), !dbg !42
+  call void @llvm.dbg.value(metadata i32 %8, metadata !32, metadata !DIExpression()), !dbg !33
+  %add = add i32 %4, %2, !dbg !43
+  %add4 = add i32 %add, %6, !dbg !44
+  %add5 = add i32 %add4, %8, !dbg !45
+  ret i32 %add5, !dbg !46
+}
+
+; CHECK-EL:          mov64 r1, 57
+; CHECK-EL:          mov64 r0, 53
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK-EL:          mov64 r1, 48
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK-EL:          mov64 r1, 32
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=43
+; CHECK:             .ascii  "0:1:0"                 # string offset=49
+; CHECK:             .ascii  "0:1:1"                 # string offset=92
+; CHECK:             .ascii  "0:1:2"                 # string offset=98
+; CHECK:             .ascii  "0:1:3"                 # string offset=104
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   49
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   98
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   4
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 5635073377f153f7f2ff9b34c77af3c79885ff4a)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_LSHIFT_U64", value: 4, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 5635073377f153f7f2ff9b34c77af3c79885ff4a)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 32, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 2, baseType: !20, size: 32)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 32, elements: !22)
+!22 = !{!23, !24, !25, !26}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !21, file: !1, line: 1, baseType: !14, size: 7, flags: DIFlagBitField, extraData: i64 0)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !21, file: !1, line: 1, baseType: !14, size: 4, offset: 7, flags: DIFlagBitField, extraData: i64 0)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !21, file: !1, line: 1, baseType: !14, size: 5, offset: 11, flags: DIFlagBitField, extraData: i64 0)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "a4", scope: !21, file: !1, line: 1, baseType: !14, size: 16, offset: 16, flags: DIFlagBitField, extraData: i64 0)
+!27 = !{!28, !29, !30, !31, !32}
+!28 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 4, type: !15)
+!29 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 5, type: !4)
+!30 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 6, type: !4)
+!31 = !DILocalVariable(name: "r3", scope: !11, file: !1, line: 7, type: !4)
+!32 = !DILocalVariable(name: "r4", scope: !11, file: !1, line: 8, type: !4)
+!33 = !DILocation(line: 0, scope: !11)
+!34 = !DILocation(line: 5, column: 52, scope: !11)
+!35 = !DILocation(line: 5, column: 55, scope: !11)
+!36 = !DILocation(line: 5, column: 17, scope: !11)
+!37 = !DILocation(line: 6, column: 55, scope: !11)
+!38 = !DILocation(line: 6, column: 17, scope: !11)
+!39 = !DILocation(line: 7, column: 55, scope: !11)
+!40 = !DILocation(line: 7, column: 17, scope: !11)
+!41 = !DILocation(line: 8, column: 55, scope: !11)
+!42 = !DILocation(line: 8, column: 17, scope: !11)
+!43 = !DILocation(line: 11, column: 13, scope: !11)
+!44 = !DILocation(line: 11, column: 18, scope: !11)
+!45 = !DILocation(line: 11, column: 23, scope: !11)
+!46 = !DILocation(line: 11, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-2.ll
new file mode 100644
index 0000000000000..a6395bbcac14e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-lshift-2.ll
@@ -0,0 +1,126 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1; short a2; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_LSHIFT_U64 = 4, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_LSHIFT_U64);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2, FIELD_LSHIFT_U64);
+;     /* big endian:    r1: 32, r2: 48 */
+;     /* little endian: r1: 32, r2: 48 */
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { i32, i16 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !27, metadata !DIExpression()), !dbg !30
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !31, !llvm.preserve.access.index !16
+  %b2 = getelementptr %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !31
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !32, !llvm.preserve.access.index !21
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 4), !dbg !33
+  call void @llvm.dbg.value(metadata i32 %2, metadata !28, metadata !DIExpression()), !dbg !30
+  %3 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 1), !dbg !34, !llvm.preserve.access.index !21
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %3, i64 4), !dbg !35
+  call void @llvm.dbg.value(metadata i32 %4, metadata !29, metadata !DIExpression()), !dbg !30
+  %add = add i32 %4, %2, !dbg !36
+  ret i32 %add, !dbg !37
+}
+
+; CHECK:             mov64 r1, 32
+; CHECK:             mov64 r0, 48
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=43
+; CHECK:             .ascii  "0:1:0"                 # string offset=49
+; CHECK:             .ascii  "0:1:1"                 # string offset=92
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   49
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   4
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 5635073377f153f7f2ff9b34c77af3c79885ff4a)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_LSHIFT_U64", value: 4, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 5635073377f153f7f2ff9b34c77af3c79885ff4a)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !26)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 64, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 2, baseType: !20, size: 64)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 64, elements: !22)
+!22 = !{!23, !24}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !21, file: !1, line: 1, baseType: !14, size: 32)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !21, file: !1, line: 1, baseType: !25, size: 16, offset: 32)
+!25 = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed)
+!26 = !{!27, !28, !29}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 4, type: !15)
+!28 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 5, type: !4)
+!29 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 6, type: !4)
+!30 = !DILocation(line: 0, scope: !11)
+!31 = !DILocation(line: 5, column: 52, scope: !11)
+!32 = !DILocation(line: 5, column: 55, scope: !11)
+!33 = !DILocation(line: 5, column: 17, scope: !11)
+!34 = !DILocation(line: 6, column: 55, scope: !11)
+!35 = !DILocation(line: 6, column: 17, scope: !11)
+!36 = !DILocation(line: 9, column: 13, scope: !11)
+!37 = !DILocation(line: 9, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-1.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-1.ll
new file mode 100644
index 0000000000000..18dcfced25e66
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-1.ll
@@ -0,0 +1,154 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1:7; int a2:4; int a3:5; int a4:16;} __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_RSHIFT_U64 = 5, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_RSHIFT_U64);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2, FIELD_RSHIFT_U64);
+;     unsigned r3 = __builtin_preserve_field_info(arg->b2.a3, FIELD_RSHIFT_U64);
+;     unsigned r4 = __builtin_preserve_field_info(arg->b2.a4, FIELD_RSHIFT_U64);
+;     /* r1: 57, r2: 60, r3: 59, r4: 48 */
+;     return r1 + r2 + r3 + r4;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { i32 }
+%struct.s1 = type { i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !28, metadata !DIExpression()), !dbg !33
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !34, !llvm.preserve.access.index !16
+  %b2 = bitcast %union.u1* %0 to %struct.s1*, !dbg !34
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !35, !llvm.preserve.access.index !21
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 5), !dbg !36
+  call void @llvm.dbg.value(metadata i32 %2, metadata !29, metadata !DIExpression()), !dbg !33
+  %3 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 1), !dbg !37, !llvm.preserve.access.index !21
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %3, i64 5), !dbg !38
+  call void @llvm.dbg.value(metadata i32 %4, metadata !30, metadata !DIExpression()), !dbg !33
+  %5 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 2), !dbg !39, !llvm.preserve.access.index !21
+  %6 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %5, i64 5), !dbg !40
+  call void @llvm.dbg.value(metadata i32 %6, metadata !31, metadata !DIExpression()), !dbg !33
+  %7 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 3), !dbg !41, !llvm.preserve.access.index !21
+  %8 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %7, i64 5), !dbg !42
+  call void @llvm.dbg.value(metadata i32 %8, metadata !32, metadata !DIExpression()), !dbg !33
+  %add = add i32 %4, %2, !dbg !43
+  %add4 = add i32 %add, %6, !dbg !44
+  %add5 = add i32 %add4, %8, !dbg !45
+  ret i32 %add5, !dbg !46
+}
+
+; CHECK:             mov64 r1, 57
+; CHECK:             mov64 r0, 60
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 59
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 48
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=43
+; CHECK:             .ascii  "0:1:0"                 # string offset=49
+; CHECK:             .ascii  "0:1:1"                 # string offset=92
+; CHECK:             .ascii  "0:1:2"                 # string offset=98
+; CHECK:             .ascii  "0:1:3"                 # string offset=104
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   49
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   92
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   98
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   104
+; CHECK-NEXT:        .long   5
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_RSHIFT_U64", value: 5, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 32, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 2, baseType: !20, size: 32)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 32, elements: !22)
+!22 = !{!23, !24, !25, !26}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !21, file: !1, line: 1, baseType: !14, size: 7, flags: DIFlagBitField, extraData: i64 0)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !21, file: !1, line: 1, baseType: !14, size: 4, offset: 7, flags: DIFlagBitField, extraData: i64 0)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !21, file: !1, line: 1, baseType: !14, size: 5, offset: 11, flags: DIFlagBitField, extraData: i64 0)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "a4", scope: !21, file: !1, line: 1, baseType: !14, size: 16, offset: 16, flags: DIFlagBitField, extraData: i64 0)
+!27 = !{!28, !29, !30, !31, !32}
+!28 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 4, type: !15)
+!29 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 5, type: !4)
+!30 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 6, type: !4)
+!31 = !DILocalVariable(name: "r3", scope: !11, file: !1, line: 7, type: !4)
+!32 = !DILocalVariable(name: "r4", scope: !11, file: !1, line: 8, type: !4)
+!33 = !DILocation(line: 0, scope: !11)
+!34 = !DILocation(line: 5, column: 52, scope: !11)
+!35 = !DILocation(line: 5, column: 55, scope: !11)
+!36 = !DILocation(line: 5, column: 17, scope: !11)
+!37 = !DILocation(line: 6, column: 55, scope: !11)
+!38 = !DILocation(line: 6, column: 17, scope: !11)
+!39 = !DILocation(line: 7, column: 55, scope: !11)
+!40 = !DILocation(line: 7, column: 17, scope: !11)
+!41 = !DILocation(line: 8, column: 55, scope: !11)
+!42 = !DILocation(line: 8, column: 17, scope: !11)
+!43 = !DILocation(line: 10, column: 13, scope: !11)
+!44 = !DILocation(line: 10, column: 18, scope: !11)
+!45 = !DILocation(line: 10, column: 23, scope: !11)
+!46 = !DILocation(line: 10, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-2.ll
new file mode 100644
index 0000000000000..f09d71daef90d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-2.ll
@@ -0,0 +1,125 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { int a1; char a2; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_RSHIFT_U64 = 5, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_RSHIFT_U64);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2, FIELD_RSHIFT_U64);
+;     /* r1: 32, r2: 56 */
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { i32, i8 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !27, metadata !DIExpression()), !dbg !30
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !31, !llvm.preserve.access.index !16
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !31
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !32, !llvm.preserve.access.index !21
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 5), !dbg !33
+  call void @llvm.dbg.value(metadata i32 %2, metadata !28, metadata !DIExpression()), !dbg !30
+  %3 = tail call i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 1), !dbg !34, !llvm.preserve.access.index !21
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %3, i64 5), !dbg !35
+  call void @llvm.dbg.value(metadata i32 %4, metadata !29, metadata !DIExpression()), !dbg !30
+  %add = add i32 %4, %2, !dbg !36
+  ret i32 %add, !dbg !37
+}
+
+; CHECK:             mov64 r1, 32
+; CHECK:             mov64 r0, 56
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=42
+; CHECK:             .ascii  "0:1:0"                 # string offset=48
+; CHECK:             .ascii  "0:1:1"                 # string offset=91
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   42                      # Field reloc section string offset=42
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   48
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   91
+; CHECK-NEXT:        .long   5
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i8* @llvm.preserve.struct.access.index.p0i8.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_RSHIFT_U64", value: 5, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !26)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 64, elements: !17)
+!17 = !{!18, !19}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !16, file: !1, line: 2, baseType: !20, size: 64)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 64, elements: !22)
+!22 = !{!23, !24}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !21, file: !1, line: 1, baseType: !14, size: 32)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !21, file: !1, line: 1, baseType: !25, size: 8, offset: 32)
+!25 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!26 = !{!27, !28, !29}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 4, type: !15)
+!28 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 5, type: !4)
+!29 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 6, type: !4)
+!30 = !DILocation(line: 0, scope: !11)
+!31 = !DILocation(line: 5, column: 52, scope: !11)
+!32 = !DILocation(line: 5, column: 55, scope: !11)
+!33 = !DILocation(line: 5, column: 17, scope: !11)
+!34 = !DILocation(line: 6, column: 55, scope: !11)
+!35 = !DILocation(line: 6, column: 17, scope: !11)
+!36 = !DILocation(line: 8, column: 13, scope: !11)
+!37 = !DILocation(line: 8, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-3.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-3.ll
new file mode 100644
index 0000000000000..5d2cdf5604395
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-rshift-3.ll
@@ -0,0 +1,135 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef struct s1 { char a1 [5][5]; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_RSHIFT_U64 = 5, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1[3], FIELD_RSHIFT_U64);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a1[3][3], FIELD_RSHIFT_U64);
+;     /* r1 : 24, r2 : 56 */
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { i32, [24 x i8] }
+%struct.s1 = type { [5 x [5 x i8]] }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !18 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !32, metadata !DIExpression()), !dbg !35
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !36, !llvm.preserve.access.index !23
+  %b2 = bitcast %union.u1* %0 to %struct.s1*, !dbg !36
+  %1 = tail call [5 x [5 x i8]]* @llvm.preserve.struct.access.index.p0a5a5i8.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !37, !llvm.preserve.access.index !28
+  %2 = tail call [5 x i8]* @llvm.preserve.array.access.index.p0a5i8.p0a5a5i8([5 x [5 x i8]]* elementtype([5 x [5 x i8]]) %1, i32 1, i32 3), !dbg !38, !llvm.preserve.access.index !8
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0a5i8([5 x i8]* %2, i64 5), !dbg !39
+  call void @llvm.dbg.value(metadata i32 %3, metadata !33, metadata !DIExpression()), !dbg !35
+  %4 = tail call i8* @llvm.preserve.array.access.index.p0i8.p0a5i8([5 x i8]* elementtype([5 x i8]) %2, i32 1, i32 3), !dbg !40, !llvm.preserve.access.index !12
+  %5 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %4, i64 5), !dbg !41
+  call void @llvm.dbg.value(metadata i32 %5, metadata !34, metadata !DIExpression()), !dbg !35
+  %add = add i32 %5, %3, !dbg !42
+  ret i32 %add, !dbg !43
+}
+
+; CHECK:             mov64 r1, 24
+; CHECK:             mov64 r0, 56
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=59
+; CHECK:             .ascii  "0:1:0:3"               # string offset=65
+; CHECK:             .ascii  "0:1:0:3:3"             # string offset=110
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   59                      # Field reloc section string offset=59
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   65
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   110
+; CHECK-NEXT:        .long   5
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [5 x [5 x i8]]* @llvm.preserve.struct.access.index.p0a5a5i8.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [5 x i8]* @llvm.preserve.array.access.index.p0a5i8.p0a5a5i8([5 x [5 x i8]]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0a5i8([5 x i8]*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i8* @llvm.preserve.array.access.index.p0i8.p0a5i8([5 x i8]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 3, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_RSHIFT_U64", value: 5, isUnsigned: true)
+!7 = !{!8, !12}
+!8 = !DICompositeType(tag: DW_TAG_array_type, baseType: !9, size: 200, elements: !10)
+!9 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!10 = !{!11, !11}
+!11 = !DISubrange(count: 5)
+!12 = !DICompositeType(tag: DW_TAG_array_type, baseType: !9, size: 40, elements: !13)
+!13 = !{!11}
+!14 = !{i32 2, !"Dwarf Version", i32 4}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)"}
+!18 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !19, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !31)
+!19 = !DISubroutineType(types: !20)
+!20 = !{!21, !22}
+!21 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!22 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !23, size: 64)
+!23 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 2, size: 224, elements: !24)
+!24 = !{!25, !26}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !23, file: !1, line: 2, baseType: !21, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !23, file: !1, line: 2, baseType: !27, size: 200)
+!27 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 1, baseType: !28)
+!28 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 1, size: 200, elements: !29)
+!29 = !{!30}
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !28, file: !1, line: 1, baseType: !8, size: 200)
+!31 = !{!32, !33, !34}
+!32 = !DILocalVariable(name: "arg", arg: 1, scope: !18, file: !1, line: 4, type: !22)
+!33 = !DILocalVariable(name: "r1", scope: !18, file: !1, line: 5, type: !4)
+!34 = !DILocalVariable(name: "r2", scope: !18, file: !1, line: 6, type: !4)
+!35 = !DILocation(line: 0, scope: !18)
+!36 = !DILocation(line: 5, column: 52, scope: !18)
+!37 = !DILocation(line: 5, column: 55, scope: !18)
+!38 = !DILocation(line: 5, column: 47, scope: !18)
+!39 = !DILocation(line: 5, column: 17, scope: !18)
+!40 = !DILocation(line: 6, column: 47, scope: !18)
+!41 = !DILocation(line: 6, column: 17, scope: !18)
+!42 = !DILocation(line: 8, column: 13, scope: !18)
+!43 = !DILocation(line: 8, column: 3, scope: !18)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-1.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-1.ll
new file mode 100644
index 0000000000000..1479fdabb3b9f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-1.ll
@@ -0,0 +1,168 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   typedef unsigned __uint;
+;   struct s1 { int a1; __uint a2:9; __uint a3:4; };
+;   union u1 { int b1; __uint b2:9; __uint b3:4; };
+;   enum { FIELD_SIGNEDNESS = 3, };
+;   int test(struct s1 *arg1, union u1 *arg2) {
+;     unsigned r1 = __builtin_preserve_field_info(arg1->a1, FIELD_SIGNEDNESS);
+;     unsigned r2 = __builtin_preserve_field_info(arg1->a3, FIELD_SIGNEDNESS);
+;     unsigned r3 = __builtin_preserve_field_info(arg2->b1, FIELD_SIGNEDNESS);
+;     unsigned r4 = __builtin_preserve_field_info(arg2->b3, FIELD_SIGNEDNESS);
+;     return r1 + r2 + r3 + r4;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s1 = type { i32, i16 }
+%union.u1 = type { i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%struct.s1* %arg1, %union.u1* %arg2) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s1* %arg1, metadata !29, metadata !DIExpression()), !dbg !35
+  call void @llvm.dbg.value(metadata %union.u1* %arg2, metadata !30, metadata !DIExpression()), !dbg !35
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %arg1, i32 0, i32 0), !dbg !36, !llvm.preserve.access.index !16
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %0, i64 3), !dbg !37
+  call void @llvm.dbg.value(metadata i32 %1, metadata !31, metadata !DIExpression()), !dbg !35
+  %2 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %arg1, i32 1, i32 2), !dbg !38, !llvm.preserve.access.index !16
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %2, i64 3), !dbg !39
+  call void @llvm.dbg.value(metadata i32 %3, metadata !32, metadata !DIExpression()), !dbg !35
+  %4 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg2, i32 0), !dbg !40, !llvm.preserve.access.index !23
+  %b1 = getelementptr inbounds %union.u1, %union.u1* %4, i64 0, i32 0, !dbg !40
+  %5 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %b1, i64 3), !dbg !41
+  call void @llvm.dbg.value(metadata i32 %5, metadata !33, metadata !DIExpression()), !dbg !35
+  %6 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_union.u1s(%union.u1* elementtype(%union.u1) %arg2, i32 0, i32 2), !dbg !42, !llvm.preserve.access.index !23
+  %7 = bitcast i32* %6 to i8*, !dbg !42
+  %8 = tail call i32 @llvm.bpf.preserve.field.info.p0i8(i8* %7, i64 3), !dbg !43
+  call void @llvm.dbg.value(metadata i32 %8, metadata !34, metadata !DIExpression()), !dbg !35
+  %add = add i32 %3, %1, !dbg !44
+  %add1 = add i32 %add, %5, !dbg !45
+  %add2 = add i32 %add1, %8, !dbg !46
+  ret i32 %add2, !dbg !47
+}
+
+; CHECK:             mov64 r1, 1
+; CHECK:             mov64 r0, 0
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 0
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK:             .long   37                      # BTF_KIND_UNION(id = 7)
+; CHECK:             .ascii  "s1"                    # string offset=1
+; CHECK:             .ascii  "u1"                    # string offset=37
+; CHECK:             .ascii  ".text"                 # string offset=64
+; CHECK:             .ascii  "0:0"                   # string offset=70
+; CHECK:             .ascii  "0:2"                   # string offset=111
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   64                      # Field reloc section string offset=64
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   70
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   111
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   70
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   111
+; CHECK-NEXT:        .long   3
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_union.u1s(%union.u1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i8(i8*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 4, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "FIELD_SIGNEDNESS", value: 3, isUnsigned: true)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !12, scopeLine: 5, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !28)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!14, !15, !22}
+!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 2, size: 64, elements: !17)
+!17 = !{!18, !19, !21}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !16, file: !1, line: 2, baseType: !14, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !16, file: !1, line: 2, baseType: !20, size: 9, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!20 = !DIDerivedType(tag: DW_TAG_typedef, name: "__uint", file: !1, line: 1, baseType: !4)
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !16, file: !1, line: 2, baseType: !20, size: 4, offset: 41, flags: DIFlagBitField, extraData: i64 32)
+!22 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !23, size: 64)
+!23 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 3, size: 32, elements: !24)
+!24 = !{!25, !26, !27}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !23, file: !1, line: 3, baseType: !14, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !23, file: !1, line: 3, baseType: !20, size: 9, flags: DIFlagBitField, extraData: i64 0)
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "b3", scope: !23, file: !1, line: 3, baseType: !20, size: 4, flags: DIFlagBitField, extraData: i64 0)
+!28 = !{!29, !30, !31, !32, !33, !34}
+!29 = !DILocalVariable(name: "arg1", arg: 1, scope: !11, file: !1, line: 5, type: !15)
+!30 = !DILocalVariable(name: "arg2", arg: 2, scope: !11, file: !1, line: 5, type: !22)
+!31 = !DILocalVariable(name: "r1", scope: !11, file: !1, line: 6, type: !4)
+!32 = !DILocalVariable(name: "r2", scope: !11, file: !1, line: 7, type: !4)
+!33 = !DILocalVariable(name: "r3", scope: !11, file: !1, line: 8, type: !4)
+!34 = !DILocalVariable(name: "r4", scope: !11, file: !1, line: 9, type: !4)
+!35 = !DILocation(line: 0, scope: !11)
+!36 = !DILocation(line: 6, column: 53, scope: !11)
+!37 = !DILocation(line: 6, column: 17, scope: !11)
+!38 = !DILocation(line: 7, column: 53, scope: !11)
+!39 = !DILocation(line: 7, column: 17, scope: !11)
+!40 = !DILocation(line: 8, column: 53, scope: !11)
+!41 = !DILocation(line: 8, column: 17, scope: !11)
+!42 = !DILocation(line: 9, column: 53, scope: !11)
+!43 = !DILocation(line: 9, column: 17, scope: !11)
+!44 = !DILocation(line: 10, column: 13, scope: !11)
+!45 = !DILocation(line: 10, column: 18, scope: !11)
+!46 = !DILocation(line: 10, column: 23, scope: !11)
+!47 = !DILocation(line: 10, column: 3, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-2.ll
new file mode 100644
index 0000000000000..5b9373e4407af
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-2.ll
@@ -0,0 +1,156 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   enum A { AA = -1, AB = 0, }; /* signed */
+;   enum B { BA = 0, BB = 1, };  /* unsigned */
+;   typedef enum A __A;
+;   typedef enum B __B;
+;   typedef int __int;           /* signed */
+;   struct s1 { __A a1; __B a2:9; __int a3:4; };
+;   union u1 { int b1; struct s1 b2; };
+;   enum { FIELD_SIGNEDNESS = 3, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1, FIELD_SIGNEDNESS);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2, FIELD_SIGNEDNESS);
+;     unsigned r3 = __builtin_preserve_field_info(arg->b2.a3, FIELD_SIGNEDNESS);
+;     return r1 + r2 + r3;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { i32, i16 }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !20 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !37, metadata !DIExpression()), !dbg !41
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !42, !llvm.preserve.access.index !24
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !42
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !43, !llvm.preserve.access.index !28
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %1, i64 3), !dbg !44
+  call void @llvm.dbg.value(metadata i32 %2, metadata !38, metadata !DIExpression()), !dbg !41
+  %3 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 1), !dbg !45, !llvm.preserve.access.index !28
+  %4 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %3, i64 3), !dbg !46
+  call void @llvm.dbg.value(metadata i32 %4, metadata !39, metadata !DIExpression()), !dbg !41
+  %5 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 2), !dbg !47, !llvm.preserve.access.index !28
+  %6 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %5, i64 3), !dbg !48
+  call void @llvm.dbg.value(metadata i32 %6, metadata !40, metadata !DIExpression()), !dbg !41
+  %add = add i32 %4, %2, !dbg !49
+  %add3 = add i32 %add, %6, !dbg !50
+  ret i32 %add3, !dbg !51
+}
+
+; CHECK:             mov64 r1, 1
+; CHECK:             mov64 r0, 0
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             mov64 r1, 1
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=65
+; CHECK:             .ascii  "0:1:0"                 # string offset=71
+; CHECK:             .ascii  "0:1:1"                 # string offset=114
+; CHECK:             .ascii  "0:1:2"                 # string offset=120
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   65                      # Field reloc section string offset=65
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   71
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   114
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   120
+; CHECK-NEXT:        .long   3
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3, !8, !13}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "A", file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!5 = !{!6, !7}
+!6 = !DIEnumerator(name: "AA", value: -1)
+!7 = !DIEnumerator(name: "AB", value: 0)
+!8 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "B", file: !1, line: 2, baseType: !9, size: 32, elements: !10)
+!9 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!10 = !{!11, !12}
+!11 = !DIEnumerator(name: "BA", value: 0, isUnsigned: true)
+!12 = !DIEnumerator(name: "BB", value: 1, isUnsigned: true)
+!13 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 8, baseType: !9, size: 32, elements: !14)
+!14 = !{!15}
+!15 = !DIEnumerator(name: "FIELD_SIGNEDNESS", value: 3, isUnsigned: true)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 4a60741b74384f14b21fdc0131ede326438840ab)"}
+!20 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 9, type: !21, scopeLine: 9, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !36)
+!21 = !DISubroutineType(types: !22)
+!22 = !{!4, !23}
+!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !24, size: 64)
+!24 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 7, size: 64, elements: !25)
+!25 = !{!26, !27}
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !24, file: !1, line: 7, baseType: !4, size: 32)
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !24, file: !1, line: 7, baseType: !28, size: 64)
+!28 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 6, size: 64, elements: !29)
+!29 = !{!30, !32, !34}
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !28, file: !1, line: 6, baseType: !31, size: 32)
+!31 = !DIDerivedType(tag: DW_TAG_typedef, name: "__A", file: !1, line: 3, baseType: !3)
+!32 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !28, file: !1, line: 6, baseType: !33, size: 9, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!33 = !DIDerivedType(tag: DW_TAG_typedef, name: "__B", file: !1, line: 4, baseType: !8)
+!34 = !DIDerivedType(tag: DW_TAG_member, name: "a3", scope: !28, file: !1, line: 6, baseType: !35, size: 4, offset: 41, flags: DIFlagBitField, extraData: i64 32)
+!35 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 5, baseType: !4)
+!36 = !{!37, !38, !39, !40}
+!37 = !DILocalVariable(name: "arg", arg: 1, scope: !20, file: !1, line: 9, type: !23)
+!38 = !DILocalVariable(name: "r1", scope: !20, file: !1, line: 10, type: !9)
+!39 = !DILocalVariable(name: "r2", scope: !20, file: !1, line: 11, type: !9)
+!40 = !DILocalVariable(name: "r3", scope: !20, file: !1, line: 12, type: !9)
+!41 = !DILocation(line: 0, scope: !20)
+!42 = !DILocation(line: 10, column: 52, scope: !20)
+!43 = !DILocation(line: 10, column: 55, scope: !20)
+!44 = !DILocation(line: 10, column: 17, scope: !20)
+!45 = !DILocation(line: 11, column: 55, scope: !20)
+!46 = !DILocation(line: 11, column: 17, scope: !20)
+!47 = !DILocation(line: 12, column: 55, scope: !20)
+!48 = !DILocation(line: 12, column: 17, scope: !20)
+!49 = !DILocation(line: 13, column: 13, scope: !20)
+!50 = !DILocation(line: 13, column: 18, scope: !20)
+!51 = !DILocation(line: 13, column: 3, scope: !20)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-3.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-3.ll
new file mode 100644
index 0000000000000..9c6a8a9ba3110
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-fieldinfo-signedness-3.ll
@@ -0,0 +1,153 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+; Source code:
+;   enum A { AA = -1, AB = 0, };
+;   enum B { BA = 0, BB = 1, };
+;   typedef enum A __A;
+;   typedef enum B __B;
+;   typedef struct s1 { __A a1[10]; __B a2[10][10]; } __s1;
+;   union u1 { int b1; __s1 b2; };
+;   enum { FIELD_SIGNEDNESS = 3, };
+;   int test(union u1 *arg) {
+;     unsigned r1 = __builtin_preserve_field_info(arg->b2.a1[5], FIELD_SIGNEDNESS);
+;     unsigned r2 = __builtin_preserve_field_info(arg->b2.a2[5][5], FIELD_SIGNEDNESS);
+;     /* r1 : 1, r2 : 0 */
+;     return r1 + r2;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u1 = type { %struct.s1 }
+%struct.s1 = type { [10 x i32], [10 x [10 x i32]] }
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test(%union.u1* %arg) local_unnamed_addr #0 !dbg !29 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u1* %arg, metadata !43, metadata !DIExpression()), !dbg !46
+  %0 = tail call %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1* %arg, i32 1), !dbg !47, !llvm.preserve.access.index !33
+  %b2 = getelementptr inbounds %union.u1, %union.u1* %0, i64 0, i32 0, !dbg !47
+  %1 = tail call [10 x i32]* @llvm.preserve.struct.access.index.p0a10i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 0, i32 0), !dbg !48, !llvm.preserve.access.index !38
+  %2 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]* elementtype([10 x i32]) %1, i32 1, i32 5), !dbg !49, !llvm.preserve.access.index !17
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %2, i64 3), !dbg !50
+  call void @llvm.dbg.value(metadata i32 %3, metadata !44, metadata !DIExpression()), !dbg !46
+  %4 = tail call [10 x [10 x i32]]* @llvm.preserve.struct.access.index.p0a10a10i32.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %b2, i32 1, i32 1), !dbg !51, !llvm.preserve.access.index !38
+  %5 = tail call [10 x i32]* @llvm.preserve.array.access.index.p0a10i32.p0a10a10i32([10 x [10 x i32]]* elementtype([10 x [10 x i32]]) %4, i32 1, i32 5), !dbg !52, !llvm.preserve.access.index !21
+  %6 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]* elementtype([10 x i32]) %5, i32 1, i32 5), !dbg !52, !llvm.preserve.access.index !24
+  %7 = tail call i32 @llvm.bpf.preserve.field.info.p0i32(i32* %6, i64 3), !dbg !53
+  call void @llvm.dbg.value(metadata i32 %7, metadata !45, metadata !DIExpression()), !dbg !46
+  %add = add i32 %7, %3, !dbg !54
+  ret i32 %add, !dbg !55
+}
+
+; CHECK:             mov64 r1, 1
+; CHECK:             mov64 r0, 0
+; CHECK-ALU64:       add64 r0, r1
+; CHECK-ALU32:       add32 w0, w1
+; CHECK:             exit
+
+; CHECK:             .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK:             .ascii  "u1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=81
+; CHECK:             .ascii  "0:1:0:5"               # string offset=87
+; CHECK:             .ascii  "0:1:1:5:5"             # string offset=132
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   81                      # Field reloc section string offset=81
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   87
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   132
+; CHECK-NEXT:        .long   3
+
+; Function Attrs: nounwind readnone
+declare %union.u1* @llvm.preserve.union.access.index.p0s_union.u1s.p0s_union.u1s(%union.u1*, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x i32]* @llvm.preserve.struct.access.index.p0a10i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a10i32([10 x i32]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i32(i32*, i64) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x [10 x i32]]* @llvm.preserve.struct.access.index.p0a10a10i32.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x i32]* @llvm.preserve.array.access.index.p0a10i32.p0a10a10i32([10 x [10 x i32]]*, i32, i32) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!25, !26, !27}
+!llvm.ident = !{!28}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !16, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3, !8, !13}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "A", file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!5 = !{!6, !7}
+!6 = !DIEnumerator(name: "AA", value: -1)
+!7 = !DIEnumerator(name: "AB", value: 0)
+!8 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "B", file: !1, line: 2, baseType: !9, size: 32, elements: !10)
+!9 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!10 = !{!11, !12}
+!11 = !DIEnumerator(name: "BA", value: 0, isUnsigned: true)
+!12 = !DIEnumerator(name: "BB", value: 1, isUnsigned: true)
+!13 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 7, baseType: !9, size: 32, elements: !14)
+!14 = !{!15}
+!15 = !DIEnumerator(name: "FIELD_SIGNEDNESS", value: 3, isUnsigned: true)
+!16 = !{!17, !21, !24}
+!17 = !DICompositeType(tag: DW_TAG_array_type, baseType: !18, size: 320, elements: !19)
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "__A", file: !1, line: 3, baseType: !3)
+!19 = !{!20}
+!20 = !DISubrange(count: 10)
+!21 = !DICompositeType(tag: DW_TAG_array_type, baseType: !22, size: 3200, elements: !23)
+!22 = !DIDerivedType(tag: DW_TAG_typedef, name: "__B", file: !1, line: 4, baseType: !8)
+!23 = !{!20, !20}
+!24 = !DICompositeType(tag: DW_TAG_array_type, baseType: !22, size: 320, elements: !19)
+!25 = !{i32 2, !"Dwarf Version", i32 4}
+!26 = !{i32 2, !"Debug Info Version", i32 3}
+!27 = !{i32 1, !"wchar_size", i32 4}
+!28 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git c1e02f16f1105ffaf1c35ee8bc38b7d6db5c6ea9)"}
+!29 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !30, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !42)
+!30 = !DISubroutineType(types: !31)
+!31 = !{!4, !32}
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u1", file: !1, line: 6, size: 3520, elements: !34)
+!34 = !{!35, !36}
+!35 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !33, file: !1, line: 6, baseType: !4, size: 32)
+!36 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !33, file: !1, line: 6, baseType: !37, size: 3520)
+!37 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s1", file: !1, line: 5, baseType: !38)
+!38 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 5, size: 3520, elements: !39)
+!39 = !{!40, !41}
+!40 = !DIDerivedType(tag: DW_TAG_member, name: "a1", scope: !38, file: !1, line: 5, baseType: !17, size: 320)
+!41 = !DIDerivedType(tag: DW_TAG_member, name: "a2", scope: !38, file: !1, line: 5, baseType: !21, size: 3200, offset: 320)
+!42 = !{!43, !44, !45}
+!43 = !DILocalVariable(name: "arg", arg: 1, scope: !29, file: !1, line: 8, type: !32)
+!44 = !DILocalVariable(name: "r1", scope: !29, file: !1, line: 9, type: !9)
+!45 = !DILocalVariable(name: "r2", scope: !29, file: !1, line: 10, type: !9)
+!46 = !DILocation(line: 0, scope: !29)
+!47 = !DILocation(line: 9, column: 52, scope: !29)
+!48 = !DILocation(line: 9, column: 55, scope: !29)
+!49 = !DILocation(line: 9, column: 47, scope: !29)
+!50 = !DILocation(line: 9, column: 17, scope: !29)
+!51 = !DILocation(line: 10, column: 55, scope: !29)
+!52 = !DILocation(line: 10, column: 47, scope: !29)
+!53 = !DILocation(line: 10, column: 17, scope: !29)
+!54 = !DILocation(line: 12, column: 13, scope: !29)
+!55 = !DILocation(line: 12, column: 3, scope: !29)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-struct.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-struct.ll
new file mode 100644
index 0000000000000..c9418a85b71d8
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-struct.ll
@@ -0,0 +1,82 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   struct s { int a; int b; };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr);
+;   int test(struct s *arg) { return get_value(_(&arg->b)); }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.s* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !17, metadata !DIExpression()), !dbg !18
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 1, i32 1), !dbg !19, !llvm.preserve.access.index !12
+  %1 = bitcast i32* %0 to i8*, !dbg !19
+  %call = tail call i32 @get_value(i8* %1) #4, !dbg !20
+  ret i32 %call, !dbg !21
+}
+
+; CHECK-LABEL: test
+; CHECK:       [[RELOC:.Ltmp[0-9]+]]
+; CHECK:       mov64 r2, 4
+; CHECK:       add64 r1, r2
+; CHECK:       call get_value
+; CHECK:       exit
+;
+; CHECK:      .section        .BTF.ext,"",@progbits
+; CHECK:      .long   16                      # FieldReloc
+; CHECK-NEXT: .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT: .long   1
+; CHECK-NEXT: .long   [[RELOC]]
+; CHECK-NEXT: .long   2
+; CHECK-NEXT: .long   26
+; CHECK-NEXT: .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 365789)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 9.0.0 (trunk 365789)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !8, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !16)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 64, elements: !13)
+!13 = !{!14, !15}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !12, file: !1, line: 1, baseType: !10, size: 32, offset: 32)
+!16 = !{!17}
+!17 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 4, type: !11)
+!18 = !DILocation(line: 0, scope: !7)
+!19 = !DILocation(line: 4, column: 44, scope: !7)
+!20 = !DILocation(line: 4, column: 34, scope: !7)
+!21 = !DILocation(line: 4, column: 27, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
new file mode 100644
index 0000000000000..ff5eed7fb2155
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
@@ -0,0 +1,103 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source:
+;   enum AA { VAL1 = -100, VAL2 = 0xffff8000 };
+;   typedef enum { VAL10 = 0xffffFFFF80000000 } __BB;
+;   int test() {
+;     return __builtin_preserve_enum_value(*(enum AA *)VAL1, 0) +
+;            __builtin_preserve_enum_value(*(enum AA *)VAL2, 1) +
+;            __builtin_preserve_enum_value(*(__BB *)VAL10, 1);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes t1.c
+
+target triple = "sbf"
+
+@0 = private unnamed_addr constant [10 x i8] c"VAL1:-100\00", align 1
+@1 = private unnamed_addr constant [16 x i8] c"VAL2:4294934528\00", align 1
+@2 = private unnamed_addr constant [18 x i8] c"VAL10:-2147483648\00", align 1
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 !dbg !19 {
+entry:
+  %0 = call i64 @llvm.bpf.preserve.enum.value(i32 0, ptr @0, i64 0), !dbg !24, !llvm.preserve.access.index !3
+  %1 = call i64 @llvm.bpf.preserve.enum.value(i32 1, ptr @1, i64 1), !dbg !25, !llvm.preserve.access.index !3
+  %add = add i64 %0, %1, !dbg !26
+  %2 = call i64 @llvm.bpf.preserve.enum.value(i32 2, ptr @2, i64 1), !dbg !27, !llvm.preserve.access.index !13
+  %add1 = add i64 %add, %2, !dbg !28
+  %conv = trunc i64 %add1 to i32, !dbg !24
+  ret i32 %conv, !dbg !29
+}
+
+; CHECK:             lddw r{{[0-9]+}}, 1
+; CHECK:             lddw r{{[0-9]+}}, 4294934528
+; CHECK:             lddw r{{[0-9]+}}, -2147483648
+; CHECK:             exit
+
+; CHECK:             .long   16                              # BTF_KIND_ENUM64(id = 4)
+; CHECK:             .long   57                              # BTF_KIND_TYPEDEF(id = 5)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "AA"                            # string offset=16
+; CHECK:             .byte   48                              # string offset=29
+; CHECK:             .byte   49                              # string offset=55
+; CHECK:             .ascii  "__BB"                          # string offset=57
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   29
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   55
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   29
+; CHECK-NEXT:        .long   11
+
+; Function Attrs: nounwind readnone
+declare i64 @llvm.bpf.preserve.enum.value(i32, ptr, i64) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!14, !15, !16, !17}
+!llvm.ident = !{!18}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 1218d7e1cf1284666cd7403ea021e40b3b40e92b)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !12, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t1.c", directory: "/tmp/home/yhs/tmp1", checksumkind: CSK_MD5, checksum: "e1a546573a450dae0abedfbf6bebcba9")
+!2 = !{!3, !8}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "AA", file: !1, line: 1, baseType: !4, size: 64, elements: !5)
+!4 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
+!5 = !{!6, !7}
+!6 = !DIEnumerator(name: "VAL1", value: -100)
+!7 = !DIEnumerator(name: "VAL2", value: 4294934528)
+!8 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 2, baseType: !9, size: 64, elements: !10)
+!9 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!10 = !{!11}
+!11 = !DIEnumerator(name: "VAL10", value: 18446744071562067968, isUnsigned: true)
+!12 = !{!13}
+!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "__BB", file: !1, line: 2, baseType: !8)
+!14 = !{i32 7, !"Dwarf Version", i32 5}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{i32 7, !"frame-pointer", i32 2}
+!18 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 1218d7e1cf1284666cd7403ea021e40b3b40e92b)"}
+!19 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !20, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !23)
+!20 = !DISubroutineType(types: !21)
+!21 = !{!22}
+!22 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!23 = !{}
+!24 = !DILocation(line: 4, column: 10, scope: !19)
+!25 = !DILocation(line: 5, column: 10, scope: !19)
+!26 = !DILocation(line: 4, column: 61, scope: !19)
+!27 = !DILocation(line: 6, column: 10, scope: !19)
+!28 = !DILocation(line: 5, column: 61, scope: !19)
+!29 = !DILocation(line: 4, column: 3, scope: !19)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value.ll
new file mode 100644
index 0000000000000..6ac2c7aef33e7
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-enum-value.ll
@@ -0,0 +1,121 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source:
+;   enum AA { VAL1 = -100, VAL2 = 0xffff8000 };
+;   typedef enum { VAL10 = 0xffffFFFF80000000 } __BB;
+;   int test() {
+;     return __builtin_preserve_enum_value(*(enum AA *)VAL1, 0) +
+;            __builtin_preserve_enum_value(*(enum AA *)VAL2, 1) +
+;            __builtin_preserve_enum_value(*(__BB *)VAL10, 1);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes t1.c
+
+target triple = "sbf"
+
+@0 = private unnamed_addr constant [10 x i8] c"VAL1:-100\00", align 1
+@1 = private unnamed_addr constant [16 x i8] c"VAL2:4294934528\00", align 1
+@2 = private unnamed_addr constant [18 x i8] c"VAL10:-2147483648\00", align 1
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !18 {
+entry:
+  %0 = tail call i64 @llvm.bpf.preserve.enum.value(i32 0, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @0, i64 0, i64 0), i64 0), !dbg !23, !llvm.preserve.access.index !3
+  %1 = tail call i64 @llvm.bpf.preserve.enum.value(i32 1, i8* getelementptr inbounds ([16 x i8], [16 x i8]* @1, i64 0, i64 0), i64 1), !dbg !24, !llvm.preserve.access.index !3
+  %add = add i64 %1, %0, !dbg !25
+  %2 = tail call i64 @llvm.bpf.preserve.enum.value(i32 2, i8* getelementptr inbounds ([18 x i8], [18 x i8]* @2, i64 0, i64 0), i64 1), !dbg !26, !llvm.preserve.access.index !13
+  %add1 = add i64 %add, %2, !dbg !27
+  %conv = trunc i64 %add1 to i32, !dbg !23
+  ret i32 %conv, !dbg !28
+}
+
+; CHECK:             lddw r{{[0-9]+}}, 1
+; CHECK:             lddw r{{[0-9]+}}, 4294934528
+; CHECK:             lddw r{{[0-9]+}}, -2147483648
+; CHECK:             exit
+
+; CHECK:             .long   16                              # BTF_KIND_ENUM64(id = 4)
+; CHECK-NEXT:        .long   2466250754                      # 0x93000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   19
+; CHECK-NEXT:        .long   4294967196                      # 0xffffff9c
+; CHECK-NEXT:        .long   4294967295                      # 0xffffffff
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   4294934528                      # 0xffff8000
+; CHECK-NEXT:        .long   0                               # 0x0
+; CHECK-NEXT:        .long   57                              # BTF_KIND_TYPEDEF(id = 5)
+; CHECK-NEXT:        .long   134217728                       # 0x8000000
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   0                               # BTF_KIND_ENUM64(id = 6)
+; CHECK-NEXT:        .long   318767105                       # 0x13000001
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   62
+; CHECK-NEXT:        .long   2147483648                      # 0x80000000
+; CHECK-NEXT:        .long   4294967295                      # 0xffffffff
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "AA"                            # string offset=16
+; CHECK:             .ascii  "VAL1"                          # string offset=19
+; CHECK:             .ascii  "VAL2"                          # string offset=24
+; CHECK:             .byte   48                              # string offset=29
+; CHECK:             .byte   49                              # string offset=55
+; CHECK:             .ascii  "__BB"                          # string offset=57
+; CHECK:             .ascii  "VAL10"                         # string offset=62
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   29
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   55
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   29
+; CHECK-NEXT:        .long   11
+
+; Function Attrs: nounwind readnone
+declare i64 @llvm.bpf.preserve.enum.value(i32, i8*, i64) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !12, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t1.c", directory: "/tmp/home/yhs/tmp1")
+!2 = !{!3, !8}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "AA", file: !1, line: 1, baseType: !4, size: 64, elements: !5)
+!4 = !DIBasicType(name: "long int", size: 64, encoding: DW_ATE_signed)
+!5 = !{!6, !7}
+!6 = !DIEnumerator(name: "VAL1", value: -100)
+!7 = !DIEnumerator(name: "VAL2", value: 4294934528)
+!8 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 2, baseType: !9, size: 64, elements: !10)
+!9 = !DIBasicType(name: "long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!10 = !{!11}
+!11 = !DIEnumerator(name: "VAL10", value: 18446744071562067968, isUnsigned: true)
+!12 = !{!13}
+!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "__BB", file: !1, line: 2, baseType: !8)
+!14 = !{i32 7, !"Dwarf Version", i32 4}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!16 = !{i32 1, !"wchar_size", i32 4}
+!17 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)"}
+!18 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !19, scopeLine: 3, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !22)
+!19 = !DISubroutineType(types: !20)
+!20 = !{!21}
+!21 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!22 = !{}
+!23 = !DILocation(line: 4, column: 10, scope: !18)
+!24 = !DILocation(line: 5, column: 10, scope: !18)
+!25 = !DILocation(line: 4, column: 61, scope: !18)
+!26 = !DILocation(line: 6, column: 10, scope: !18)
+!27 = !DILocation(line: 5, column: 61, scope: !18)
+!28 = !DILocation(line: 4, column: 3, scope: !18)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-exist.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-exist.ll
new file mode 100644
index 0000000000000..236118864f856
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-exist.ll
@@ -0,0 +1,101 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source:
+;   enum AA { VAL = 100 };
+;   typedef int (*func_t)(void);
+;   struct s2 { int a[10]; };
+;   int test() {
+;     return __builtin_preserve_type_info(*(func_t *)0, 0) +
+;            __builtin_preserve_type_info(*(struct s2 *)0, 0) +
+;            __builtin_preserve_type_info(*(enum AA *)0, 0);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes t1.c
+
+target triple = "sbf"
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !17 {
+entry:
+  %0 = tail call i32 @llvm.bpf.preserve.type.info(i32 0, i64 0), !dbg !19, !llvm.preserve.access.index !8
+  %1 = tail call i32 @llvm.bpf.preserve.type.info(i32 1, i64 0), !dbg !20, !llvm.preserve.access.index !21
+  %add = add i32 %1, %0, !dbg !27
+  %2 = tail call i32 @llvm.bpf.preserve.type.info(i32 2, i64 0), !dbg !28, !llvm.preserve.access.index !3
+  %add1 = add i32 %add, %2, !dbg !29
+  ret i32 %add1, !dbg !30
+}
+
+; CHECK:             mov64 r{{[0-9]+}}, 1
+; CHECK:             mov64 r{{[0-9]+}}, 1
+; CHECK:             mov64 r{{[0-9]+}}, 1
+; CHECK:             exit
+
+; CHECK:             .long   16                              # BTF_KIND_TYPEDEF(id = 4)
+; CHECK:             .long   49                              # BTF_KIND_STRUCT(id = 7)
+; CHECK:             .long   74                              # BTF_KIND_ENUM(id = 10)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "func_t"                        # string offset=16
+; CHECK:             .byte   48                              # string offset=23
+; CHECK:             .ascii  "s2"                            # string offset=49
+; CHECK:             .ascii  "AA"                            # string offset=74
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   8
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.type.info(i32, i64) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!13, !14, !15}
+!llvm.ident = !{!16}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t1.c", directory: "/tmp/home/yhs/tmp1")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "AA", file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "VAL", value: 100, isUnsigned: true)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_typedef, name: "func_t", file: !1, line: 2, baseType: !9)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = !DISubroutineType(types: !11)
+!11 = !{!12}
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{i32 7, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)"}
+!17 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !10, scopeLine: 4, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !18)
+!18 = !{}
+!19 = !DILocation(line: 5, column: 10, scope: !17)
+!20 = !DILocation(line: 6, column: 10, scope: !17)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s2", file: !1, line: 3, size: 320, elements: !22)
+!22 = !{!23}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !21, file: !1, line: 3, baseType: !24, size: 320)
+!24 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 320, elements: !25)
+!25 = !{!26}
+!26 = !DISubrange(count: 10)
+!27 = !DILocation(line: 5, column: 56, scope: !17)
+!28 = !DILocation(line: 7, column: 10, scope: !17)
+!29 = !DILocation(line: 6, column: 59, scope: !17)
+!30 = !DILocation(line: 5, column: 3, scope: !17)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-match.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-match.ll
new file mode 100644
index 0000000000000..2163cb8062c34
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-match.ll
@@ -0,0 +1,103 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source:
+;   enum AA { VAL = 100 };
+;   typedef int (*func_t)(void);
+;   struct s2 { int a[10]; };
+;   int test() {
+;     return __builtin_preserve_type_info(*(func_t *)0, 2) +
+;            __builtin_preserve_type_info(*(struct s2 *)0, 2) +
+;            __builtin_preserve_type_info(*(enum AA *)0, 2);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes t1.c
+
+source_filename = "t1.c"
+target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
+target triple = "sbf"
+
+; Function Attrs: nounwind
+define dso_local i32 @test() #0 !dbg !18 {
+  %1 = call i32 @llvm.bpf.preserve.type.info(i32 0, i64 2), !dbg !20, !llvm.preserve.access.index !8
+  %2 = call i32 @llvm.bpf.preserve.type.info(i32 1, i64 2), !dbg !21, !llvm.preserve.access.index !22
+  %3 = add i32 %1, %2, !dbg !28
+  %4 = call i32 @llvm.bpf.preserve.type.info(i32 2, i64 2), !dbg !29, !llvm.preserve.access.index !3
+  %5 = add i32 %3, %4, !dbg !30
+  ret i32 %5, !dbg !31
+}
+
+; CHECK:             mov64 r{{[0-9]+}}, 1
+; CHECK:             mov64 r{{[0-9]+}}, 1
+; CHECK:             mov64 r{{[0-9]+}}, 1
+; CHECK:             exit
+
+; CHECK:             .long   16                              # BTF_KIND_TYPEDEF(id = 4)
+; CHECK:             .long   40                              # BTF_KIND_STRUCT(id = 7)
+; CHECK:             .long   65                              # BTF_KIND_ENUM(id = 10)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "func_t"                        # string offset=16
+; CHECK:             .byte   48                              # string offset=23
+; CHECK:             .ascii  "s2"                            # string offset=40
+; CHECK:             .ascii  "AA"                            # string offset=65
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   12
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.type.info(i32, i64) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!13, !14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git 3d974661fd15612259d37f603ddf21df7ee0e428)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t1.c", directory: "/tmp/tmp1", checksumkind: CSK_MD5, checksum: "53350e4a8003565f949c897f1fce8567")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "AA", file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "VAL", value: 100)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_typedef, name: "func_t", file: !1, line: 2, baseType: !9)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = !DISubroutineType(types: !11)
+!11 = !{!12}
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{i32 7, !"Dwarf Version", i32 5}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{i32 7, !"frame-pointer", i32 2}
+!17 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 3d974661fd15612259d37f603ddf21df7ee0e428)"}
+!18 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !10, scopeLine: 4, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !19)
+!19 = !{}
+!20 = !DILocation(line: 5, column: 10, scope: !18)
+!21 = !DILocation(line: 6, column: 10, scope: !18)
+!22 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s2", file: !1, line: 3, size: 320, elements: !23)
+!23 = !{!24}
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !22, file: !1, line: 3, baseType: !25, size: 320)
+!25 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 320, elements: !26)
+!26 = !{!27}
+!27 = !DISubrange(count: 10)
+!28 = !DILocation(line: 5, column: 56, scope: !18)
+!29 = !DILocation(line: 7, column: 10, scope: !18)
+!30 = !DILocation(line: 6, column: 59, scope: !18)
+!31 = !DILocation(line: 5, column: 3, scope: !18)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-1.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-1.ll
new file mode 100644
index 0000000000000..b3ed18a0158ea
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-1.ll
@@ -0,0 +1,101 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source:
+;   enum AA { VAL = 100 };
+;   typedef int (*func_t)(void);
+;   struct s2 { int a[10]; };
+;   int test() {
+;     return __builtin_preserve_type_info(*(func_t *)0, 1) +
+;            __builtin_preserve_type_info(*(struct s2 *)0, 1) +
+;            __builtin_preserve_type_info(*(enum AA *)0, 1);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes t1.c
+
+target triple = "sbf"
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !17 {
+entry:
+  %0 = tail call i32 @llvm.bpf.preserve.type.info(i32 0, i64 1), !dbg !19, !llvm.preserve.access.index !8
+  %1 = tail call i32 @llvm.bpf.preserve.type.info(i32 1, i64 1), !dbg !20, !llvm.preserve.access.index !21
+  %add = add i32 %1, %0, !dbg !27
+  %2 = tail call i32 @llvm.bpf.preserve.type.info(i32 2, i64 1), !dbg !28, !llvm.preserve.access.index !3
+  %add1 = add i32 %add, %2, !dbg !29
+  ret i32 %add1, !dbg !30
+}
+
+; CHECK:             mov64 r{{[0-9]+}}, 8
+; CHECK:             mov64 r{{[0-9]+}}, 40
+; CHECK:             mov64 r{{[0-9]+}}, 4
+; CHECK:             exit
+
+; CHECK:             .long   16                              # BTF_KIND_TYPEDEF(id = 4)
+; CHECK:             .long   49                              # BTF_KIND_STRUCT(id = 7)
+; CHECK:             .long   74                              # BTF_KIND_ENUM(id = 10)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "func_t"                        # string offset=16
+; CHECK:             .byte   48                              # string offset=23
+; CHECK:             .ascii  "s2"                            # string offset=49
+; CHECK:             .ascii  "AA"                            # string offset=74
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   9
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.type.info(i32, i64) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!13, !14, !15}
+!llvm.ident = !{!16}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t1.c", directory: "/tmp/home/yhs/tmp1")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "AA", file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "VAL", value: 100, isUnsigned: true)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_typedef, name: "func_t", file: !1, line: 2, baseType: !9)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = !DISubroutineType(types: !11)
+!11 = !{!12}
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{i32 7, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)"}
+!17 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !10, scopeLine: 4, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !18)
+!18 = !{}
+!19 = !DILocation(line: 5, column: 10, scope: !17)
+!20 = !DILocation(line: 6, column: 10, scope: !17)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s2", file: !1, line: 3, size: 320, elements: !22)
+!22 = !{!23}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !21, file: !1, line: 3, baseType: !24, size: 320)
+!24 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 320, elements: !25)
+!25 = !{!26}
+!26 = !DISubrange(count: 10)
+!27 = !DILocation(line: 5, column: 56, scope: !17)
+!28 = !DILocation(line: 7, column: 10, scope: !17)
+!29 = !DILocation(line: 6, column: 59, scope: !17)
+!30 = !DILocation(line: 5, column: 3, scope: !17)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-2.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-2.ll
new file mode 100644
index 0000000000000..256ca6af35b2d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-typeinfo-type-size-2.ll
@@ -0,0 +1,117 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source:
+;   enum AA { VAL = 100 };
+;   typedef int (*func_t)(void);
+;   struct s2 { int a[10]; };
+;   int test() {
+;     func_t f;
+;     struct s2 s;
+;     enum AA a;
+;     return __builtin_preserve_type_info(f, 1) +
+;            __builtin_preserve_type_info(s, 1) +
+;            __builtin_preserve_type_info(a, 1);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes t1.c
+
+target triple = "sbf"
+
+; Function Attrs: nounwind readnone
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !17 {
+entry:
+  call void @llvm.dbg.declare(metadata [10 x i32]* undef, metadata !20, metadata !DIExpression()), !dbg !28
+  call void @llvm.dbg.declare(metadata i32 ()** undef, metadata !19, metadata !DIExpression()), !dbg !29
+  call void @llvm.dbg.declare(metadata i32* undef, metadata !27, metadata !DIExpression()), !dbg !30
+  %0 = tail call i32 @llvm.bpf.preserve.type.info(i32 0, i64 1), !dbg !31, !llvm.preserve.access.index !8
+  %1 = tail call i32 @llvm.bpf.preserve.type.info(i32 1, i64 1), !dbg !32, !llvm.preserve.access.index !21
+  %add = add i32 %1, %0, !dbg !33
+  %2 = tail call i32 @llvm.bpf.preserve.type.info(i32 2, i64 1), !dbg !34, !llvm.preserve.access.index !3
+  %add1 = add i32 %add, %2, !dbg !35
+  ret i32 %add1, !dbg !36
+}
+
+; CHECK:             mov64 r{{[0-9]+}}, 8
+; CHECK:             mov64 r{{[0-9]+}}, 40
+; CHECK:             mov64 r{{[0-9]+}}, 4
+; CHECK:             exit
+
+; CHECK:             .long   16                              # BTF_KIND_TYPEDEF(id = 4)
+; CHECK:             .long   49                              # BTF_KIND_STRUCT(id = 7)
+; CHECK:             .long   74                              # BTF_KIND_ENUM(id = 10)
+
+; CHECK:             .ascii  ".text"                         # string offset=10
+; CHECK:             .ascii  "func_t"                        # string offset=16
+; CHECK:             .byte   48                              # string offset=23
+; CHECK:             .ascii  "s2"                            # string offset=49
+; CHECK:             .ascii  "AA"                            # string offset=74
+
+; CHECK:             .long   16                              # FieldReloc
+; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   9
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.type.info(i32, i64) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+attributes #2 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!13, !14, !15}
+!llvm.ident = !{!16}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !7, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "t1.c", directory: "/tmp/home/yhs/tmp1")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "AA", file: !1, line: 1, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6}
+!6 = !DIEnumerator(name: "VAL", value: 100, isUnsigned: true)
+!7 = !{!8}
+!8 = !DIDerivedType(tag: DW_TAG_typedef, name: "func_t", file: !1, line: 2, baseType: !9)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = !DISubroutineType(types: !11)
+!11 = !{!12}
+!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!13 = !{i32 7, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git d8b1394a0f4bbf57c254f69f8d3aa5381a89b5cd)"}
+!17 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !10, scopeLine: 4, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !18)
+!18 = !{!19, !20, !27}
+!19 = !DILocalVariable(name: "f", scope: !17, file: !1, line: 5, type: !8)
+!20 = !DILocalVariable(name: "s", scope: !17, file: !1, line: 6, type: !21)
+!21 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s2", file: !1, line: 3, size: 320, elements: !22)
+!22 = !{!23}
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !21, file: !1, line: 3, baseType: !24, size: 320)
+!24 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 320, elements: !25)
+!25 = !{!26}
+!26 = !DISubrange(count: 10)
+!27 = !DILocalVariable(name: "a", scope: !17, file: !1, line: 7, type: !3)
+!28 = !DILocation(line: 6, column: 13, scope: !17)
+!29 = !DILocation(line: 5, column: 10, scope: !17)
+!30 = !DILocation(line: 7, column: 11, scope: !17)
+!31 = !DILocation(line: 8, column: 10, scope: !17)
+!32 = !DILocation(line: 9, column: 10, scope: !17)
+!33 = !DILocation(line: 8, column: 45, scope: !17)
+!34 = !DILocation(line: 10, column: 10, scope: !17)
+!35 = !DILocation(line: 9, column: 45, scope: !17)
+!36 = !DILocation(line: 8, column: 3, scope: !17)
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-union.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-union.ll
new file mode 100644
index 0000000000000..d926508e5c10f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-union.ll
@@ -0,0 +1,81 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   union u { int a; int b; };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr);
+;   int test(union u *arg) { return get_value(_(&arg->b)); }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.u = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%union.u* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %union.u* %arg, metadata !17, metadata !DIExpression()), !dbg !18
+  %0 = tail call %union.u* @llvm.preserve.union.access.index.p0s_union.us.p0s_union.us(%union.u* %arg, i32 1), !dbg !19, !llvm.preserve.access.index !12
+  %1 = bitcast %union.u* %0 to i8*, !dbg !19
+  %call = tail call i32 @get_value(i8* %1) #4, !dbg !20
+  ret i32 %call, !dbg !21
+}
+; CHECK-LABEL: test
+; CHECK:       [[RELOC:.Ltmp[0-9]+]]
+; CHECK:       mov64 r2, 0
+; CHECK:       add64 r1, r2
+; CHECK:       call get_value
+; CHECK:       exit
+
+; CHECK:      .section        .BTF.ext,"",@progbits
+; CHECK:      .long   16                      # FieldReloc
+; CHECK-NEXT: .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT: .long   1
+; CHECK-NEXT: .long   [[RELOC]]
+; CHECK-NEXT: .long   2
+; CHECK-NEXT: .long   26
+; CHECK-NEXT: .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %union.u* @llvm.preserve.union.access.index.p0s_union.us.p0s_union.us(%union.u*, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 365789)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 9.0.0 (trunk 365789)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !8, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !16)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u", file: !1, line: 1, size: 32, elements: !13)
+!13 = !{!14, !15}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!16 = !{!17}
+!17 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 4, type: !11)
+!18 = !DILocation(line: 0, scope: !7)
+!19 = !DILocation(line: 4, column: 43, scope: !7)
+!20 = !DILocation(line: 4, column: 33, scope: !7)
+!21 = !DILocation(line: 4, column: 26, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/no-elf-ama-symbol.ll b/llvm/test/CodeGen/SBF/CORE/no-elf-ama-symbol.ll
new file mode 100644
index 0000000000000..e74a39c0bb4d0
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/no-elf-ama-symbol.ll
@@ -0,0 +1,66 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=obj -o - %t1 | llvm-readelf -s - | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -filetype=obj -addrsig -o - %t1 | llvm-readelf -s - | FileCheck -check-prefixes=CHECK %s
+;
+; Source Code:
+;   struct tt { int a; } __attribute__((preserve_access_index));
+;   int test(struct tt *arg) {
+;     return arg->a;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes t.c
+
+target triple = "sbf"
+
+%struct.tt = type { i32 }
+
+; Function Attrs: nounwind readonly
+define dso_local i32 @test(%struct.tt* readonly %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.tt* %arg, metadata !16, metadata !DIExpression()), !dbg !17
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.tts(%struct.tt* elementtype(%struct.tt) %arg, i32 0, i32 0), !dbg !18, !llvm.preserve.access.index !12
+  %1 = load i32, i32* %0, align 4, !dbg !18, !tbaa !19
+  ret i32 %1, !dbg !24
+}
+
+; CHECK-NOT: llvm.tt:0:0$0:0
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.tts(%struct.tt*, i32, i32) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 947f9692440836dcb8d88b74b69dd379d85974ce)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/bug")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 947f9692440836dcb8d88b74b69dd379d85974ce)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 2, type: !8, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !15)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "tt", file: !1, line: 1, size: 32, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!15 = !{!16}
+!16 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 2, type: !11)
+!17 = !DILocation(line: 0, scope: !7)
+!18 = !DILocation(line: 3, column: 15, scope: !7)
+!19 = !{!20, !21, i64 0}
+!20 = !{!"tt", !21, i64 0}
+!21 = !{!"int", !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 3, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll b/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll
new file mode 100644
index 0000000000000..602db2ce103dc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll
@@ -0,0 +1,158 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct data_t {
+;     int d1;
+;     int d2;
+;   };
+;   struct info_t {
+;     int pid;
+;     int flags;
+;   } __attribute__((preserve_access_index));
+;
+;   extern void output(void *);
+;   void test(struct info_t * args) {
+;     int is_mask2 = args->flags & 0x10000;
+;     struct data_t data = {};
+;
+;     data.d1 = is_mask2 ? 2 : args->pid;
+;     data.d2 = (is_mask2 || (args->flags & 0x8000)) ? 1 : 2;
+;     output(&data);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.info_t = type { i32, i32 }
+%struct.data_t = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local void @test(%struct.info_t* readonly %args) local_unnamed_addr #0 !dbg !12 {
+entry:
+  %data = alloca i64, align 8
+  %tmpcast = bitcast i64* %data to %struct.data_t*
+  call void @llvm.dbg.value(metadata %struct.info_t* %args, metadata !22, metadata !DIExpression()), !dbg !29
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.info_ts(%struct.info_t* elementtype(%struct.info_t) %args, i32 1, i32 1), !dbg !30, !llvm.preserve.access.index !16
+  %1 = load i32, i32* %0, align 4, !dbg !30, !tbaa !31
+  %and = and i32 %1, 65536, !dbg !36
+  call void @llvm.dbg.value(metadata i32 %and, metadata !23, metadata !DIExpression()), !dbg !29
+  %2 = bitcast i64* %data to i8*, !dbg !37
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %2) #5, !dbg !37
+  call void @llvm.dbg.declare(metadata %struct.data_t* %tmpcast, metadata !24, metadata !DIExpression()), !dbg !38
+  store i64 0, i64* %data, align 8, !dbg !38
+  %tobool = icmp eq i32 %and, 0, !dbg !39
+  br i1 %tobool, label %cond.false, label %lor.end.critedge, !dbg !39
+
+cond.false:                                       ; preds = %entry
+  %3 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.info_ts(%struct.info_t* elementtype(%struct.info_t) %args, i32 0, i32 0), !dbg !40, !llvm.preserve.access.index !16
+  %4 = load i32, i32* %3, align 4, !dbg !40, !tbaa !41
+  %d1 = bitcast i64* %data to i32*, !dbg !42
+  store i32 %4, i32* %d1, align 8, !dbg !43, !tbaa !44
+  %5 = load i32, i32* %0, align 4, !dbg !46, !tbaa !31
+  %and2 = and i32 %5, 32768, !dbg !47
+  %tobool3 = icmp eq i32 %and2, 0, !dbg !48
+  %phitmp = select i1 %tobool3, i32 2, i32 1, !dbg !48
+  br label %lor.end, !dbg !48
+
+lor.end.critedge:                                 ; preds = %entry
+  %d1.c = bitcast i64* %data to i32*, !dbg !42
+  store i32 2, i32* %d1.c, align 8, !dbg !43, !tbaa !44
+  br label %lor.end, !dbg !48
+
+lor.end:                                          ; preds = %lor.end.critedge, %cond.false
+  %6 = phi i32 [ %phitmp, %cond.false ], [ 1, %lor.end.critedge ]
+  %d2 = getelementptr inbounds %struct.data_t, %struct.data_t* %tmpcast, i64 0, i32 1, !dbg !49
+  store i32 %6, i32* %d2, align 4, !dbg !50, !tbaa !51
+  call void @output(i8* nonnull %2) #5, !dbg !52
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull %2) #5, !dbg !53
+  ret void, !dbg !53
+}
+
+; CHECK: ldxw r[[LOAD1:[0-9]+]], [r{{[0-9]+}} + 4]
+; CHECK: and64 r[[LOAD1]], 65536
+; CHECK: ldxw r[[LOAD2:[0-9]+]], [r{{[0-9]+}} + 4]
+; CHECK: and64 r[[LOAD2]], 32768
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.info_ts(%struct.info_t*, i32 immarg, i32 immarg) #3
+
+declare !dbg !4 dso_local void @output(i8*) local_unnamed_addr #4
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+attributes #2 = { argmemonly nounwind willreturn }
+attributes #3 = { nounwind readnone }
+attributes #4 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #5 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!8, !9, !10}
+!llvm.ident = !{!11}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5884aae58f56786475bbc0f13ad8bd35f7f1ce69)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{!4}
+!4 = !DISubprogram(name: "output", scope: !1, file: !1, line: 10, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!5 = !DISubroutineType(types: !6)
+!6 = !{null, !7}
+!7 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!8 = !{i32 7, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5884aae58f56786475bbc0f13ad8bd35f7f1ce69)"}
+!12 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 11, type: !13, scopeLine: 11, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !21)
+!13 = !DISubroutineType(types: !14)
+!14 = !{null, !15}
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "info_t", file: !1, line: 5, size: 64, elements: !17)
+!17 = !{!18, !20}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "pid", scope: !16, file: !1, line: 6, baseType: !19, size: 32)
+!19 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "flags", scope: !16, file: !1, line: 7, baseType: !19, size: 32, offset: 32)
+!21 = !{!22, !23, !24}
+!22 = !DILocalVariable(name: "args", arg: 1, scope: !12, file: !1, line: 11, type: !15)
+!23 = !DILocalVariable(name: "is_mask2", scope: !12, file: !1, line: 12, type: !19)
+!24 = !DILocalVariable(name: "data", scope: !12, file: !1, line: 13, type: !25)
+!25 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "data_t", file: !1, line: 1, size: 64, elements: !26)
+!26 = !{!27, !28}
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "d1", scope: !25, file: !1, line: 2, baseType: !19, size: 32)
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "d2", scope: !25, file: !1, line: 3, baseType: !19, size: 32, offset: 32)
+!29 = !DILocation(line: 0, scope: !12)
+!30 = !DILocation(line: 12, column: 24, scope: !12)
+!31 = !{!32, !33, i64 4}
+!32 = !{!"info_t", !33, i64 0, !33, i64 4}
+!33 = !{!"int", !34, i64 0}
+!34 = !{!"omnipotent char", !35, i64 0}
+!35 = !{!"Simple C/C++ TBAA"}
+!36 = !DILocation(line: 12, column: 30, scope: !12)
+!37 = !DILocation(line: 13, column: 3, scope: !12)
+!38 = !DILocation(line: 13, column: 17, scope: !12)
+!39 = !DILocation(line: 15, column: 13, scope: !12)
+!40 = !DILocation(line: 15, column: 34, scope: !12)
+!41 = !{!32, !33, i64 0}
+!42 = !DILocation(line: 15, column: 8, scope: !12)
+!43 = !DILocation(line: 15, column: 11, scope: !12)
+!44 = !{!45, !33, i64 0}
+!45 = !{!"data_t", !33, i64 0, !33, i64 4}
+!46 = !DILocation(line: 16, column: 33, scope: !12)
+!47 = !DILocation(line: 16, column: 39, scope: !12)
+!48 = !DILocation(line: 16, column: 23, scope: !12)
+!49 = !DILocation(line: 16, column: 8, scope: !12)
+!50 = !DILocation(line: 16, column: 11, scope: !12)
+!51 = !{!45, !33, i64 4}
+!52 = !DILocation(line: 17, column: 3, scope: !12)
+!53 = !DILocation(line: 18, column: 1, scope: !12)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-access-str.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-access-str.ll
new file mode 100644
index 0000000000000..3457b95be2c42
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-access-str.ll
@@ -0,0 +1,100 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   struct s { int a; int b; };
+;   struct t { int c; int d; };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr1, const void *addr2);
+;   int test(struct s *arg1, struct t *arg2) {
+;     return get_value(_(&arg1->b), _(&arg2->d));
+;   }
+; clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i32 }
+%struct.t = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.s* %arg1, %struct.t* %arg2) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg1, metadata !22, metadata !DIExpression()), !dbg !24
+  call void @llvm.dbg.value(metadata %struct.t* %arg2, metadata !23, metadata !DIExpression()), !dbg !24
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg1, i32 1, i32 1), !dbg !25, !llvm.preserve.access.index !12
+  %1 = bitcast i32* %0 to i8*, !dbg !25
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ts(%struct.t* elementtype(%struct.t) %arg2, i32 1, i32 1), !dbg !26, !llvm.preserve.access.index !17
+  %3 = bitcast i32* %2 to i8*, !dbg !26
+  %call = tail call i32 @get_value(i8* %1, i8* %3) #4, !dbg !27
+  ret i32 %call, !dbg !28
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK:             .ascii  ".text"                 # string offset=[[SEC_INDEX:[0-9]+]]
+; CHECK-NEXT:        .byte   0
+; CHECK:             .ascii  "0:1"                   # string offset=[[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:        .byte   0
+; CHECK:             .section        .BTF.ext,"",@progbits
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   [[SEC_INDEX]]           # Field reloc section string offset=[[SEC_INDEX]]
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   [[ACCESS_STR]]
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   [[ACCESS_STR]]
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i8*, i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ts(%struct.t*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !8, scopeLine: 5, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !21)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11, !16}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 64, elements: !13)
+!13 = !{!14, !15}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !12, file: !1, line: 1, baseType: !10, size: 32)
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !12, file: !1, line: 1, baseType: !10, size: 32, offset: 32)
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64)
+!17 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t", file: !1, line: 2, size: 64, elements: !18)
+!18 = !{!19, !20}
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !17, file: !1, line: 2, baseType: !10, size: 32)
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !17, file: !1, line: 2, baseType: !10, size: 32, offset: 32)
+!21 = !{!22, !23}
+!22 = !DILocalVariable(name: "arg1", arg: 1, scope: !7, file: !1, line: 5, type: !11)
+!23 = !DILocalVariable(name: "arg2", arg: 2, scope: !7, file: !1, line: 5, type: !16)
+!24 = !DILocation(line: 0, scope: !7)
+!25 = !DILocation(line: 6, column: 20, scope: !7)
+!26 = !DILocation(line: 6, column: 33, scope: !7)
+!27 = !DILocation(line: 6, column: 10, scope: !7)
+!28 = !DILocation(line: 6, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-basic.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-basic.ll
new file mode 100644
index 0000000000000..71d9e2124090f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-basic.ll
@@ -0,0 +1,188 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;    struct sk_buff {
+;      int i;
+;      struct net_device *dev;
+;    };
+;    #define _(x) (__builtin_preserve_access_index(x))
+;    static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr)
+;        = (void *) 4;
+;
+;    int bpf_prog(struct sk_buff *ctx) {
+;      struct net_device *dev = 0;
+;      bpf_probe_read(&dev, sizeof(dev), _(&ctx->dev));
+;      return dev != 0;
+;    }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.sk_buff = type { i32, %struct.net_device* }
+%struct.net_device = type opaque
+
+; Function Attrs: nounwind
+define dso_local i32 @bpf_prog(%struct.sk_buff*) local_unnamed_addr #0 !dbg !15 {
+  %2 = alloca %struct.net_device*, align 8
+  call void @llvm.dbg.value(metadata %struct.sk_buff* %0, metadata !26, metadata !DIExpression()), !dbg !28
+  %3 = bitcast %struct.net_device** %2 to i8*, !dbg !29
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %3) #4, !dbg !29
+  call void @llvm.dbg.value(metadata %struct.net_device* null, metadata !27, metadata !DIExpression()), !dbg !28
+  store %struct.net_device* null, %struct.net_device** %2, align 8, !dbg !30, !tbaa !31
+  %4 = tail call %struct.net_device** @llvm.preserve.struct.access.index.p0p0s_struct.net_devices.p0s_struct.sk_buffs(%struct.sk_buff* elementtype(%struct.sk_buff) %0, i32 1, i32 1), !dbg !35, !llvm.preserve.access.index !19
+  %5 = bitcast %struct.net_device** %4 to i8*, !dbg !35
+  %6 = call i32 inttoptr (i64 4 to i32 (i8*, i32, i8*)*)(i8* nonnull %3, i32 8, i8* %5) #4, !dbg !36
+  %7 = load %struct.net_device*, %struct.net_device** %2, align 8, !dbg !37, !tbaa !31
+  call void @llvm.dbg.value(metadata %struct.net_device* %7, metadata !27, metadata !DIExpression()), !dbg !28
+  %8 = icmp ne %struct.net_device* %7, null, !dbg !38
+  %9 = zext i1 %8 to i32, !dbg !38
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull %3) #4, !dbg !39
+  ret i32 %9, !dbg !40
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   120
+; CHECK-NEXT:        .long   120
+; CHECK-NEXT:        .long   90
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   16
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   64                      # 0x40
+; CHECK-NEXT:        .long   15                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 4)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   19                      # BTF_KIND_FWD(id = 5)
+; CHECK-NEXT:        .long   117440512               # 0x7000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 6)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   30
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   34                      # BTF_KIND_FUNC(id = 7)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "sk_buff"               # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   105                     # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev"                   # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "net_device"            # string offset=19
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ctx"                   # string offset=30
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "bpf_prog"              # string offset=34
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=43
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/llvm/test.c" # string offset=49
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "0:1"                   # string offset=86
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   124
+; CHECK-NEXT:        .long   144
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   8                       # FuncInfo
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   86
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare %struct.net_device** @llvm.preserve.struct.access.index.p0p0s_struct.net_devices.p0s_struct.sk_buffs(%struct.sk_buff*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIGlobalVariableExpression(var: !5, expr: !DIExpression())
+!5 = distinct !DIGlobalVariable(name: "bpf_probe_read", scope: !0, file: !1, line: 6, type: !6, isLocal: true, isDefinition: true)
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10, !9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)"}
+!15 = distinct !DISubprogram(name: "bpf_prog", scope: !1, file: !1, line: 9, type: !16, scopeLine: 9, flags: DIFlagPrototyped, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !25)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "sk_buff", file: !1, line: 1, size: 128, elements: !20)
+!20 = !{!21, !22}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !19, file: !1, line: 2, baseType: !9, size: 32)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "dev", scope: !19, file: !1, line: 3, baseType: !23, size: 64, offset: 64)
+!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !24, size: 64)
+!24 = !DICompositeType(tag: DW_TAG_structure_type, name: "net_device", file: !1, line: 3, flags: DIFlagFwdDecl)
+!25 = !{!26, !27}
+!26 = !DILocalVariable(name: "ctx", arg: 1, scope: !15, file: !1, line: 9, type: !18)
+!27 = !DILocalVariable(name: "dev", scope: !15, file: !1, line: 10, type: !23)
+!28 = !DILocation(line: 0, scope: !15)
+!29 = !DILocation(line: 10, column: 3, scope: !15)
+!30 = !DILocation(line: 10, column: 22, scope: !15)
+!31 = !{!32, !32, i64 0}
+!32 = !{!"any pointer", !33, i64 0}
+!33 = !{!"omnipotent char", !34, i64 0}
+!34 = !{!"Simple C/C++ TBAA"}
+!35 = !DILocation(line: 11, column: 37, scope: !15)
+!36 = !DILocation(line: 11, column: 3, scope: !15)
+!37 = !DILocation(line: 12, column: 10, scope: !15)
+!38 = !DILocation(line: 12, column: 14, scope: !15)
+!39 = !DILocation(line: 13, column: 1, scope: !15)
+!40 = !DILocation(line: 12, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-1.ll
new file mode 100644
index 0000000000000..c446ae45ee6ed
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-1.ll
@@ -0,0 +1,129 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct v1 {int a; int b;};
+;   typedef struct v1 __v1;
+;   typedef __v1 arr[4];
+;   struct v3 { char c; int d[100]; };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_arr(x) ((arr *)(x))
+;   int get_value(const int *arg);
+;   int test(struct v3 *arg) {
+;     return get_value(_(&cast_to_arr(&arg->d[0])[0][2].b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i8, [100 x i32] }
+%struct.v1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !22 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !32, metadata !DIExpression()), !dbg !33
+  %0 = tail call [100 x i32]* @llvm.preserve.struct.access.index.p0a100i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 1, i32 1), !dbg !34, !llvm.preserve.access.index !26
+  %1 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a100i32([100 x i32]* elementtype([100 x i32]) %0, i32 1, i32 0), !dbg !34, !llvm.preserve.access.index !15
+  %2 = bitcast i32* %1 to [4 x %struct.v1]*, !dbg !34
+  %3 = tail call [4 x %struct.v1]* @llvm.preserve.array.access.index.p0a4s_struct.v1s.p0a4s_struct.v1s([4 x %struct.v1]* elementtype([4 x %struct.v1]) %2, i32 0, i32 0), !dbg !34, !llvm.preserve.access.index !4
+  %4 = tail call %struct.v1* @llvm.preserve.array.access.index.p0s_struct.v1s.p0a4s_struct.v1s([4 x %struct.v1]* elementtype([4 x %struct.v1]) %3, i32 1, i32 2), !dbg !34, !llvm.preserve.access.index !5
+  %5 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1* elementtype(%struct.v1) %4, i32 1, i32 1), !dbg !34, !llvm.preserve.access.index !8
+  %call = tail call i32 @get_value(i32* %5) #4, !dbg !35
+  ret i32 %call, !dbg !36
+}
+
+; CHECK:              mov64 r2, 4
+; CHECK:              add64 r1, r2
+; CHECK:              mov64 r2, 20
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   1                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK:              .long   100                     # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+
+; CHECK:              .ascii  "v3"                    # string offset=1
+; CHECK:              .ascii  ".text"                 # string offset=46
+; CHECK:              .ascii  "0:1:0"                 # string offset=52
+; CHECK:              .ascii  "2:1"                   # string offset=107
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   46                      # Field reloc section string offset=46
+; CHECK-NEXT:         .long   2
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   52
+; CHECK-NEXT:         .long   0
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID2]]
+; CHECK-NEXT:         .long   107
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare [100 x i32]* @llvm.preserve.struct.access.index.p0a100i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a100i32([100 x i32]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x %struct.v1]* @llvm.preserve.array.access.index.p0a4s_struct.v1s.p0a4s_struct.v1s([4 x %struct.v1]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare %struct.v1* @llvm.preserve.array.access.index.p0s_struct.v1s.p0a4s_struct.v1s([4 x %struct.v1]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!18, !19, !20}
+!llvm.ident = !{!21}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4, !15, !5}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "arr", file: !1, line: 3, baseType: !6)
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 256, elements: !13)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v1", file: !1, line: 2, baseType: !8)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v1", file: !1, line: 1, size: 64, elements: !9)
+!9 = !{!10, !12}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !8, file: !1, line: 1, baseType: !11, size: 32)
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !8, file: !1, line: 1, baseType: !11, size: 32, offset: 32)
+!13 = !{!14}
+!14 = !DISubrange(count: 4)
+!15 = !DICompositeType(tag: DW_TAG_array_type, baseType: !11, size: 3200, elements: !16)
+!16 = !{!17}
+!17 = !DISubrange(count: 100)
+!18 = !{i32 2, !"Dwarf Version", i32 4}
+!19 = !{i32 2, !"Debug Info Version", i32 3}
+!20 = !{i32 1, !"wchar_size", i32 4}
+!21 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!22 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !23, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !31)
+!23 = !DISubroutineType(types: !24)
+!24 = !{!11, !25}
+!25 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !26, size: 64)
+!26 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 4, size: 3232, elements: !27)
+!27 = !{!28, !30}
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !26, file: !1, line: 4, baseType: !29, size: 8)
+!29 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !26, file: !1, line: 4, baseType: !15, size: 3200, offset: 32)
+!31 = !{!32}
+!32 = !DILocalVariable(name: "arg", arg: 1, scope: !22, file: !1, line: 8, type: !25)
+!33 = !DILocation(line: 0, scope: !22)
+!34 = !DILocation(line: 9, column: 20, scope: !22)
+!35 = !DILocation(line: 9, column: 10, scope: !22)
+!36 = !DILocation(line: 9, column: 3, scope: !22)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-2.ll
new file mode 100644
index 0000000000000..e2a407f22c4d5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-array-2.ll
@@ -0,0 +1,136 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct v1 {int a; int b;};
+;   typedef struct v1 __v1;
+;   typedef __v1 arr[4][4];
+;   struct v3 { char c; int d[100]; };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_arr(x) ((arr *)(x))
+;   int get_value(const int *arg);
+;   int test(struct v3 *arg) {
+;     return get_value(_(&cast_to_arr(&arg->d[0])[0][2][3].b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i8, [100 x i32] }
+%struct.v1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !24 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !34, metadata !DIExpression()), !dbg !35
+  %0 = tail call [100 x i32]* @llvm.preserve.struct.access.index.p0a100i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 1, i32 1), !dbg !36, !llvm.preserve.access.index !28
+  %1 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a100i32([100 x i32]* elementtype([100 x i32]) %0, i32 1, i32 0), !dbg !36, !llvm.preserve.access.index !15
+  %2 = bitcast i32* %1 to [4 x [4 x %struct.v1]]*, !dbg !36
+  %3 = tail call [4 x [4 x %struct.v1]]* @llvm.preserve.array.access.index.p0a4a4s_struct.v1s.p0a4a4s_struct.v1s([4 x [4 x %struct.v1]]* elementtype([4 x [4 x %struct.v1]]) %2, i32 0, i32 0), !dbg !36, !llvm.preserve.access.index !4
+  %4 = tail call [4 x %struct.v1]* @llvm.preserve.array.access.index.p0a4s_struct.v1s.p0a4a4s_struct.v1s([4 x [4 x %struct.v1]]* elementtype([4 x [4 x %struct.v1]]) %3, i32 1, i32 2), !dbg !36, !llvm.preserve.access.index !5
+  %5 = tail call %struct.v1* @llvm.preserve.array.access.index.p0s_struct.v1s.p0a4s_struct.v1s([4 x %struct.v1]* elementtype([4 x %struct.v1]) %4, i32 1, i32 3), !dbg !36, !llvm.preserve.access.index !18
+  %6 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1* elementtype(%struct.v1) %5, i32 1, i32 1), !dbg !36, !llvm.preserve.access.index !8
+  %call = tail call i32 @get_value(i32* %6) #4, !dbg !37
+  ret i32 %call, !dbg !38
+}
+
+; CHECK:              mov64 r2, 4
+; CHECK:              add64 r1, r2
+; CHECK:              mov64 r2, 92
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   1                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK:              .long   100                     # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+
+; CHECK:              .ascii  "v3"                    # string offset=1
+; CHECK:              .ascii  ".text"                 # string offset=46
+; CHECK:              .ascii  "0:1:0"                 # string offset=52
+; CHECK:              .ascii  "v1"                    # string offset=100
+; CHECK:              .ascii  "11:1"                  # string offset=107
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   46                      # Field reloc section string offset=46
+; CHECK-NEXT:         .long   2
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   52
+; CHECK-NEXT:         .long   0
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID2]]
+; CHECK-NEXT:         .long   107
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare [100 x i32]* @llvm.preserve.struct.access.index.p0a100i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a100i32([100 x i32]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x [4 x %struct.v1]]* @llvm.preserve.array.access.index.p0a4a4s_struct.v1s.p0a4a4s_struct.v1s([4 x [4 x %struct.v1]]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x %struct.v1]* @llvm.preserve.array.access.index.p0a4s_struct.v1s.p0a4a4s_struct.v1s([4 x [4 x %struct.v1]]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare %struct.v1* @llvm.preserve.array.access.index.p0s_struct.v1s.p0a4s_struct.v1s([4 x %struct.v1]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!20, !21, !22}
+!llvm.ident = !{!23}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4, !15, !5, !18}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "arr", file: !1, line: 3, baseType: !6)
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 1024, elements: !13)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v1", file: !1, line: 2, baseType: !8)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v1", file: !1, line: 1, size: 64, elements: !9)
+!9 = !{!10, !12}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !8, file: !1, line: 1, baseType: !11, size: 32)
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !8, file: !1, line: 1, baseType: !11, size: 32, offset: 32)
+!13 = !{!14, !14}
+!14 = !DISubrange(count: 4)
+!15 = !DICompositeType(tag: DW_TAG_array_type, baseType: !11, size: 3200, elements: !16)
+!16 = !{!17}
+!17 = !DISubrange(count: 100)
+!18 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 256, elements: !19)
+!19 = !{!14}
+!20 = !{i32 2, !"Dwarf Version", i32 4}
+!21 = !{i32 2, !"Debug Info Version", i32 3}
+!22 = !{i32 1, !"wchar_size", i32 4}
+!23 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!24 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !25, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !33)
+!25 = !DISubroutineType(types: !26)
+!26 = !{!11, !27}
+!27 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !28, size: 64)
+!28 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 4, size: 3232, elements: !29)
+!29 = !{!30, !32}
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !28, file: !1, line: 4, baseType: !31, size: 8)
+!31 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!32 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !28, file: !1, line: 4, baseType: !15, size: 3200, offset: 32)
+!33 = !{!34}
+!34 = !DILocalVariable(name: "arg", arg: 1, scope: !24, file: !1, line: 8, type: !27)
+!35 = !DILocation(line: 0, scope: !24)
+!36 = !DILocation(line: 9, column: 20, scope: !24)
+!37 = !DILocation(line: 9, column: 10, scope: !24)
+!38 = !DILocation(line: 9, column: 3, scope: !24)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-1.ll
new file mode 100644
index 0000000000000..6f8dbd215dfd2
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-1.ll
@@ -0,0 +1,117 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct v1 { int a; int b; };
+;   struct v2 { int c; int d; };
+;   struct v3 { char c; struct v2 d; };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_v1(x) ((struct v1 *)(x))
+;   int get_value(const int *arg);
+;   int test(struct v3 *arg) {
+;     return get_value(_(&cast_to_v1(&arg->d)->b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i8, %struct.v2 }
+%struct.v2 = type { i32, i32 }
+%struct.v1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !14 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !28, metadata !DIExpression()), !dbg !29
+  %0 = tail call %struct.v2* @llvm.preserve.struct.access.index.p0s_struct.v2s.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 1, i32 1), !dbg !30, !llvm.preserve.access.index !18
+  %1 = bitcast %struct.v2* %0 to %struct.v1*, !dbg !30
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1* elementtype(%struct.v1) %1, i32 1, i32 1), !dbg !30, !llvm.preserve.access.index !5
+  %call = tail call i32 @get_value(i32* %2) #4, !dbg !31
+  ret i32 %call, !dbg !32
+}
+
+; CHECK:              mov64 r2, 4
+; CHECK:              add64 r1, r2
+; CHECK:              mov64 r2, 4
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = [[V3_TID:[0-9]+]])
+; CHECK:             .long   81                      # BTF_KIND_STRUCT(id = [[V1_TID:[0-9]+]])
+
+; CHECK:             .ascii  "v3"                    # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK:             .ascii  ".text"                 # string offset=[[SEC_STR:[0-9]+]]
+; CHECK-NEXT:        .byte   0
+; CHECK:             .ascii  "0:1"                   # string offset=[[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:        .byte   0
+; CHECK:             .ascii  "v1"                    # string offset=81
+; CHECK-NEXT:        .byte   0
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   [[SEC_STR]]             # Field reloc section string offset=[[SEC_STR]]
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[V3_TID]]
+; CHECK-NEXT:        .long   [[ACCESS_STR]]
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[V1_TID]]
+; CHECK-NEXT:        .long   [[ACCESS_STR]]
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.v2* @llvm.preserve.struct.access.index.p0s_struct.v2s.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v1", file: !1, line: 1, size: 64, elements: !6)
+!6 = !{!7, !9}
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !5, file: !1, line: 1, baseType: !8, size: 32)
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !5, file: !1, line: 1, baseType: !8, size: 32, offset: 32)
+!10 = !{i32 2, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!14 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 7, type: !15, scopeLine: 7, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
+!15 = !DISubroutineType(types: !16)
+!16 = !{!8, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !18, size: 64)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 3, size: 96, elements: !19)
+!19 = !{!20, !22}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !18, file: !1, line: 3, baseType: !21, size: 8)
+!21 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !18, file: !1, line: 3, baseType: !23, size: 64, offset: 32)
+!23 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v2", file: !1, line: 2, size: 64, elements: !24)
+!24 = !{!25, !26}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !23, file: !1, line: 2, baseType: !8, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !23, file: !1, line: 2, baseType: !8, size: 32, offset: 32)
+!27 = !{!28}
+!28 = !DILocalVariable(name: "arg", arg: 1, scope: !14, file: !1, line: 7, type: !17)
+!29 = !DILocation(line: 0, scope: !14)
+!30 = !DILocation(line: 8, column: 20, scope: !14)
+!31 = !DILocation(line: 8, column: 10, scope: !14)
+!32 = !DILocation(line: 8, column: 3, scope: !14)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-2.ll
new file mode 100644
index 0000000000000..68d7a65eb0568
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-2.ll
@@ -0,0 +1,122 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct v1 { int a; int b; };
+;   typedef struct v1 __v1;
+;   struct v2 { int c; int d; };
+;   typedef struct v2 __v2;
+;   struct v3 { char c; volatile const __v2 d; };
+;   typedef struct v3 __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_v1(x) ((__v1 *)(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&cast_to_v1(&arg->d)->b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i8, %struct.v2 }
+%struct.v2 = type { i32, i32 }
+%struct.v1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !15 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !33, metadata !DIExpression()), !dbg !34
+  %0 = tail call %struct.v2* @llvm.preserve.struct.access.index.p0s_struct.v2s.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 1, i32 1), !dbg !35, !llvm.preserve.access.index !20
+  %1 = bitcast %struct.v2* %0 to %struct.v1*, !dbg !35
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1* elementtype(%struct.v1) %1, i32 1, i32 1), !dbg !35, !llvm.preserve.access.index !6
+  %call = tail call i32 @get_value(i32* %2) #4, !dbg !36
+  ret i32 %call, !dbg !37
+}
+
+; CHECK:             mov64 r2, 4
+; CHECK:             add64 r1, r2
+; CHECK:             mov64 r2, 4
+; CHECK:             add64 r1, r2
+; CHECK:             call get_value
+
+; CHECK:             .long   6                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK:             .long   91                      # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+
+; CHECK:             .ascii  "v3"                    # string offset=6
+; CHECK:             .ascii  ".text"                 # string offset=39
+; CHECK:             .ascii  "0:1"                   # string offset=45
+; CHECK:             .ascii  "v1"                    # string offset=91
+
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   39                      # Field reloc section string offset=39
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID1]]
+; CHECK-NEXT:        .long   45
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID2]]
+; CHECK-NEXT:        .long   45
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.v2* @llvm.preserve.struct.access.index.p0s_struct.v2s.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v1", file: !1, line: 2, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v1", file: !1, line: 1, size: 64, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 1, baseType: !9, size: 32, offset: 32)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!15 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 10, type: !16, scopeLine: 10, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !32)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 6, baseType: !20)
+!20 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 5, size: 96, elements: !21)
+!21 = !{!22, !24}
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !20, file: !1, line: 5, baseType: !23, size: 8)
+!23 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !20, file: !1, line: 5, baseType: !25, size: 64, offset: 32)
+!25 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !26)
+!26 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !27)
+!27 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v2", file: !1, line: 4, baseType: !28)
+!28 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v2", file: !1, line: 3, size: 64, elements: !29)
+!29 = !{!30, !31}
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !28, file: !1, line: 3, baseType: !9, size: 32)
+!31 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !28, file: !1, line: 3, baseType: !9, size: 32, offset: 32)
+!32 = !{!33}
+!33 = !DILocalVariable(name: "arg", arg: 1, scope: !15, file: !1, line: 10, type: !18)
+!34 = !DILocation(line: 0, scope: !15)
+!35 = !DILocation(line: 11, column: 20, scope: !15)
+!36 = !DILocation(line: 11, column: 10, scope: !15)
+!37 = !DILocation(line: 11, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-3.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-3.ll
new file mode 100644
index 0000000000000..907700d352b8f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-struct-3.ll
@@ -0,0 +1,121 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct v1 { int a; int b; };
+;   typedef struct v1 __v1;
+;   typedef int __int;
+;   struct v3 { char c; __int d[40]; };
+;   typedef struct v3 __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_v1(x) ((__v1 *)(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&cast_to_v1(&arg->d[4])->b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i8, [40 x i32] }
+%struct.v1 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !19 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !30, metadata !DIExpression()), !dbg !31
+  %0 = tail call [40 x i32]* @llvm.preserve.struct.access.index.p0a40i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 1, i32 1), !dbg !32, !llvm.preserve.access.index !24
+  %1 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a40i32([40 x i32]* elementtype([40 x i32]) %0, i32 1, i32 4), !dbg !32, !llvm.preserve.access.index !11
+  %2 = bitcast i32* %1 to %struct.v1*, !dbg !32
+  %3 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1* elementtype(%struct.v1) %2, i32 1, i32 1), !dbg !32, !llvm.preserve.access.index !6
+  %call = tail call i32 @get_value(i32* %3) #4, !dbg !33
+  ret i32 %call, !dbg !34
+}
+
+; CHECK:             mov64 r2, 20
+; CHECK:             add64 r1, r2
+; CHECK:             mov64 r2, 4
+; CHECK:             add64 r1, r2
+; CHECK:             call get_value
+
+; CHECK:             .long   6                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK:             .long   111                     # BTF_KIND_STRUCT(id = [[TID2:[0-9]+]])
+
+; CHECK:             .ascii  "v3"                    # string offset=6
+; CHECK:             .ascii  ".text"                 # string offset=57
+; CHECK:             .ascii  "0:1:4"                 # string offset=63
+; CHECK:             .ascii  "v1"                    # string offset=111
+; CHECK:             .ascii  "0:1"                   # string offset=118
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   57                      # Field reloc section string offset=57
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID1]]
+; CHECK-NEXT:        .long   63
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID2]]
+; CHECK-NEXT:        .long   118
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare [40 x i32]* @llvm.preserve.struct.access.index.p0a40i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a40i32([40 x i32]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v1s(%struct.v1*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!15, !16, !17}
+!llvm.ident = !{!18}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4, !11}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v1", file: !1, line: 2, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v1", file: !1, line: 1, size: 64, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 1, baseType: !9, size: 32, offset: 32)
+!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 1280, elements: !13)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 3, baseType: !9)
+!13 = !{!14}
+!14 = !DISubrange(count: 40)
+!15 = !{i32 2, !"Dwarf Version", i32 4}
+!16 = !{i32 2, !"Debug Info Version", i32 3}
+!17 = !{i32 1, !"wchar_size", i32 4}
+!18 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!19 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 9, type: !20, scopeLine: 9, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !29)
+!20 = !DISubroutineType(types: !21)
+!21 = !{!9, !22}
+!22 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !23, size: 64)
+!23 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 5, baseType: !24)
+!24 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 4, size: 1312, elements: !25)
+!25 = !{!26, !28}
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !24, file: !1, line: 4, baseType: !27, size: 8)
+!27 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !24, file: !1, line: 4, baseType: !11, size: 1280, offset: 32)
+!29 = !{!30}
+!30 = !DILocalVariable(name: "arg", arg: 1, scope: !19, file: !1, line: 9, type: !22)
+!31 = !DILocation(line: 0, scope: !19)
+!32 = !DILocation(line: 10, column: 20, scope: !19)
+!33 = !DILocation(line: 10, column: 10, scope: !19)
+!34 = !DILocation(line: 10, column: 3, scope: !19)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-1.ll
new file mode 100644
index 0000000000000..e6f6a8c3b9039
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-1.ll
@@ -0,0 +1,122 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   union v1 { int a; int b; };
+;   typedef union v1 __v1;
+;   union v2 { int c; int d; };
+;   typedef union v2 __v2;
+;   union v3 { char c; volatile const __v2 d; };
+;   typedef union v3 __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_v1(x) ((__v1 *)(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&cast_to_v1(&arg->d)->b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.v3 = type { %union.v2 }
+%union.v2 = type { i32 }
+%union.v1 = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%union.v3* %arg) local_unnamed_addr #0 !dbg !15 {
+entry:
+  call void @llvm.dbg.value(metadata %union.v3* %arg, metadata !33, metadata !DIExpression()), !dbg !34
+  %0 = tail call %union.v3* @llvm.preserve.union.access.index.p0s_union.v3s.p0s_union.v3s(%union.v3* %arg, i32 1), !dbg !35, !llvm.preserve.access.index !20
+  %1 = bitcast %union.v3* %0 to %union.v1*, !dbg !35
+  %2 = tail call %union.v1* @llvm.preserve.union.access.index.p0s_union.v1s.p0s_union.v1s(%union.v1* %1, i32 1), !dbg !35, !llvm.preserve.access.index !6
+  %b = getelementptr inbounds %union.v1, %union.v1* %2, i64 0, i32 0, !dbg !35
+  %call = tail call i32 @get_value(i32* %b) #4, !dbg !36
+  ret i32 %call, !dbg !37
+}
+
+; CHECK:             mov64 r2, 0
+; CHECK:             add64 r1, r2
+; CHECK:             mov64 r2, 0
+; CHECK:             add64 r1, r2
+; CHECK:             call get_value
+
+; CHECK:             .long   6                       # BTF_KIND_UNION(id = [[TID1:[0-9]+]])
+; CHECK:             .long   91                      # BTF_KIND_UNION(id = [[TID2:[0-9]+]])
+
+; CHECK:             .ascii  "v3"                    # string offset=6
+; CHECK:             .ascii  ".text"                 # string offset=39
+; CHECK:             .ascii  "0:1"                   # string offset=45
+; CHECK:             .ascii  "v1"                    # string offset=91
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   39                      # Field reloc section string offset=39
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID1]]
+; CHECK-NEXT:        .long   45
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID2]]
+; CHECK-NEXT:        .long   45
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %union.v3* @llvm.preserve.union.access.index.p0s_union.v3s.p0s_union.v3s(%union.v3*, i32) #2
+
+; Function Attrs: nounwind readnone
+declare %union.v1* @llvm.preserve.union.access.index.p0s_union.v1s.p0s_union.v1s(%union.v1*, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v1", file: !1, line: 2, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "v1", file: !1, line: 1, size: 32, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!15 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 10, type: !16, scopeLine: 10, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !32)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 6, baseType: !20)
+!20 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "v3", file: !1, line: 5, size: 32, elements: !21)
+!21 = !{!22, !24}
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !20, file: !1, line: 5, baseType: !23, size: 8)
+!23 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !20, file: !1, line: 5, baseType: !25, size: 32)
+!25 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !26)
+!26 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !27)
+!27 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v2", file: !1, line: 4, baseType: !28)
+!28 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "v2", file: !1, line: 3, size: 32, elements: !29)
+!29 = !{!30, !31}
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !28, file: !1, line: 3, baseType: !9, size: 32)
+!31 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !28, file: !1, line: 3, baseType: !9, size: 32)
+!32 = !{!33}
+!33 = !DILocalVariable(name: "arg", arg: 1, scope: !15, file: !1, line: 10, type: !18)
+!34 = !DILocation(line: 0, scope: !15)
+!35 = !DILocation(line: 11, column: 20, scope: !15)
+!36 = !DILocation(line: 11, column: 10, scope: !15)
+!37 = !DILocation(line: 11, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-2.ll
new file mode 100644
index 0000000000000..d64dbd60e2497
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-cast-union-2.ll
@@ -0,0 +1,123 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   union v1 { int a; int b; };
+;   typedef union v1 __v1;
+;   typedef int __int;
+;   union v3 { char c; __int d[40]; };
+;   typedef union v3 __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   #define cast_to_v1(x) ((__v1 *)(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&cast_to_v1(&arg->d[4])->b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.v3 = type { [40 x i32] }
+%union.v1 = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%union.v3* %arg) local_unnamed_addr #0 !dbg !19 {
+entry:
+  call void @llvm.dbg.value(metadata %union.v3* %arg, metadata !30, metadata !DIExpression()), !dbg !31
+  %0 = tail call %union.v3* @llvm.preserve.union.access.index.p0s_union.v3s.p0s_union.v3s(%union.v3* %arg, i32 1), !dbg !32, !llvm.preserve.access.index !24
+  %d = getelementptr inbounds %union.v3, %union.v3* %0, i64 0, i32 0, !dbg !32
+  %1 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a40i32([40 x i32]* elementtype([40 x i32]) %d, i32 1, i32 4), !dbg !32, !llvm.preserve.access.index !11
+  %2 = bitcast i32* %1 to %union.v1*, !dbg !32
+  %3 = tail call %union.v1* @llvm.preserve.union.access.index.p0s_union.v1s.p0s_union.v1s(%union.v1* %2, i32 1), !dbg !32, !llvm.preserve.access.index !6
+  %b = getelementptr inbounds %union.v1, %union.v1* %3, i64 0, i32 0, !dbg !32
+  %call = tail call i32 @get_value(i32* %b) #4, !dbg !33
+  ret i32 %call, !dbg !34
+}
+
+; CHECK:             mov64 r2, 16
+; CHECK:             add64 r1, r2
+; CHECK:             mov64 r2, 0
+; CHECK:             add64 r1, r2
+; CHECK:             call get_value
+
+; CHECK:             .long   6                       # BTF_KIND_UNION(id = [[TID1:[0-9]+]])
+; CHECK:             .long   111                     # BTF_KIND_UNION(id = [[TID2:[0-9]+]])
+
+; CHECK:             .ascii  "v3"                    # string offset=6
+; CHECK:             .ascii  ".text"                 # string offset=57
+; CHECK:             .ascii  "0:1:4"                 # string offset=63
+; CHECK:             .ascii  "v1"                    # string offset=111
+; CHECK:             .ascii  "0:1"                   # string offset=118
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   57                      # Field reloc section string offset=57
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID1]]
+; CHECK-NEXT:        .long   63
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID2]]
+; CHECK-NEXT:        .long   118
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %union.v3* @llvm.preserve.union.access.index.p0s_union.v3s.p0s_union.v3s(%union.v3*, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a40i32([40 x i32]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare %union.v1* @llvm.preserve.union.access.index.p0s_union.v1s.p0s_union.v1s(%union.v1*, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!15, !16, !17}
+!llvm.ident = !{!18}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4, !11}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v1", file: !1, line: 2, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "v1", file: !1, line: 1, size: 32, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 1280, elements: !13)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 3, baseType: !9)
+!13 = !{!14}
+!14 = !DISubrange(count: 40)
+!15 = !{i32 2, !"Dwarf Version", i32 4}
+!16 = !{i32 2, !"Debug Info Version", i32 3}
+!17 = !{i32 1, !"wchar_size", i32 4}
+!18 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!19 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 9, type: !20, scopeLine: 9, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !29)
+!20 = !DISubroutineType(types: !21)
+!21 = !{!9, !22}
+!22 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !23, size: 64)
+!23 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 5, baseType: !24)
+!24 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "v3", file: !1, line: 4, size: 1280, elements: !25)
+!25 = !{!26, !28}
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !24, file: !1, line: 4, baseType: !27, size: 8)
+!27 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !24, file: !1, line: 4, baseType: !11, size: 1280)
+!29 = !{!30}
+!30 = !DILocalVariable(name: "arg", arg: 1, scope: !19, file: !1, line: 9, type: !22)
+!31 = !DILocation(line: 0, scope: !19)
+!32 = !DILocation(line: 10, column: 20, scope: !19)
+!33 = !DILocation(line: 10, column: 10, scope: !19)
+!34 = !DILocation(line: 10, column: 3, scope: !19)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-end-load.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-end-load.ll
new file mode 100644
index 0000000000000..7a85f3101d037
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-end-load.ll
@@ -0,0 +1,86 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-ALU32 %s
+;
+; Source Code:
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   struct s {int a; int b;};
+;   int test(struct s *arg) { return *(const int *)_(&arg->b); }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i32 }
+
+; Function Attrs: nounwind readonly
+define dso_local i32 @test(%struct.s* readonly %arg) local_unnamed_addr #0 !dbg !11 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !20, metadata !DIExpression()), !dbg !21
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 1, i32 1), !dbg !22, !llvm.preserve.access.index !15
+  %1 = load i32, i32* %0, align 4, !dbg !23, !tbaa !24
+  ret i32 %1, !dbg !28
+}
+
+; CHECK-LABEL: test
+; CHECK-ALU64: ldxw r0, [r1 + 4]
+; CHECK-ALU32: ldxw w0, [r1 + 4]
+; CHECK:       exit
+;
+; CHECK:       .long   1                       # BTF_KIND_STRUCT(id = 2)
+;
+; CHECK:       .byte   115                     # string offset=1
+; CHECK:       .ascii  ".text"                 # string offset=20
+; CHECK:       .ascii  "0:1"                   # string offset=26
+;
+; CHECK:       .long   16                      # FieldReloc
+; CHECK-NEXT:  .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT:  .long   1
+; CHECK-NEXT:  .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:  .long   2
+; CHECK-NEXT:  .long   26
+; CHECK-NEXT:  .long   0
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32, i32) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!7, !8, !9}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 6e353b4df3aa452ed4741a5e5caea02b1a876d8c)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !6)
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = !{i32 2, !"Dwarf Version", i32 4}
+!8 = !{i32 2, !"Debug Info Version", i32 3}
+!9 = !{i32 1, !"wchar_size", i32 4}
+!10 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 6e353b4df3aa452ed4741a5e5caea02b1a876d8c)"}
+!11 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !12, scopeLine: 3, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !19)
+!12 = !DISubroutineType(types: !13)
+!13 = !{!6, !14}
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 2, size: 64, elements: !16)
+!16 = !{!17, !18}
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !15, file: !1, line: 2, baseType: !6, size: 32)
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !15, file: !1, line: 2, baseType: !6, size: 32, offset: 32)
+!19 = !{!20}
+!20 = !DILocalVariable(name: "arg", arg: 1, scope: !11, file: !1, line: 3, type: !14)
+!21 = !DILocation(line: 0, scope: !11)
+!22 = !DILocation(line: 3, column: 48, scope: !11)
+!23 = !DILocation(line: 3, column: 34, scope: !11)
+!24 = !{!25, !25, i64 0}
+!25 = !{!"int", !26, i64 0}
+!26 = !{!"omnipotent char", !27, i64 0}
+!27 = !{!"Simple C/C++ TBAA"}
+!28 = !DILocation(line: 3, column: 27, scope: !11)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-end-ret.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-end-ret.ll
new file mode 100644
index 0000000000000..8dffa10c7ebe4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-end-ret.ll
@@ -0,0 +1,81 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source Code:
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   struct s {int a; int b;};
+;   const void *test(struct s *arg) { return _(&arg->b); }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i32 }
+
+; Function Attrs: nounwind readnone
+define dso_local i8* @test(%struct.s* readnone %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !19, metadata !DIExpression()), !dbg !20
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 1, i32 1), !dbg !21, !llvm.preserve.access.index !13
+  %1 = bitcast i32* %0 to i8*, !dbg !21
+  ret i8* %1, !dbg !22
+}
+
+; CHECK-LABEL: test
+; CHECK:       mov64 r0, r1
+; CHECK:       mov64 r1, 4
+; CHECK:       add64 r0, r1
+; CHECK:       exit
+;
+; CHECK:       .long   1                       # BTF_KIND_STRUCT(id = 2)
+;
+; CHECK:       .byte   115                     # string offset=1
+; CHECK:       .ascii  ".text"                 # string offset=20
+; CHECK:       .ascii  "0:1"                   # string offset=63
+;
+; CHECK:       .long   16                      # FieldReloc
+; CHECK-NEXT:  .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT:  .long   1
+; CHECK-NEXT:  .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:  .long   2
+; CHECK-NEXT:  .long   63
+; CHECK-NEXT:  .long   0
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32, i32) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 6e353b4df3aa452ed4741a5e5caea02b1a876d8c)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 6e353b4df3aa452ed4741a5e5caea02b1a876d8c)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !8, scopeLine: 3, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !18)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !12}
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
+!11 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!12 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 2, size: 64, elements: !14)
+!14 = !{!15, !17}
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !1, line: 2, baseType: !16, size: 32)
+!16 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !13, file: !1, line: 2, baseType: !16, size: 32, offset: 32)
+!18 = !{!19}
+!19 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 3, type: !12)
+!20 = !DILocation(line: 0, scope: !7)
+!21 = !DILocation(line: 3, column: 42, scope: !7)
+!22 = !DILocation(line: 3, column: 35, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-1.ll
new file mode 100644
index 0000000000000..57df4ebe5c5c1
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-1.ll
@@ -0,0 +1,200 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK32 %s
+; Source code:
+;   struct s {
+;     int a;
+;     int b1:9;
+;     int b2:4;
+;   };
+;   enum {
+;       FIELD_BYTE_OFFSET = 0,
+;       FIELD_BYTE_SIZE,
+;       FIELD_EXISTENCE,
+;       FIELD_SIGNEDNESS,
+;       FIELD_LSHIFT_U64,
+;       FIELD_RSHIFT_U64,
+;   };
+;   void bpf_probe_read(void *, unsigned, const void *);
+;   int field_read(struct s *arg) {
+;     unsigned long long ull;
+;     unsigned offset = __builtin_preserve_field_info(arg->b2, FIELD_BYTE_OFFSET);
+;     unsigned size = __builtin_preserve_field_info(arg->b2, FIELD_BYTE_SIZE);
+;     unsigned lshift;
+;
+;     bpf_probe_read(&ull, size, (const void *)arg + offset);
+;     lshift = __builtin_preserve_field_info(arg->b2, FIELD_LSHIFT_U64);
+;   #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+;     lshift = lshift + (size << 3) - 64;
+;   #endif
+;     ull <<= lshift;
+;     if (__builtin_preserve_field_info(arg->b2, FIELD_SIGNEDNESS))
+;       return (long long)ull >> __builtin_preserve_field_info(arg->b2, FIELD_RSHIFT_U64);
+;     return ull >> __builtin_preserve_field_info(arg->b2, FIELD_RSHIFT_U64);
+;   }
+; Compilation flag:
+;   clang -target bpfel -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i16 }
+
+; Function Attrs: nounwind
+define dso_local i32 @field_read(%struct.s* %arg) local_unnamed_addr #0 !dbg !20 {
+entry:
+  %ull = alloca i64, align 8
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !31, metadata !DIExpression()), !dbg !37
+  %0 = bitcast i64* %ull to i8*, !dbg !38
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %0) #5, !dbg !38
+  %1 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 1, i32 2), !dbg !39, !llvm.preserve.access.index !25
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %1, i64 0), !dbg !40
+  call void @llvm.dbg.value(metadata i32 %2, metadata !34, metadata !DIExpression()), !dbg !37
+  %3 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %1, i64 1), !dbg !41
+  call void @llvm.dbg.value(metadata i32 %3, metadata !35, metadata !DIExpression()), !dbg !37
+  %4 = bitcast %struct.s* %arg to i8*, !dbg !42
+  %idx.ext = zext i32 %2 to i64, !dbg !43
+  %add.ptr = getelementptr i8, i8* %4, i64 %idx.ext, !dbg !43
+  call void @bpf_probe_read(i8* nonnull %0, i32 %3, i8* %add.ptr) #5, !dbg !44
+  %5 = call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %1, i64 4), !dbg !45
+  call void @llvm.dbg.value(metadata i32 %5, metadata !36, metadata !DIExpression()), !dbg !37
+  %6 = load i64, i64* %ull, align 8, !dbg !46, !tbaa !47
+  call void @llvm.dbg.value(metadata i64 %6, metadata !32, metadata !DIExpression()), !dbg !37
+  %sh_prom = zext i32 %5 to i64, !dbg !46
+  %shl = shl i64 %6, %sh_prom, !dbg !46
+  call void @llvm.dbg.value(metadata i64 %shl, metadata !32, metadata !DIExpression()), !dbg !37
+  %7 = call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %1, i64 3), !dbg !51
+  %tobool = icmp eq i32 %7, 0, !dbg !51
+  %8 = call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %1, i64 5), !dbg !37
+  %sh_prom1 = zext i32 %8 to i64, !dbg !37
+  %shr = ashr i64 %shl, %sh_prom1, !dbg !53
+  %shr3 = lshr i64 %shl, %sh_prom1, !dbg !53
+  %retval.0.in = select i1 %tobool, i64 %shr3, i64 %shr, !dbg !53
+  %retval.0 = trunc i64 %retval.0.in to i32, !dbg !37
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull %0) #5, !dbg !54
+  ret i32 %retval.0, !dbg !54
+}
+
+; CHECK:             mov64 r{{[0-9]+}}, 4
+; CHECK:             mov64 r{{[0-9]+}}, 4
+; CHECK:             lsh64 r{{[0-9]+}}, 51
+; CHECK64:           arsh64 r{{[0-9]+}}, 60
+; CHECK64:           rsh64 r{{[0-9]+}}, 60
+; CHECK32:           rsh64 r{{[0-9]+}}, 60
+; CHECK32:           arsh64 r{{[0-9]+}}, 60
+; CHECK:             mov64 r{{[0-9]+}}, 1
+
+; CHECK:             .byte   115                     # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=30
+; CHECK:             .ascii  "0:2"                   # string offset=73
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   30                      # Field reloc section string offset=30
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   73
+; CHECK-NEXT:        .long   3
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.ss(%struct.s*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #2
+
+declare dso_local void @bpf_probe_read(i8*, i32, i8*) local_unnamed_addr #3
+
+; Function Attrs: argmemonly nounwind willreturn
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #4
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind willreturn }
+attributes #2 = { nounwind readnone }
+attributes #3 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #4 = { nounwind readnone speculatable willreturn }
+attributes #5 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!16, !17, !18}
+!llvm.ident = !{!19}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 923aa0ce806f7739b754167239fee2c9a15e2f31)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !12, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 6, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6, !7, !8, !9, !10, !11}
+!6 = !DIEnumerator(name: "FIELD_BYTE_OFFSET", value: 0, isUnsigned: true)
+!7 = !DIEnumerator(name: "FIELD_BYTE_SIZE", value: 1, isUnsigned: true)
+!8 = !DIEnumerator(name: "FIELD_EXISTENCE", value: 2, isUnsigned: true)
+!9 = !DIEnumerator(name: "FIELD_SIGNEDNESS", value: 3, isUnsigned: true)
+!10 = !DIEnumerator(name: "FIELD_LSHIFT_U64", value: 4, isUnsigned: true)
+!11 = !DIEnumerator(name: "FIELD_RSHIFT_U64", value: 5, isUnsigned: true)
+!12 = !{!13, !15}
+!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
+!14 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!15 = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed)
+!16 = !{i32 2, !"Dwarf Version", i32 4}
+!17 = !{i32 2, !"Debug Info Version", i32 3}
+!18 = !{i32 1, !"wchar_size", i32 4}
+!19 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 923aa0ce806f7739b754167239fee2c9a15e2f31)"}
+!20 = distinct !DISubprogram(name: "field_read", scope: !1, file: !1, line: 15, type: !21, scopeLine: 15, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !30)
+!21 = !DISubroutineType(types: !22)
+!22 = !{!23, !24}
+!23 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!24 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !25, size: 64)
+!25 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 64, elements: !26)
+!26 = !{!27, !28, !29}
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !25, file: !1, line: 2, baseType: !23, size: 32)
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !25, file: !1, line: 3, baseType: !23, size: 9, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!29 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !25, file: !1, line: 4, baseType: !23, size: 4, offset: 41, flags: DIFlagBitField, extraData: i64 32)
+!30 = !{!31, !32, !34, !35, !36}
+!31 = !DILocalVariable(name: "arg", arg: 1, scope: !20, file: !1, line: 15, type: !24)
+!32 = !DILocalVariable(name: "ull", scope: !20, file: !1, line: 16, type: !33)
+!33 = !DIBasicType(name: "long long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!34 = !DILocalVariable(name: "offset", scope: !20, file: !1, line: 17, type: !4)
+!35 = !DILocalVariable(name: "size", scope: !20, file: !1, line: 18, type: !4)
+!36 = !DILocalVariable(name: "lshift", scope: !20, file: !1, line: 19, type: !4)
+!37 = !DILocation(line: 0, scope: !20)
+!38 = !DILocation(line: 16, column: 3, scope: !20)
+!39 = !DILocation(line: 17, column: 56, scope: !20)
+!40 = !DILocation(line: 17, column: 21, scope: !20)
+!41 = !DILocation(line: 18, column: 19, scope: !20)
+!42 = !DILocation(line: 21, column: 30, scope: !20)
+!43 = !DILocation(line: 21, column: 48, scope: !20)
+!44 = !DILocation(line: 21, column: 3, scope: !20)
+!45 = !DILocation(line: 22, column: 12, scope: !20)
+!46 = !DILocation(line: 26, column: 7, scope: !20)
+!47 = !{!48, !48, i64 0}
+!48 = !{!"long long", !49, i64 0}
+!49 = !{!"omnipotent char", !50, i64 0}
+!50 = !{!"Simple C/C++ TBAA"}
+!51 = !DILocation(line: 27, column: 7, scope: !52)
+!52 = distinct !DILexicalBlock(scope: !20, file: !1, line: 27, column: 7)
+!53 = !DILocation(line: 27, column: 7, scope: !20)
+!54 = !DILocation(line: 30, column: 1, scope: !20)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-2.ll
new file mode 100644
index 0000000000000..5148a2760318d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-fieldinfo-2.ll
@@ -0,0 +1,263 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK64 %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK,CHECK-EL,CHECK32 %s
+; Source code:
+;   struct s {
+;     int a;
+;     int b1:9;
+;     int b2:4;
+;   };
+;   enum {
+;     FIELD_BYTE_OFFSET = 0,
+;     FIELD_BYTE_SIZE,
+;     FIELD_EXISTENCE,
+;     FIELD_SIGNEDNESS,
+;     FIELD_LSHIFT_U64,
+;     FIELD_RSHIFT_U64,
+;   };
+;   int field_read(struct s *arg) {
+;     unsigned long long ull;
+;     unsigned offset = __builtin_preserve_field_info(arg->b2, FIELD_BYTE_OFFSET);
+;     unsigned size = __builtin_preserve_field_info(arg->b2, FIELD_BYTE_SIZE);
+;     switch(size) {
+;     case 1:
+;       ull = *(unsigned char *)((void *)arg + offset); break;
+;     case 2:
+;       ull = *(unsigned short *)((void *)arg + offset); break;
+;     case 4:
+;       ull = *(unsigned int *)((void *)arg + offset); break;
+;     case 8:
+;       ull = *(unsigned long long *)((void *)arg + offset); break;
+;     }
+;     ull <<= __builtin_preserve_field_info(arg->b2, FIELD_LSHIFT_U64);
+;     if (__builtin_preserve_field_info(arg->b2, FIELD_SIGNEDNESS))
+;       return ((long long)ull) >>__builtin_preserve_field_info(arg->b2, FIELD_RSHIFT_U64);
+;     return ull >> __builtin_preserve_field_info(arg->b2, FIELD_RSHIFT_U64);
+;   }
+; Compilation flag:
+;   clang -target bpfel -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.s = type { i32, i16 }
+
+; Function Attrs: nounwind readonly
+define dso_local i32 @field_read(%struct.s* %arg) local_unnamed_addr #0 !dbg !26 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !37, metadata !DIExpression()), !dbg !41
+  %0 = tail call i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.ss(%struct.s* elementtype(%struct.s) %arg, i32 1, i32 2), !dbg !42, !llvm.preserve.access.index !31
+  %1 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 0), !dbg !43
+  call void @llvm.dbg.value(metadata i32 %1, metadata !39, metadata !DIExpression()), !dbg !41
+  %2 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 1), !dbg !44
+  call void @llvm.dbg.value(metadata i32 %2, metadata !40, metadata !DIExpression()), !dbg !41
+  switch i32 %2, label %sw.epilog [
+    i32 1, label %sw.bb
+    i32 2, label %sw.bb1
+    i32 4, label %sw.bb5
+    i32 8, label %sw.bb9
+  ], !dbg !45
+
+sw.bb:                                            ; preds = %entry
+  %3 = bitcast %struct.s* %arg to i8*, !dbg !46
+  %idx.ext = zext i32 %1 to i64, !dbg !48
+  %add.ptr = getelementptr i8, i8* %3, i64 %idx.ext, !dbg !48
+  %4 = load i8, i8* %add.ptr, align 1, !dbg !49, !tbaa !50
+  %conv = zext i8 %4 to i64, !dbg !49
+  call void @llvm.dbg.value(metadata i64 %conv, metadata !38, metadata !DIExpression()), !dbg !41
+  br label %sw.epilog, !dbg !53
+
+sw.bb1:                                           ; preds = %entry
+  %5 = bitcast %struct.s* %arg to i8*, !dbg !54
+  %idx.ext2 = zext i32 %1 to i64, !dbg !55
+  %add.ptr3 = getelementptr i8, i8* %5, i64 %idx.ext2, !dbg !55
+  %6 = bitcast i8* %add.ptr3 to i16*, !dbg !56
+  %7 = load i16, i16* %6, align 2, !dbg !57, !tbaa !58
+  %conv4 = zext i16 %7 to i64, !dbg !57
+  call void @llvm.dbg.value(metadata i64 %conv4, metadata !38, metadata !DIExpression()), !dbg !41
+  br label %sw.epilog, !dbg !60
+
+sw.bb5:                                           ; preds = %entry
+  %8 = bitcast %struct.s* %arg to i8*, !dbg !61
+  %idx.ext6 = zext i32 %1 to i64, !dbg !62
+  %add.ptr7 = getelementptr i8, i8* %8, i64 %idx.ext6, !dbg !62
+  %9 = bitcast i8* %add.ptr7 to i32*, !dbg !63
+  %10 = load i32, i32* %9, align 4, !dbg !64, !tbaa !65
+  %conv8 = zext i32 %10 to i64, !dbg !64
+  call void @llvm.dbg.value(metadata i64 %conv8, metadata !38, metadata !DIExpression()), !dbg !41
+  br label %sw.epilog, !dbg !67
+
+sw.bb9:                                           ; preds = %entry
+  %11 = bitcast %struct.s* %arg to i8*, !dbg !68
+  %idx.ext10 = zext i32 %1 to i64, !dbg !69
+  %add.ptr11 = getelementptr i8, i8* %11, i64 %idx.ext10, !dbg !69
+  %12 = bitcast i8* %add.ptr11 to i64*, !dbg !70
+  %13 = load i64, i64* %12, align 8, !dbg !71, !tbaa !72
+  call void @llvm.dbg.value(metadata i64 %13, metadata !38, metadata !DIExpression()), !dbg !41
+  br label %sw.epilog, !dbg !74
+
+sw.epilog:                                        ; preds = %entry, %sw.bb9, %sw.bb5, %sw.bb1, %sw.bb
+  %ull.0 = phi i64 [ undef, %entry ], [ %13, %sw.bb9 ], [ %conv8, %sw.bb5 ], [ %conv4, %sw.bb1 ], [ %conv, %sw.bb ]
+  call void @llvm.dbg.value(metadata i64 %ull.0, metadata !38, metadata !DIExpression()), !dbg !41
+  %14 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 4), !dbg !75
+  %sh_prom = zext i32 %14 to i64, !dbg !76
+  %shl = shl i64 %ull.0, %sh_prom, !dbg !76
+  call void @llvm.dbg.value(metadata i64 %shl, metadata !38, metadata !DIExpression()), !dbg !41
+  %15 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 3), !dbg !77
+  %tobool = icmp eq i32 %15, 0, !dbg !77
+  %16 = tail call i32 @llvm.bpf.preserve.field.info.p0i16(i16* %0, i64 5), !dbg !41
+  %sh_prom12 = zext i32 %16 to i64, !dbg !41
+  %shr = ashr i64 %shl, %sh_prom12, !dbg !79
+  %shr15 = lshr i64 %shl, %sh_prom12, !dbg !79
+  %retval.0.in = select i1 %tobool, i64 %shr15, i64 %shr, !dbg !79
+  %retval.0 = trunc i64 %retval.0.in to i32, !dbg !41
+  ret i32 %retval.0, !dbg !80
+}
+
+; CHECK:             mov64 r{{[0-9]+}}, 4
+; CHECK:             mov64 r{{[0-9]+}}, 4
+; CHECK-EL:          lsh64 r{{[0-9]+}}, 51
+; CHECK64:           rsh64 r{{[0-9]+}}, 60
+; CHECK64:           rsh64 r{{[0-9]+}}, 60
+; CHECK32:           rsh64 r{{[0-9]+}}, 60
+; CHECK32:           arsh64 r{{[0-9]+}}, 60
+; CHECK:             mov64 r{{[0-9]+}}, 1
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK:             .byte   115                     # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=30
+; CHECK:             .ascii  "0:2"                   # string offset=36
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   30                      # Field reloc section string offset=30
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   36
+; CHECK-NEXT:        .long   3
+
+; Function Attrs: nounwind readnone
+declare i16* @llvm.preserve.struct.access.index.p0i16.p0s_struct.ss(%struct.s*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32 @llvm.bpf.preserve.field.info.p0i16(i16*, i64) #1
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!22, !23, !24}
+!llvm.ident = !{!25}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 923aa0ce806f7739b754167239fee2c9a15e2f31)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !12, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{!3}
+!3 = !DICompositeType(tag: DW_TAG_enumeration_type, file: !1, line: 6, baseType: !4, size: 32, elements: !5)
+!4 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!5 = !{!6, !7, !8, !9, !10, !11}
+!6 = !DIEnumerator(name: "FIELD_BYTE_OFFSET", value: 0, isUnsigned: true)
+!7 = !DIEnumerator(name: "FIELD_BYTE_SIZE", value: 1, isUnsigned: true)
+!8 = !DIEnumerator(name: "FIELD_EXISTENCE", value: 2, isUnsigned: true)
+!9 = !DIEnumerator(name: "FIELD_SIGNEDNESS", value: 3, isUnsigned: true)
+!10 = !DIEnumerator(name: "FIELD_LSHIFT_U64", value: 4, isUnsigned: true)
+!11 = !DIEnumerator(name: "FIELD_RSHIFT_U64", value: 5, isUnsigned: true)
+!12 = !{!13, !15, !16, !18, !19, !21}
+!13 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
+!14 = !DIBasicType(name: "unsigned char", size: 8, encoding: DW_ATE_unsigned_char)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64)
+!17 = !DIBasicType(name: "unsigned short", size: 16, encoding: DW_ATE_unsigned)
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !20, size: 64)
+!20 = !DIBasicType(name: "long long unsigned int", size: 64, encoding: DW_ATE_unsigned)
+!21 = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed)
+!22 = !{i32 2, !"Dwarf Version", i32 4}
+!23 = !{i32 2, !"Debug Info Version", i32 3}
+!24 = !{i32 1, !"wchar_size", i32 4}
+!25 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 923aa0ce806f7739b754167239fee2c9a15e2f31)"}
+!26 = distinct !DISubprogram(name: "field_read", scope: !1, file: !1, line: 14, type: !27, scopeLine: 14, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !36)
+!27 = !DISubroutineType(types: !28)
+!28 = !{!29, !30}
+!29 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!30 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !31, size: 64)
+!31 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 64, elements: !32)
+!32 = !{!33, !34, !35}
+!33 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !31, file: !1, line: 2, baseType: !29, size: 32)
+!34 = !DIDerivedType(tag: DW_TAG_member, name: "b1", scope: !31, file: !1, line: 3, baseType: !29, size: 9, offset: 32, flags: DIFlagBitField, extraData: i64 32)
+!35 = !DIDerivedType(tag: DW_TAG_member, name: "b2", scope: !31, file: !1, line: 4, baseType: !29, size: 4, offset: 41, flags: DIFlagBitField, extraData: i64 32)
+!36 = !{!37, !38, !39, !40}
+!37 = !DILocalVariable(name: "arg", arg: 1, scope: !26, file: !1, line: 14, type: !30)
+!38 = !DILocalVariable(name: "ull", scope: !26, file: !1, line: 15, type: !20)
+!39 = !DILocalVariable(name: "offset", scope: !26, file: !1, line: 16, type: !4)
+!40 = !DILocalVariable(name: "size", scope: !26, file: !1, line: 17, type: !4)
+!41 = !DILocation(line: 0, scope: !26)
+!42 = !DILocation(line: 16, column: 56, scope: !26)
+!43 = !DILocation(line: 16, column: 21, scope: !26)
+!44 = !DILocation(line: 17, column: 19, scope: !26)
+!45 = !DILocation(line: 18, column: 3, scope: !26)
+!46 = !DILocation(line: 20, column: 30, scope: !47)
+!47 = distinct !DILexicalBlock(scope: !26, file: !1, line: 18, column: 16)
+!48 = !DILocation(line: 20, column: 42, scope: !47)
+!49 = !DILocation(line: 20, column: 11, scope: !47)
+!50 = !{!51, !51, i64 0}
+!51 = !{!"omnipotent char", !52, i64 0}
+!52 = !{!"Simple C/C++ TBAA"}
+!53 = !DILocation(line: 20, column: 53, scope: !47)
+!54 = !DILocation(line: 22, column: 31, scope: !47)
+!55 = !DILocation(line: 22, column: 43, scope: !47)
+!56 = !DILocation(line: 22, column: 12, scope: !47)
+!57 = !DILocation(line: 22, column: 11, scope: !47)
+!58 = !{!59, !59, i64 0}
+!59 = !{!"short", !51, i64 0}
+!60 = !DILocation(line: 22, column: 54, scope: !47)
+!61 = !DILocation(line: 24, column: 29, scope: !47)
+!62 = !DILocation(line: 24, column: 41, scope: !47)
+!63 = !DILocation(line: 24, column: 12, scope: !47)
+!64 = !DILocation(line: 24, column: 11, scope: !47)
+!65 = !{!66, !66, i64 0}
+!66 = !{!"int", !51, i64 0}
+!67 = !DILocation(line: 24, column: 52, scope: !47)
+!68 = !DILocation(line: 26, column: 35, scope: !47)
+!69 = !DILocation(line: 26, column: 47, scope: !47)
+!70 = !DILocation(line: 26, column: 12, scope: !47)
+!71 = !DILocation(line: 26, column: 11, scope: !47)
+!72 = !{!73, !73, i64 0}
+!73 = !{!"long long", !51, i64 0}
+!74 = !DILocation(line: 26, column: 58, scope: !47)
+!75 = !DILocation(line: 28, column: 11, scope: !26)
+!76 = !DILocation(line: 28, column: 7, scope: !26)
+!77 = !DILocation(line: 29, column: 7, scope: !78)
+!78 = distinct !DILexicalBlock(scope: !26, file: !1, line: 29, column: 7)
+!79 = !DILocation(line: 29, column: 7, scope: !26)
+!80 = !DILocation(line: 32, column: 1, scope: !26)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-1.ll
new file mode 100644
index 0000000000000..1b61455100697
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-1.ll
@@ -0,0 +1,83 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef struct v3 { int a; int b; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   __v3 g __attribute__((section("stats")));
+;   int test() {
+;     return get_value(_(&g.b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, i32 }
+
+@g = dso_local global %struct.v3 zeroinitializer, section "stats", align 4, !dbg !0
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !16 {
+entry:
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) nonnull @g, i32 1, i32 1), !dbg !19, !llvm.preserve.access.index !7
+  %call = tail call i32 @get_value(i32* %0) #3, !dbg !20
+  ret i32 %call, !dbg !21
+}
+
+; CHECK:              mov64 r2, 4
+; CHECK:              lddw r1, g
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   16                      # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+
+; CHECK:              .ascii  ".text"                 # string offset=10
+; CHECK:              .ascii  "v3"                    # string offset=16
+; CHECK:              .ascii  "0:1"                   # string offset=23
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   10                      # Field reloc section string offset=10
+; CHECK-NEXT:         .long   1
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   23
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!12, !13, !14}
+!llvm.ident = !{!15}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 4, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !3, line: 1, baseType: !7)
+!7 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !3, line: 1, size: 64, elements: !8)
+!8 = !{!9, !11}
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !7, file: !3, line: 1, baseType: !10, size: 32)
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !7, file: !3, line: 1, baseType: !10, size: 32, offset: 32)
+!12 = !{i32 2, !"Dwarf Version", i32 4}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!16 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 5, type: !17, scopeLine: 5, isDefinition: true, isOptimized: true, unit: !2, retainedNodes: !4)
+!17 = !DISubroutineType(types: !18)
+!18 = !{!10}
+!19 = !DILocation(line: 6, column: 20, scope: !16)
+!20 = !DILocation(line: 6, column: 10, scope: !16)
+!21 = !DILocation(line: 6, column: 3, scope: !16)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-2.ll
new file mode 100644
index 0000000000000..e094c55d67ca5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-2.ll
@@ -0,0 +1,99 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef struct v3 { int a; int b; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   __v3 g[4][5] __attribute__((section("stats")));
+;   int test() {
+;     return get_value(_(&g[1][2].b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, i32 }
+
+@g = dso_local global [4 x [5 x %struct.v3]] zeroinitializer, section "stats", align 4, !dbg !0
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !23 {
+entry:
+  %0 = tail call [5 x %struct.v3]* @llvm.preserve.array.access.index.p0a5s_struct.v3s.p0a4a5s_struct.v3s([4 x [5 x %struct.v3]]* elementtype([4 x [5 x %struct.v3]]) nonnull @g, i32 1, i32 1), !dbg !26, !llvm.preserve.access.index !6
+  %1 = tail call %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0a5s_struct.v3s([5 x %struct.v3]* elementtype([5 x %struct.v3]) %0, i32 1, i32 2), !dbg !26, !llvm.preserve.access.index !16
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %1, i32 1, i32 1), !dbg !26, !llvm.preserve.access.index !8
+  %call = tail call i32 @get_value(i32* %2) #3, !dbg !27
+  ret i32 %call, !dbg !28
+}
+
+; CHECK:              mov64 r2, 60
+; CHECK:              lddw r1, g
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   16                      # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+
+; CHECK:              .ascii  ".text"                 # string offset=10
+; CHECK:              .ascii  "v3"                    # string offset=16
+; CHECK:              .ascii  "7:1"                   # string offset=23
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   10                      # Field reloc section string offset=10
+; CHECK-NEXT:         .long   1
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   23
+; CHECK-NEXT:         .long   0
+
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare [5 x %struct.v3]* @llvm.preserve.array.access.index.p0a5s_struct.v3s.p0a4a5s_struct.v3s([4 x [5 x %struct.v3]]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0a5s_struct.v3s([5 x %struct.v3]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!19, !20, !21}
+!llvm.ident = !{!22}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 4, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, retainedTypes: !5, globals: !18, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!4 = !{}
+!5 = !{!6, !16}
+!6 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 1280, elements: !13)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !3, line: 1, baseType: !8)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !3, line: 1, size: 64, elements: !9)
+!9 = !{!10, !12}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !8, file: !3, line: 1, baseType: !11, size: 32)
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !8, file: !3, line: 1, baseType: !11, size: 32, offset: 32)
+!13 = !{!14, !15}
+!14 = !DISubrange(count: 4)
+!15 = !DISubrange(count: 5)
+!16 = !DICompositeType(tag: DW_TAG_array_type, baseType: !7, size: 320, elements: !17)
+!17 = !{!15}
+!18 = !{!0}
+!19 = !{i32 2, !"Dwarf Version", i32 4}
+!20 = !{i32 2, !"Debug Info Version", i32 3}
+!21 = !{i32 1, !"wchar_size", i32 4}
+!22 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!23 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 5, type: !24, scopeLine: 5, isDefinition: true, isOptimized: true, unit: !2, retainedNodes: !4)
+!24 = !DISubroutineType(types: !25)
+!25 = !{!11}
+!26 = !DILocation(line: 6, column: 20, scope: !23)
+!27 = !DILocation(line: 6, column: 10, scope: !23)
+!28 = !DILocation(line: 6, column: 3, scope: !23)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-3.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-3.ll
new file mode 100644
index 0000000000000..d7845097d6ee5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-global-3.ll
@@ -0,0 +1,88 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef struct v3 { int a; int b; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   __v3 *g __attribute__((section("stats")));
+;   int test() {
+;     return get_value(_(&g->b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, i32 }
+
+@g = dso_local local_unnamed_addr global %struct.v3* null, section "stats", align 8, !dbg !0
+
+; Function Attrs: nounwind
+define dso_local i32 @test() local_unnamed_addr #0 !dbg !17 {
+entry:
+  %0 = load %struct.v3*, %struct.v3** @g, align 8, !dbg !20, !tbaa !21
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %0, i32 1, i32 1), !dbg !20, !llvm.preserve.access.index !8
+  %call = tail call i32 @get_value(i32* %1) #3, !dbg !25
+  ret i32 %call, !dbg !26
+}
+
+; CHECK:              mov64 r2, 4
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   16                      # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+
+; CHECK:              .ascii  ".text"                 # string offset=10
+; CHECK:              .ascii  "v3"                    # string offset=16
+; CHECK:              .ascii  "0:1"                   # string offset=23
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   10                      # Field reloc section string offset=10
+; CHECK-NEXT:         .long   1
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   23
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!13, !14, !15}
+!llvm.ident = !{!16}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 4, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, nameTableKind: None)
+!3 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!4 = !{}
+!5 = !{!0}
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !3, line: 1, baseType: !8)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !3, line: 1, size: 64, elements: !9)
+!9 = !{!10, !12}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !8, file: !3, line: 1, baseType: !11, size: 32)
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !8, file: !3, line: 1, baseType: !11, size: 32, offset: 32)
+!13 = !{i32 2, !"Dwarf Version", i32 4}
+!14 = !{i32 2, !"Debug Info Version", i32 3}
+!15 = !{i32 1, !"wchar_size", i32 4}
+!16 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!17 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 5, type: !18, scopeLine: 5, isDefinition: true, isOptimized: true, unit: !2, retainedNodes: !4)
+!18 = !DISubroutineType(types: !19)
+!19 = !{!11}
+!20 = !DILocation(line: 6, column: 20, scope: !17)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"any pointer", !23, i64 0}
+!23 = !{!"omnipotent char", !24, i64 0}
+!24 = !{!"Simple C/C++ TBAA"}
+!25 = !DILocation(line: 6, column: 10, scope: !17)
+!26 = !DILocation(line: 6, column: 3, scope: !17)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-ignore.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-ignore.ll
new file mode 100644
index 0000000000000..4734c03964ab7
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-ignore.ll
@@ -0,0 +1,65 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   int test(int *arg) {
+;     return get_value(_(&arg[4]));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32* %arg) local_unnamed_addr #0 !dbg !10 {
+entry:
+  call void @llvm.dbg.value(metadata i32* %arg, metadata !14, metadata !DIExpression()), !dbg !15
+  %0 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0i32(i32* elementtype(i32) %arg, i32 0, i32 4), !dbg !16, !llvm.preserve.access.index !4
+  %call = tail call i32 @get_value(i32* %0) #4, !dbg !17
+  ret i32 %call, !dbg !18
+}
+
+; CHECK:             add64 r1, 16
+; CHECK:             call get_value
+; CHECK:             .section        .BTF.ext,"",@progbits
+; CHECK-NOT:         .long   16                      # FieldReloc
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0i32(i32*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!6 = !{i32 2, !"Dwarf Version", i32 4}
+!7 = !{i32 2, !"Debug Info Version", i32 3}
+!8 = !{i32 1, !"wchar_size", i32 4}
+!9 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!10 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 3, type: !11, scopeLine: 3, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !13)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!5, !4}
+!13 = !{!14}
+!14 = !DILocalVariable(name: "arg", arg: 1, scope: !10, file: !1, line: 3, type: !4)
+!15 = !DILocation(line: 0, scope: !10)
+!16 = !DILocation(line: 4, column: 20, scope: !10)
+!17 = !DILocation(line: 4, column: 10, scope: !10)
+!18 = !DILocation(line: 4, column: 3, scope: !10)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-middle-chain.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-middle-chain.ll
new file mode 100644
index 0000000000000..cdd13eccffd78
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-middle-chain.ll
@@ -0,0 +1,133 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct t1 {
+;     int c;
+;   };
+;   struct s1 {
+;     struct t1 b;
+;   };
+;   struct r1 {
+;     struct s1 a;
+;   };
+;   #define _(x) __builtin_preserve_access_index(x)
+;   void test1(void *p1, void *p2, void *p3);
+;   void test(struct r1 *arg) {
+;     struct s1 *ps = _(&arg->a);
+;     struct t1 *pt = _(&arg->a.b);
+;     int *pi = _(&arg->a.b.c);
+;     test1(ps, pt, pi);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.r1 = type { %struct.s1 }
+%struct.s1 = type { %struct.t1 }
+%struct.t1 = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local void @test(%struct.r1* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.r1* %arg, metadata !22, metadata !DIExpression()), !dbg !29
+  %0 = tail call %struct.s1* @llvm.preserve.struct.access.index.p0s_struct.s1s.p0s_struct.r1s(%struct.r1* elementtype(%struct.r1) %arg, i32 0, i32 0), !dbg !30, !llvm.preserve.access.index !11
+  call void @llvm.dbg.value(metadata %struct.s1* %0, metadata !23, metadata !DIExpression()), !dbg !29
+  %1 = tail call %struct.t1* @llvm.preserve.struct.access.index.p0s_struct.t1s.p0s_struct.s1s(%struct.s1* elementtype(%struct.s1) %0, i32 0, i32 0), !dbg !31, !llvm.preserve.access.index !14
+  call void @llvm.dbg.value(metadata %struct.t1* %1, metadata !25, metadata !DIExpression()), !dbg !29
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.t1s(%struct.t1* elementtype(%struct.t1) %1, i32 0, i32 0), !dbg !32, !llvm.preserve.access.index !17
+  call void @llvm.dbg.value(metadata i32* %2, metadata !27, metadata !DIExpression()), !dbg !29
+  %3 = bitcast %struct.s1* %0 to i8*, !dbg !33
+  %4 = bitcast %struct.t1* %1 to i8*, !dbg !34
+  %5 = bitcast i32* %2 to i8*, !dbg !35
+  tail call void @test1(i8* %3, i8* %4, i8* %5) #4, !dbg !36
+  ret void, !dbg !37
+}
+
+; CHECK:             .long   1                       # BTF_KIND_STRUCT(id = 2)
+
+; CHECK:             .ascii  "r1"                    # string offset=1
+; CHECK:             .ascii  ".text"                 # string offset=29
+; CHECK:             .ascii  "0:0"                   # string offset=72
+; CHECK:             .ascii  "0:0:0"                 # string offset=76
+; CHECK:             .ascii  "0:0:0:0"               # string offset=82
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   29                      # Field reloc section string offset=29
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   72
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   76
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   82
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: nounwind readnone
+declare %struct.s1* @llvm.preserve.struct.access.index.p0s_struct.s1s.p0s_struct.r1s(%struct.r1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare %struct.t1* @llvm.preserve.struct.access.index.p0s_struct.t1s.p0s_struct.s1s(%struct.s1*, i32, i32) #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.t1s(%struct.t1*, i32, i32) #1
+
+declare dso_local void @test1(i8*, i8*, i8*) local_unnamed_addr #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project.git 42b3328a2368b38fba6bdb0c616fe6c5520e3bc5)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project.git 42b3328a2368b38fba6bdb0c616fe6c5520e3bc5)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 12, type: !8, scopeLine: 12, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !21)
+!8 = !DISubroutineType(types: !9)
+!9 = !{null, !10}
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
+!11 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "r1", file: !1, line: 7, size: 32, elements: !12)
+!12 = !{!13}
+!13 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !11, file: !1, line: 8, baseType: !14, size: 32)
+!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s1", file: !1, line: 4, size: 32, elements: !15)
+!15 = !{!16}
+!16 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !14, file: !1, line: 5, baseType: !17, size: 32)
+!17 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !1, line: 1, size: 32, elements: !18)
+!18 = !{!19}
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !17, file: !1, line: 2, baseType: !20, size: 32)
+!20 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!21 = !{!22, !23, !25, !27}
+!22 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 12, type: !10)
+!23 = !DILocalVariable(name: "ps", scope: !7, file: !1, line: 13, type: !24)
+!24 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !14, size: 64)
+!25 = !DILocalVariable(name: "pt", scope: !7, file: !1, line: 14, type: !26)
+!26 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64)
+!27 = !DILocalVariable(name: "pi", scope: !7, file: !1, line: 15, type: !28)
+!28 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !20, size: 64)
+!29 = !DILocation(line: 0, scope: !7)
+!30 = !DILocation(line: 13, column: 19, scope: !7)
+!31 = !DILocation(line: 14, column: 19, scope: !7)
+!32 = !DILocation(line: 15, column: 13, scope: !7)
+!33 = !DILocation(line: 16, column: 9, scope: !7)
+!34 = !DILocation(line: 16, column: 13, scope: !7)
+!35 = !DILocation(line: 16, column: 17, scope: !7)
+!36 = !DILocation(line: 16, column: 3, scope: !7)
+!37 = !DILocation(line: 17, column: 1, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-1.ll
new file mode 100644
index 0000000000000..15519038dfbdb
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-1.ll
@@ -0,0 +1,105 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef int __int;
+;   typedef struct v3 { int a; __int b[4][4]; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&arg[1].b[2][3]));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, [4 x [4 x i32]] }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !21 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !25, metadata !DIExpression()), !dbg !26
+  %0 = tail call %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 0, i32 1), !dbg !27, !llvm.preserve.access.index !4
+  %1 = tail call [4 x [4 x i32]]* @llvm.preserve.struct.access.index.p0a4a4i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %0, i32 1, i32 1), !dbg !27, !llvm.preserve.access.index !6
+  %2 = tail call [4 x i32]* @llvm.preserve.array.access.index.p0a4i32.p0a4a4i32([4 x [4 x i32]]* elementtype([4 x [4 x i32]]) %1, i32 1, i32 2), !dbg !27, !llvm.preserve.access.index !11
+  %3 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a4i32([4 x i32]* elementtype([4 x i32]) %2, i32 1, i32 3), !dbg !27, !llvm.preserve.access.index !15
+  %call = tail call i32 @get_value(i32* %3) #4, !dbg !28
+  ret i32 %call, !dbg !29
+}
+
+; CHECK:              mov64 r2, 116
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   6                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+
+; CHECK:              .ascii  "v3"                    # string offset=6
+; CHECK:              .ascii  ".text"                 # string offset=52
+; CHECK:              .ascii  "1:1:2:3"               # string offset=58
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   52                      # Field reloc section string offset=52
+; CHECK-NEXT:         .long   1
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   58
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x [4 x i32]]* @llvm.preserve.struct.access.index.p0a4a4i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x i32]* @llvm.preserve.array.access.index.p0a4i32.p0a4a4i32([4 x [4 x i32]]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a4i32([4 x i32]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!17, !18, !19}
+!llvm.ident = !{!20}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4, !11, !15}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 2, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 2, size: 544, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 2, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 2, baseType: !11, size: 512, offset: 32)
+!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 512, elements: !13)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 1, baseType: !9)
+!13 = !{!14, !14}
+!14 = !DISubrange(count: 4)
+!15 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 128, elements: !16)
+!16 = !{!14}
+!17 = !{i32 2, !"Dwarf Version", i32 4}
+!18 = !{i32 2, !"Debug Info Version", i32 3}
+!19 = !{i32 1, !"wchar_size", i32 4}
+!20 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!21 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !22, scopeLine: 5, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !24)
+!22 = !DISubroutineType(types: !23)
+!23 = !{!9, !4}
+!24 = !{!25}
+!25 = !DILocalVariable(name: "arg", arg: 1, scope: !21, file: !1, line: 5, type: !4)
+!26 = !DILocation(line: 0, scope: !21)
+!27 = !DILocation(line: 6, column: 20, scope: !21)
+!28 = !DILocation(line: 6, column: 10, scope: !21)
+!29 = !DILocation(line: 6, column: 3, scope: !21)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-2.ll
new file mode 100644
index 0000000000000..d2613698f1e3f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-multi-array-2.ll
@@ -0,0 +1,111 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef int __int;
+;   typedef struct v3 { int a; __int b[4][4][4]; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&arg[1].b[2][3][2]));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, [4 x [4 x [4 x i32]]] }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !23 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !27, metadata !DIExpression()), !dbg !28
+  %0 = tail call %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 0, i32 1), !dbg !29, !llvm.preserve.access.index !4
+  %1 = tail call [4 x [4 x [4 x i32]]]* @llvm.preserve.struct.access.index.p0a4a4a4i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %0, i32 1, i32 1), !dbg !29, !llvm.preserve.access.index !6
+  %2 = tail call [4 x [4 x i32]]* @llvm.preserve.array.access.index.p0a4a4i32.p0a4a4a4i32([4 x [4 x [4 x i32]]]* elementtype([4 x [4 x [4 x i32]]]) %1, i32 1, i32 2), !dbg !29, !llvm.preserve.access.index !11
+  %3 = tail call [4 x i32]* @llvm.preserve.array.access.index.p0a4i32.p0a4a4i32([4 x [4 x i32]]* elementtype([4 x [4 x i32]]) %2, i32 1, i32 3), !dbg !29, !llvm.preserve.access.index !15
+  %4 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a4i32([4 x i32]* elementtype([4 x i32]) %3, i32 1, i32 2), !dbg !29, !llvm.preserve.access.index !17
+  %call = tail call i32 @get_value(i32* %4) #4, !dbg !30
+  ret i32 %call, !dbg !31
+}
+
+; CHECK:             mov64 r2, 448
+; CHECK:             add64 r1, r2
+; CHECK:             call get_value
+
+; CHECK:             .long   6                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+
+; CHECK:             .ascii  "v3"                    # string offset=6
+; CHECK:             .ascii  ".text"                 # string offset=52
+; CHECK:             .ascii  "1:1:2:3:2"             # string offset=58
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   52                      # Field reloc section string offset=52
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   [[TID1]]
+; CHECK-NEXT:        .long   58
+; CHECK-NEXT:        .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x [4 x [4 x i32]]]* @llvm.preserve.struct.access.index.p0a4a4a4i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x [4 x i32]]* @llvm.preserve.array.access.index.p0a4a4i32.p0a4a4a4i32([4 x [4 x [4 x i32]]]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare [4 x i32]* @llvm.preserve.array.access.index.p0a4i32.p0a4a4i32([4 x [4 x i32]]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a4i32([4 x i32]*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!19, !20, !21}
+!llvm.ident = !{!22}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4, !11, !15, !17}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 2, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 2, size: 2080, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 2, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 2, baseType: !11, size: 2048, offset: 32)
+!11 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 2048, elements: !13)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 1, baseType: !9)
+!13 = !{!14, !14, !14}
+!14 = !DISubrange(count: 4)
+!15 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 512, elements: !16)
+!16 = !{!14, !14}
+!17 = !DICompositeType(tag: DW_TAG_array_type, baseType: !12, size: 128, elements: !18)
+!18 = !{!14}
+!19 = !{i32 2, !"Dwarf Version", i32 4}
+!20 = !{i32 2, !"Debug Info Version", i32 3}
+!21 = !{i32 1, !"wchar_size", i32 4}
+!22 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!23 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !24, scopeLine: 5, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !26)
+!24 = !DISubroutineType(types: !25)
+!25 = !{!9, !4}
+!26 = !{!27}
+!27 = !DILocalVariable(name: "arg", arg: 1, scope: !23, file: !1, line: 5, type: !4)
+!28 = !DILocation(line: 0, scope: !23)
+!29 = !DILocation(line: 6, column: 20, scope: !23)
+!30 = !DILocation(line: 6, column: 10, scope: !23)
+!31 = !DILocation(line: 6, column: 3, scope: !23)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-multilevel.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-multilevel.ll
new file mode 100644
index 0000000000000..76cec1b359744
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-multilevel.ll
@@ -0,0 +1,199 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct net_device {
+;     int dev_id;
+;     int others;
+;   };
+;   struct sk_buff {
+;     int i;
+;     struct net_device dev;
+;   };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr)
+;       = (void *) 4;
+;
+;   int bpf_prog(struct sk_buff *ctx) {
+;     int dev_id;
+;     bpf_probe_read(&dev_id, sizeof(int), _(&ctx->dev.dev_id));
+;     return dev_id;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.sk_buff = type { i32, %struct.net_device }
+%struct.net_device = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @bpf_prog(%struct.sk_buff*) local_unnamed_addr #0 !dbg !15 {
+  %2 = alloca i32, align 4
+  call void @llvm.dbg.value(metadata %struct.sk_buff* %0, metadata !28, metadata !DIExpression()), !dbg !30
+  %3 = bitcast i32* %2 to i8*, !dbg !31
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %3) #4, !dbg !31
+  %4 = tail call %struct.net_device* @llvm.preserve.struct.access.index.p0s_struct.net_devices.p0s_struct.sk_buffs(%struct.sk_buff* elementtype(%struct.sk_buff) %0, i32 1, i32 1), !dbg !32, !llvm.preserve.access.index !19
+  %5 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.net_devices(%struct.net_device* elementtype(%struct.net_device) %4, i32 0, i32 0), !dbg !32, !llvm.preserve.access.index !23
+  %6 = bitcast i32* %5 to i8*, !dbg !32
+  %7 = call i32 inttoptr (i64 4 to i32 (i8*, i32, i8*)*)(i8* nonnull %3, i32 4, i8* %6) #4, !dbg !33
+  %8 = load i32, i32* %2, align 4, !dbg !34, !tbaa !35
+  call void @llvm.dbg.value(metadata i32 %8, metadata !29, metadata !DIExpression()), !dbg !30
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %3) #4, !dbg !39
+  ret i32 %8, !dbg !40
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   132
+; CHECK-NEXT:        .long   132
+; CHECK-NEXT:        .long   106
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   12
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   15                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   19                      # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   30
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   37
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 5)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   44
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   48                      # BTF_KIND_FUNC(id = 6)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "sk_buff"               # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   105                     # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev"                   # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "net_device"            # string offset=19
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev_id"                # string offset=30
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "others"                # string offset=37
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ctx"                   # string offset=44
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "bpf_prog"              # string offset=48
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=57
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/llvm/test.c" # string offset=63
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "0:1:0"                 # string offset=100
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   8                       # FuncInfo
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   57                      # Field reloc section string offset=57
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   100
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare %struct.net_device* @llvm.preserve.struct.access.index.p0s_struct.net_devices.p0s_struct.sk_buffs(%struct.sk_buff*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.net_devices(%struct.net_device*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIGlobalVariableExpression(var: !5, expr: !DIExpression())
+!5 = distinct !DIGlobalVariable(name: "bpf_probe_read", scope: !0, file: !1, line: 10, type: !6, isLocal: true, isDefinition: true)
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10, !9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)"}
+!15 = distinct !DISubprogram(name: "bpf_prog", scope: !1, file: !1, line: 13, type: !16, scopeLine: 13, flags: DIFlagPrototyped, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "sk_buff", file: !1, line: 5, size: 96, elements: !20)
+!20 = !{!21, !22}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !19, file: !1, line: 6, baseType: !9, size: 32)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "dev", scope: !19, file: !1, line: 7, baseType: !23, size: 64, offset: 32)
+!23 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "net_device", file: !1, line: 1, size: 64, elements: !24)
+!24 = !{!25, !26}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "dev_id", scope: !23, file: !1, line: 2, baseType: !9, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "others", scope: !23, file: !1, line: 3, baseType: !9, size: 32, offset: 32)
+!27 = !{!28, !29}
+!28 = !DILocalVariable(name: "ctx", arg: 1, scope: !15, file: !1, line: 13, type: !18)
+!29 = !DILocalVariable(name: "dev_id", scope: !15, file: !1, line: 14, type: !9)
+!30 = !DILocation(line: 0, scope: !15)
+!31 = !DILocation(line: 14, column: 3, scope: !15)
+!32 = !DILocation(line: 15, column: 40, scope: !15)
+!33 = !DILocation(line: 15, column: 3, scope: !15)
+!34 = !DILocation(line: 16, column: 10, scope: !15)
+!35 = !{!36, !36, i64 0}
+!36 = !{!"int", !37, i64 0}
+!37 = !{!"omnipotent char", !38, i64 0}
+!38 = !{!"Simple C/C++ TBAA"}
+!39 = !DILocation(line: 17, column: 1, scope: !15)
+!40 = !DILocation(line: 16, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-1.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-1.ll
new file mode 100644
index 0000000000000..0ce6ed8b1912e
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-1.ll
@@ -0,0 +1,87 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef struct v3 { int a; int b; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&arg[1]));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !15 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !19, metadata !DIExpression()), !dbg !20
+  %0 = tail call %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 0, i32 1), !dbg !21, !llvm.preserve.access.index !4
+  %1 = getelementptr inbounds %struct.v3, %struct.v3* %0, i64 0, i32 0, !dbg !21
+  %call = tail call i32 @get_value(i32* %1) #4, !dbg !22
+  ret i32 %call, !dbg !23
+}
+
+; CHECK:              mov64 r2, 8
+; CHECK:              add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   6                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+
+; CHECK:              .ascii  "v3"                    # string offset=6
+; CHECK:              .ascii  ".text"                 # string offset=26
+; CHECK:              .byte   49                      # string offset=32
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   26                      # Field reloc section string offset=26
+; CHECK-NEXT:         .long   1
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   32
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 1, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 1, size: 64, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 1, baseType: !9, size: 32, offset: 32)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!15 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !16, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !18)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !4}
+!18 = !{!19}
+!19 = !DILocalVariable(name: "arg", arg: 1, scope: !15, file: !1, line: 4, type: !4)
+!20 = !DILocation(line: 0, scope: !15)
+!21 = !DILocation(line: 5, column: 20, scope: !15)
+!22 = !DILocation(line: 5, column: 10, scope: !15)
+!23 = !DILocation(line: 5, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-2.ll
new file mode 100644
index 0000000000000..c401fe8d311e0
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-pointer-2.ll
@@ -0,0 +1,89 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   typedef struct v3 { int a; int b; } __v3;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const int *arg);
+;   int test(__v3 *arg) {
+;     return get_value(_(&arg[1].b));
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.v3 = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.v3* %arg) local_unnamed_addr #0 !dbg !15 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.v3* %arg, metadata !19, metadata !DIExpression()), !dbg !20
+  %0 = tail call %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %arg, i32 0, i32 1), !dbg !21, !llvm.preserve.access.index !4
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3* elementtype(%struct.v3) %0, i32 1, i32 1), !dbg !21, !llvm.preserve.access.index !6
+  %call = tail call i32 @get_value(i32* %1) #4, !dbg !22
+  ret i32 %call, !dbg !23
+}
+
+; CHECK:              mov64 r2, 12
+; CHECK-NEXT:         add64 r1, r2
+; CHECK:              call get_value
+
+; CHECK:              .long   6                       # BTF_KIND_STRUCT(id = [[TID1:[0-9]+]])
+; CHECK:              .ascii  "v3"                    # string offset=6
+; CHECK:              .ascii  ".text"                 # string offset=26
+; CHECK:              .ascii  "1:1"                   # string offset=32
+
+; CHECK:              .long   16                      # FieldReloc
+; CHECK-NEXT:         .long   26                      # Field reloc section string offset=26
+; CHECK-NEXT:         .long   1
+; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   [[TID1]]
+; CHECK-NEXT:         .long   32
+; CHECK-NEXT:         .long   0
+
+declare dso_local i32 @get_value(i32*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %struct.v3* @llvm.preserve.array.access.index.p0s_struct.v3s.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.v3s(%struct.v3*, i32, i32) #2
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable willreturn }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/cast")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "__v3", file: !1, line: 1, baseType: !6)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "v3", file: !1, line: 1, size: 64, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !6, file: !1, line: 1, baseType: !9, size: 32)
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !6, file: !1, line: 1, baseType: !9, size: 32, offset: 32)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 10.0.0 (trunk 367256) (llvm/trunk 367266)"}
+!15 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 4, type: !16, scopeLine: 4, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !18)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !4}
+!18 = !{!19}
+!19 = !DILocalVariable(name: "arg", arg: 1, scope: !15, file: !1, line: 4, type: !4)
+!20 = !DILocation(line: 0, scope: !15)
+!21 = !DILocation(line: 5, column: 20, scope: !15)
+!22 = !DILocation(line: 5, column: 10, scope: !15)
+!23 = !DILocation(line: 5, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-anonymous.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-anonymous.ll
new file mode 100644
index 0000000000000..d038194589161
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-anonymous.ll
@@ -0,0 +1,215 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct sk_buff {
+;     int i;
+;     struct {
+;       int dev_id;
+;       int others;
+;     } dev[10];
+;   };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr)
+;       = (void *) 4;
+;
+;   int bpf_prog(struct sk_buff *ctx) {
+;     int dev_id;
+;     bpf_probe_read(&dev_id, sizeof(int), _(&ctx->dev[5].dev_id));
+;     return dev_id;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.sk_buff = type { i32, [10 x %struct.anon] }
+%struct.anon = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @bpf_prog(%struct.sk_buff*) local_unnamed_addr #0 !dbg !15 {
+  %2 = alloca i32, align 4
+  call void @llvm.dbg.value(metadata %struct.sk_buff* %0, metadata !31, metadata !DIExpression()), !dbg !33
+  %3 = bitcast i32* %2 to i8*, !dbg !34
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %3) #4, !dbg !34
+  %4 = tail call [10 x %struct.anon]* @llvm.preserve.struct.access.index.p0a10s_struct.anons.p0s_struct.sk_buffs(%struct.sk_buff* elementtype(%struct.sk_buff) %0, i32 1, i32 1), !dbg !35, !llvm.preserve.access.index !19
+  %5 = tail call %struct.anon* @llvm.preserve.array.access.index.p0s_struct.anons.p0a10s_struct.anons([10 x %struct.anon]* elementtype([10 x %struct.anon]) %4, i32 1, i32 5), !dbg !35, !llvm.preserve.access.index !23
+  %6 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.anons(%struct.anon* elementtype(%struct.anon) %5, i32 0, i32 0), !dbg !35, !llvm.preserve.access.index !24
+  %7 = bitcast i32* %6 to i8*, !dbg !35
+  %8 = call i32 inttoptr (i64 4 to i32 (i8*, i32, i8*)*)(i8* nonnull %3, i32 4, i8* %7) #4, !dbg !36
+  %9 = load i32, i32* %2, align 4, !dbg !37, !tbaa !38
+  call void @llvm.dbg.value(metadata i32 %9, metadata !32, metadata !DIExpression()), !dbg !33
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %3) #4, !dbg !42
+  ret i32 %9, !dbg !43
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   172
+; CHECK-NEXT:        .long   172
+; CHECK-NEXT:        .long   117
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   84
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   15                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   19
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 5)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   33                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 7)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   53
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   57                      # BTF_KIND_FUNC(id = 8)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "sk_buff"               # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   105                     # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev"                   # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev_id"                # string offset=19
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "others"                # string offset=26
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=33
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ctx"                   # string offset=53
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "bpf_prog"              # string offset=57
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=66
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/llvm/test.c" # string offset=72
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "0:1:5:0"               # string offset=109
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   8                       # FuncInfo
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   66                      # Field reloc section string offset=66
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   109
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x %struct.anon]* @llvm.preserve.struct.access.index.p0a10s_struct.anons.p0s_struct.sk_buffs(%struct.sk_buff*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare %struct.anon* @llvm.preserve.array.access.index.p0s_struct.anons.p0a10s_struct.anons([10 x %struct.anon]*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.anons(%struct.anon*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIGlobalVariableExpression(var: !5, expr: !DIExpression())
+!5 = distinct !DIGlobalVariable(name: "bpf_probe_read", scope: !0, file: !1, line: 9, type: !6, isLocal: true, isDefinition: true)
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10, !9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)"}
+!15 = distinct !DISubprogram(name: "bpf_prog", scope: !1, file: !1, line: 12, type: !16, scopeLine: 12, flags: DIFlagPrototyped, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !30)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "sk_buff", file: !1, line: 1, size: 672, elements: !20)
+!20 = !{!21, !22}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !19, file: !1, line: 2, baseType: !9, size: 32)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "dev", scope: !19, file: !1, line: 6, baseType: !23, size: 640, offset: 32)
+!23 = !DICompositeType(tag: DW_TAG_array_type, baseType: !24, size: 640, elements: !28)
+!24 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !19, file: !1, line: 3, size: 64, elements: !25)
+!25 = !{!26, !27}
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "dev_id", scope: !24, file: !1, line: 4, baseType: !9, size: 32)
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "others", scope: !24, file: !1, line: 5, baseType: !9, size: 32, offset: 32)
+!28 = !{!29}
+!29 = !DISubrange(count: 10)
+!30 = !{!31, !32}
+!31 = !DILocalVariable(name: "ctx", arg: 1, scope: !15, file: !1, line: 12, type: !18)
+!32 = !DILocalVariable(name: "dev_id", scope: !15, file: !1, line: 13, type: !9)
+!33 = !DILocation(line: 0, scope: !15)
+!34 = !DILocation(line: 13, column: 3, scope: !15)
+!35 = !DILocation(line: 14, column: 40, scope: !15)
+!36 = !DILocation(line: 14, column: 3, scope: !15)
+!37 = !DILocation(line: 15, column: 10, scope: !15)
+!38 = !{!39, !39, i64 0}
+!39 = !{!"int", !40, i64 0}
+!40 = !{!"omnipotent char", !41, i64 0}
+!41 = !{!"Simple C/C++ TBAA"}
+!42 = !DILocation(line: 16, column: 1, scope: !15)
+!43 = !DILocation(line: 15, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-array.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-array.ll
new file mode 100644
index 0000000000000..b365c85902d21
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-struct-array.ll
@@ -0,0 +1,218 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   struct net_device {
+;     int dev_id;
+;     int others;
+;   };
+;   struct sk_buff {
+;     int i;
+;     struct net_device dev[10];
+;   };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr)
+;       = (void *) 4;
+;
+;   int bpf_prog(struct sk_buff *ctx) {
+;     int dev_id;
+;     bpf_probe_read(&dev_id, sizeof(int), _(&ctx->dev[5].dev_id));
+;     return dev_id;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.sk_buff = type { i32, [10 x %struct.net_device] }
+%struct.net_device = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @bpf_prog(%struct.sk_buff*) local_unnamed_addr #0 !dbg !15 {
+  %2 = alloca i32, align 4
+  call void @llvm.dbg.value(metadata %struct.sk_buff* %0, metadata !31, metadata !DIExpression()), !dbg !33
+  %3 = bitcast i32* %2 to i8*, !dbg !34
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %3) #4, !dbg !34
+  %4 = tail call [10 x %struct.net_device]* @llvm.preserve.struct.access.index.p0a10s_struct.net_devices.p0s_struct.sk_buffs(%struct.sk_buff* elementtype(%struct.sk_buff) %0, i32 1, i32 1), !dbg !35, !llvm.preserve.access.index !19
+  %5 = tail call %struct.net_device* @llvm.preserve.array.access.index.p0s_struct.net_devices.p0a10s_struct.net_devices([10 x %struct.net_device]* elementtype([10 x %struct.net_device]) %4, i32 1, i32 5), !dbg !35, !llvm.preserve.access.index !23
+  %6 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.net_devices(%struct.net_device* elementtype(%struct.net_device) %5, i32 0, i32 0), !dbg !35, !llvm.preserve.access.index !24
+  %7 = bitcast i32* %6 to i8*, !dbg !35
+  %8 = call i32 inttoptr (i64 4 to i32 (i8*, i32, i8*)*)(i8* nonnull %3, i32 4, i8* %7) #4, !dbg !36
+  %9 = load i32, i32* %2, align 4, !dbg !37, !tbaa !38
+  call void @llvm.dbg.value(metadata i32 %9, metadata !32, metadata !DIExpression()), !dbg !33
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %3) #4, !dbg !42
+  ret i32 %9, !dbg !43
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   172
+; CHECK-NEXT:        .long   172
+; CHECK-NEXT:        .long   128
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_STRUCT(id = 2)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   84
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   15                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   19                      # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   30
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   37
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_ARRAY(id = 5)
+; CHECK-NEXT:        .long   50331648                # 0x3000000
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .long   10
+; CHECK-NEXT:        .long   44                      # BTF_KIND_INT(id = 6)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 7)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   64
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   68                      # BTF_KIND_FUNC(id = 8)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   7
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "sk_buff"               # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   105                     # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev"                   # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=15
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "net_device"            # string offset=19
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev_id"                # string offset=30
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "others"                # string offset=37
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "__ARRAY_SIZE_TYPE__"   # string offset=44
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ctx"                   # string offset=64
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "bpf_prog"              # string offset=68
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=77
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/llvm/test.c" # string offset=83
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "0:1:5:0"               # string offset=120
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   8                       # FuncInfo
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   77                      # Field reloc section string offset=77
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   120
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare [10 x %struct.net_device]* @llvm.preserve.struct.access.index.p0a10s_struct.net_devices.p0s_struct.sk_buffs(%struct.sk_buff*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare %struct.net_device* @llvm.preserve.array.access.index.p0s_struct.net_devices.p0a10s_struct.net_devices([10 x %struct.net_device]*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.net_devices(%struct.net_device*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIGlobalVariableExpression(var: !5, expr: !DIExpression())
+!5 = distinct !DIGlobalVariable(name: "bpf_probe_read", scope: !0, file: !1, line: 10, type: !6, isLocal: true, isDefinition: true)
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10, !9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)"}
+!15 = distinct !DISubprogram(name: "bpf_prog", scope: !1, file: !1, line: 13, type: !16, scopeLine: 13, flags: DIFlagPrototyped, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !30)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "sk_buff", file: !1, line: 5, size: 672, elements: !20)
+!20 = !{!21, !22}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !19, file: !1, line: 6, baseType: !9, size: 32)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "dev", scope: !19, file: !1, line: 7, baseType: !23, size: 640, offset: 32)
+!23 = !DICompositeType(tag: DW_TAG_array_type, baseType: !24, size: 640, elements: !28)
+!24 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "net_device", file: !1, line: 1, size: 64, elements: !25)
+!25 = !{!26, !27}
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "dev_id", scope: !24, file: !1, line: 2, baseType: !9, size: 32)
+!27 = !DIDerivedType(tag: DW_TAG_member, name: "others", scope: !24, file: !1, line: 3, baseType: !9, size: 32, offset: 32)
+!28 = !{!29}
+!29 = !DISubrange(count: 10)
+!30 = !{!31, !32}
+!31 = !DILocalVariable(name: "ctx", arg: 1, scope: !15, file: !1, line: 13, type: !18)
+!32 = !DILocalVariable(name: "dev_id", scope: !15, file: !1, line: 14, type: !9)
+!33 = !DILocation(line: 0, scope: !15)
+!34 = !DILocation(line: 14, column: 3, scope: !15)
+!35 = !DILocation(line: 15, column: 40, scope: !15)
+!36 = !DILocation(line: 15, column: 3, scope: !15)
+!37 = !DILocation(line: 16, column: 10, scope: !15)
+!38 = !{!39, !39, i64 0}
+!39 = !{!"int", !40, i64 0}
+!40 = !{!"omnipotent char", !41, i64 0}
+!41 = !{!"Simple C/C++ TBAA"}
+!42 = !DILocation(line: 17, column: 1, scope: !15)
+!43 = !DILocation(line: 16, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-array.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-array.ll
new file mode 100644
index 0000000000000..036e8d0e3fb51
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-array.ll
@@ -0,0 +1,101 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   typedef const int arr_t[7];
+;   typedef arr_t __arr;
+;   typedef __arr _arr;
+;   struct __s { _arr a; };
+;   typedef struct __s s;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr);
+;   int test(s *arg) {
+;     return get_value(_(&arg->a[1]));
+;   }
+; clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.__s = type { [7 x i32] }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.__s* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.__s* %arg, metadata !24, metadata !DIExpression()), !dbg !25
+  %0 = tail call [7 x i32]* @llvm.preserve.struct.access.index.p0a7i32.p0s_struct.__ss(%struct.__s* elementtype(%struct.__s) %arg, i32 0, i32 0), !dbg !26, !llvm.preserve.access.index !13
+  %1 = tail call i32* @llvm.preserve.array.access.index.p0i32.p0a7i32([7 x i32]* elementtype([7 x i32]) %0, i32 1, i32 1), !dbg !26, !llvm.preserve.access.index !19
+  %2 = bitcast i32* %1 to i8*, !dbg !26
+  %call = tail call i32 @get_value(i8* %2) #4, !dbg !27
+  ret i32 %call, !dbg !28
+}
+
+; CHECK:        .cfi_startproc
+; CHECK: [[RELOC:.Ltmp[0-9]+]]:
+; CHECK:         mov64 r2, 4
+; CHECK:         add64 r1, r2
+; CHECK:         call get_value
+
+; CHECK:         .long   {{[0-9]+}}              # BTF_KIND_STRUCT(id = [[TYPE_ID:[0-9]+]])
+; CHECK:         .ascii  ".text"                 # string offset=[[SEC_INDEX:[0-9]+]]
+; CHECK-NEXT:    .byte   0
+; CHECK:         .ascii  "0:0:1"                 # string offset=[[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:    .byte   0
+; CHECK:         .long   16                      # FieldReloc
+; CHECK-NEXT:    .long   [[SEC_INDEX]]           # Field reloc section string offset=[[SEC_INDEX]]
+; CHECK-NEXT:    .long   1
+; CHECK-NEXT:    .long   [[RELOC]]
+; CHECK-NEXT:    .long   [[TYPE_ID]]
+; CHECK-NEXT:    .long   [[ACCESS_STR]]
+; CHECK-NEXT:    .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare [7 x i32]* @llvm.preserve.struct.access.index.p0a7i32.p0s_struct.__ss(%struct.__s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.array.access.index.p0i32.p0a7i32([7 x i32]*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !8, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !23)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "s", file: !1, line: 5, baseType: !13)
+!13 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "__s", file: !1, line: 4, size: 224, elements: !14)
+!14 = !{!15}
+!15 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !13, file: !1, line: 4, baseType: !16, size: 224)
+!16 = !DIDerivedType(tag: DW_TAG_typedef, name: "_arr", file: !1, line: 3, baseType: !17)
+!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "__arr", file: !1, line: 2, baseType: !18)
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "arr_t", file: !1, line: 1, baseType: !19)
+!19 = !DICompositeType(tag: DW_TAG_array_type, baseType: !20, size: 224, elements: !21)
+!20 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !10)
+!21 = !{!22}
+!22 = !DISubrange(count: 7)
+!23 = !{!24}
+!24 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 8, type: !11)
+!25 = !DILocation(line: 0, scope: !7)
+!26 = !DILocation(line: 9, column: 20, scope: !7)
+!27 = !DILocation(line: 9, column: 10, scope: !7)
+!28 = !DILocation(line: 9, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct-2.ll
new file mode 100644
index 0000000000000..551978bdccfaf
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct-2.ll
@@ -0,0 +1,92 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   #pragma clang attribute push (__attribute__((preserve_access_index)), apply_to = record)
+;   typedef struct {
+;     int a;
+;   } __t;
+;   #pragma clang attribute pop
+;
+;   int test(__t *arg) { return arg->a; }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.__t = type { i32 }
+
+; Function Attrs: nounwind readonly
+define dso_local i32 @test(%struct.__t* readonly %arg) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.__t* %arg, metadata !18, metadata !DIExpression()), !dbg !19
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.__ts(%struct.__t* elementtype(%struct.__t) %arg, i32 0, i32 0), !dbg !20, !llvm.preserve.access.index !4
+  %1 = load i32, i32* %0, align 4, !dbg !20, !tbaa !21
+  ret i32 %1, !dbg !26
+}
+
+; CHECK:             .long   1                       # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 3)
+; CHECK-NEXT:        .long   67108865                # 0x4000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                       # 0x0
+;
+; CHECK:             .ascii  "__t"                   # string offset=1
+; CHECK:             .byte   97                      # string offset=5
+; CHECK:             .ascii  ".text"                 # string offset=20
+; CHECK:             .ascii  "0:0"                   # string offset=26
+;
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.__ts(%struct.__t*, i32, i32) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5125d1c934efa69ffc1902ce3b8f2f288653a92f)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core_bug")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_typedef, name: "__t", file: !1, line: 4, baseType: !5)
+!5 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !1, line: 2, size: 32, elements: !6)
+!6 = !{!7}
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !5, file: !1, line: 3, baseType: !8, size: 32)
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5125d1c934efa69ffc1902ce3b8f2f288653a92f)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 7, type: !14, scopeLine: 7, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !17)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!8, !16}
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!17 = !{!18}
+!18 = !DILocalVariable(name: "arg", arg: 1, scope: !13, file: !1, line: 7, type: !16)
+!19 = !DILocation(line: 0, scope: !13)
+!20 = !DILocation(line: 7, column: 34, scope: !13)
+!21 = !{!22, !23, i64 0}
+!22 = !{!"", !23, i64 0}
+!23 = !{!"int", !24, i64 0}
+!24 = !{!"omnipotent char", !25, i64 0}
+!25 = !{!"Simple C/C++ TBAA"}
+!26 = !DILocation(line: 7, column: 22, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct.ll
new file mode 100644
index 0000000000000..26ab10cb05690
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-struct.ll
@@ -0,0 +1,94 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   typedef int _int;
+;   typedef _int __int;
+;   struct __s { __int a; __int b; };
+;   typedef struct __s _s;
+;   typedef _s s;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr);
+;   int test(s *arg) {
+;     return get_value(_(&arg->b));
+;   }
+; clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.__s = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.__s* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %struct.__s* %arg, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.__ss(%struct.__s* elementtype(%struct.__s) %arg, i32 1, i32 1), !dbg !23, !llvm.preserve.access.index !14
+  %1 = bitcast i32* %0 to i8*, !dbg !23
+  %call = tail call i32 @get_value(i8* %1) #4, !dbg !24
+  ret i32 %call, !dbg !25
+}
+
+; CHECK:        .cfi_startproc
+; CHECK:        [[RELOC:.Ltmp[0-9]+]]:
+; CHECK:        mov64 r2, 4
+; CHECK:        add64 r1, r2
+; CHECK:        call get_value
+
+; CHECK:        .long   {{[0-9]+}}              # BTF_KIND_STRUCT(id = [[TYPE_ID:[0-9]+]])
+; CHECK:        .ascii  ".text"                 # string offset=[[SEC_STR:[0-9]+]]
+; CHECK-NEXT:   .byte   0
+; CHECK:        .ascii  "0:1"                   # string offset=[[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:   .byte   0
+; CHECK:        .long   16                      # FieldReloc
+; CHECK-NEXT:   .long   [[SEC_STR]]             # Field reloc section string offset={{[0-9]+}}
+; CHECK-NEXT:   .long   1
+; CHECK-NEXT:   .long   [[RELOC]]
+; CHECK-NEXT:   .long   [[TYPE_ID]]
+; CHECK-NEXT:   .long   [[ACCESS_STR]]
+; CHECK-NEXT:   .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.__ss(%struct.__s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !8, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !20)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "s", file: !1, line: 5, baseType: !13)
+!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "_s", file: !1, line: 4, baseType: !14)
+!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "__s", file: !1, line: 3, size: 64, elements: !15)
+!15 = !{!16, !19}
+!16 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !14, file: !1, line: 3, baseType: !17, size: 32)
+!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 2, baseType: !18)
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !1, line: 1, baseType: !10)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !14, file: !1, line: 3, baseType: !17, size: 32, offset: 32)
+!20 = !{!21}
+!21 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 8, type: !11)
+!22 = !DILocation(line: 0, scope: !7)
+!23 = !DILocation(line: 9, column: 20, scope: !7)
+!24 = !DILocation(line: 9, column: 10, scope: !7)
+!25 = !DILocation(line: 9, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union-2.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union-2.ll
new file mode 100644
index 0000000000000..c089259b19b8a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union-2.ll
@@ -0,0 +1,91 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   #pragma clang attribute push (__attribute__((preserve_access_index)), apply_to = record)
+;   typedef union {
+;     int a;
+;   } __t;
+;   #pragma clang attribute pop
+;
+;   int test(__t *arg) { return arg->a; }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.__t = type { i32 }
+
+; Function Attrs: nounwind readonly
+define dso_local i32 @test(%union.__t* readonly %arg) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata %union.__t* %arg, metadata !18, metadata !DIExpression()), !dbg !19
+  %0 = tail call %union.__t* @llvm.preserve.union.access.index.p0s_union.__ts.p0s_union.__ts(%union.__t* %arg, i32 0), !dbg !20, !llvm.preserve.access.index !4
+  %a = getelementptr %union.__t, %union.__t* %0, i64 0, i32 0, !dbg !20
+  %1 = load i32, i32* %a, align 4, !dbg !20, !tbaa !21
+  ret i32 %1, !dbg !24
+}
+
+; CHECK:             .long   1                       # BTF_KIND_TYPEDEF(id = 2)
+; CHECK-NEXT:        .long   134217728               # 0x8000000
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # BTF_KIND_UNION(id = 3)
+; CHECK-NEXT:        .long   83886081                # 0x5000001
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                       # 0x0
+;
+; CHECK:             .ascii  "__t"                   # string offset=1
+; CHECK:             .byte   97                      # string offset=5
+; CHECK:             .ascii  ".text"                 # string offset=20
+; CHECK:             .ascii  "0:0"                   # string offset=26
+;
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   20                      # Field reloc section string offset=20
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   26
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: nounwind readnone
+declare %union.__t* @llvm.preserve.union.access.index.p0s_union.__ts.p0s_union.__ts(%union.__t*, i32) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #2
+
+attributes #0 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+attributes #2 = { nounwind readnone speculatable}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5125d1c934efa69ffc1902ce3b8f2f288653a92f)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core_bug")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIDerivedType(tag: DW_TAG_typedef, name: "__t", file: !1, line: 4, baseType: !5)
+!5 = distinct !DICompositeType(tag: DW_TAG_union_type, file: !1, line: 2, size: 32, elements: !6)
+!6 = !{!7}
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !5, file: !1, line: 3, baseType: !8, size: 32)
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !{i32 7, !"Dwarf Version", i32 4}
+!10 = !{i32 2, !"Debug Info Version", i32 3}
+!11 = !{i32 1, !"wchar_size", i32 4}
+!12 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 5125d1c934efa69ffc1902ce3b8f2f288653a92f)"}
+!13 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 7, type: !14, scopeLine: 7, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !17)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!8, !16}
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!17 = !{!18}
+!18 = !DILocalVariable(name: "arg", arg: 1, scope: !13, file: !1, line: 7, type: !16)
+!19 = !DILocation(line: 0, scope: !13)
+!20 = !DILocation(line: 7, column: 34, scope: !13)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"omnipotent char", !23, i64 0}
+!23 = !{!"Simple C/C++ TBAA"}
+!24 = !DILocation(line: 7, column: 22, scope: !13)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union.ll
new file mode 100644
index 0000000000000..feee49e522ada
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef-union.ll
@@ -0,0 +1,94 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   typedef int _int;
+;   typedef _int __int;
+;   union __s { __int a; __int b; };
+;   typedef union __s _s;
+;   typedef _s s;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr);
+;   int test(s *arg) {
+;     return get_value(_(&arg->b));
+;   }
+; clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.__s = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%union.__s* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata %union.__s* %arg, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = tail call %union.__s* @llvm.preserve.union.access.index.p0s_union.__ss.p0s_union.__ss(%union.__s* %arg, i32 1), !dbg !23, !llvm.preserve.access.index !14
+  %1 = bitcast %union.__s* %0 to i8*, !dbg !23
+  %call = tail call i32 @get_value(i8* %1) #4, !dbg !24
+  ret i32 %call, !dbg !25
+}
+
+; CHECK:        .cfi_startproc
+; CHECK: [[RELOC:.Ltmp[0-9]+]]:
+; CHECK:         mov64 r2, 0
+; CHECK:         add64 r1, r2
+; CHECK:         call get_value
+
+; CHECK:         .long   {{[0-9]+}}              # BTF_KIND_UNION(id = [[TYPE_ID:[0-9]+]])
+; CHECK:         .ascii  ".text"                 # string offset=[[SEC_INDEX:[0-9]+]]
+; CHECK-NEXT:    .byte   0
+; CHECK:         .ascii  "0:1"                   # string offset=[[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:    .byte   0
+; CHECK:         .long   16                      # FieldReloc
+; CHECK-NEXT:    .long   [[SEC_INDEX]]           # Field reloc section string offset=[[SEC_INDEX]]
+; CHECK-NEXT:    .long   1
+; CHECK-NEXT:    .long   [[RELOC]]
+; CHECK-NEXT:    .long   [[TYPE_ID]]
+; CHECK-NEXT:    .long   [[ACCESS_STR]]
+; CHECK-NEXT:    .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare %union.__s* @llvm.preserve.union.access.index.p0s_union.__ss.p0s_union.__ss(%union.__s*, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 8, type: !8, scopeLine: 8, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !20)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "s", file: !1, line: 5, baseType: !13)
+!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "_s", file: !1, line: 4, baseType: !14)
+!14 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "__s", file: !1, line: 3, size: 32, elements: !15)
+!15 = !{!16, !19}
+!16 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !14, file: !1, line: 3, baseType: !17, size: 32)
+!17 = !DIDerivedType(tag: DW_TAG_typedef, name: "__int", file: !1, line: 2, baseType: !18)
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "_int", file: !1, line: 1, baseType: !10)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !14, file: !1, line: 3, baseType: !17, size: 32)
+!20 = !{!21}
+!21 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 8, type: !11)
+!22 = !DILocation(line: 0, scope: !7)
+!23 = !DILocation(line: 9, column: 20, scope: !7)
+!24 = !DILocation(line: 9, column: 10, scope: !7)
+!25 = !DILocation(line: 9, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef.ll
new file mode 100644
index 0000000000000..a07cf0a9bd3b4
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-typedef.ll
@@ -0,0 +1,115 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+;
+; Source code:
+;   struct s { int a; int b; };
+;   typedef struct s __s;
+;   union u { __s c; __s d; };
+;   typedef union u __u;
+;   typedef __u arr_t[7];
+;   typedef arr_t __arr;
+;
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   int get_value(const void *addr);
+;   int test(__arr *arg) {
+;     return get_value(_(&arg[1]->d.b));
+;   }
+; clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+; The offset reloc offset should be 12 from the base "arg".
+
+target triple = "sbf"
+
+%union.u = type { %struct.s }
+%struct.s = type { i32, i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test([7 x %union.u]* %arg) local_unnamed_addr #0 !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata [7 x %union.u]* %arg, metadata !28, metadata !DIExpression()), !dbg !29
+  %0 = tail call [7 x %union.u]* @llvm.preserve.array.access.index.p0a7s_union.us.p0a7s_union.us([7 x %union.u]* elementtype([7 x %union.u]) %arg, i32 0, i32 1), !dbg !30, !llvm.preserve.access.index !14
+  %arraydecay = getelementptr inbounds [7 x %union.u], [7 x %union.u]* %0, i64 0, i64 0, !dbg !30
+  %1 = tail call %union.u* @llvm.preserve.union.access.index.p0s_union.us.p0s_union.us(%union.u* %arraydecay, i32 1), !dbg !30, !llvm.preserve.access.index !16
+  %d = getelementptr inbounds %union.u, %union.u* %1, i64 0, i32 0, !dbg !30
+  %2 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* elementtype(%struct.s) %d, i32 1, i32 1), !dbg !30, !llvm.preserve.access.index !20
+  %3 = bitcast i32* %2 to i8*, !dbg !30
+  %call = tail call i32 @get_value(i8* %3) #4, !dbg !31
+  ret i32 %call, !dbg !32
+}
+
+; CHECK:         .cfi_startproc
+; CHECK: [[RELOC:.Ltmp[0-9]+]]:
+; CHECK:         mov64 r2, 12
+; CHECK:         add64 r1, r2
+; CHECK:         call get_value
+
+; CHECK:         .long   {{[0-9]+}}              # BTF_KIND_UNION(id = [[TYPE_ID:[0-9]+]])
+; CHECK:         .ascii  ".text"                 # string offset=[[SEC_STR:[0-9]+]]
+; CHECK-NEXT:    .byte   0
+; CHECK:         .ascii  "1:1:1"                 # string offset=[[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:    .byte   0
+; CHECK:         .long   16                      # FieldReloc
+; CHECK-NEXT:    .long   [[SEC_STR:[0-9]+]]      # Field reloc section string offset=[[SEC_STR:[0-9]+]]
+; CHECK-NEXT:    .long   1
+; CHECK-NEXT:    .long   [[RELOC:.Ltmp[0-9]+]]
+; CHECK-NEXT:    .long   [[TYPE_ID:[0-9]+]]
+; CHECK-NEXT:    .long   [[ACCESS_STR:[0-9]+]]
+; CHECK-NEXT:    .long   0
+
+declare dso_local i32 @get_value(i8*) local_unnamed_addr #1
+
+; Function Attrs: nounwind readnone
+declare [7 x %union.u]* @llvm.preserve.array.access.index.p0a7s_union.us.p0a7s_union.us([7 x %union.u]*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare %union.u* @llvm.preserve.union.access.index.p0s_union.us.p0s_union.us(%union.u*, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm/core-bugs")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 10.0.0 (trunk 366831) (llvm/trunk 366867)"}
+!7 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 10, type: !8, scopeLine: 10, flags: DIFlagPrototyped, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !27)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10, !11}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "__arr", file: !1, line: 6, baseType: !13)
+!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "arr_t", file: !1, line: 5, baseType: !14)
+!14 = !DICompositeType(tag: DW_TAG_array_type, baseType: !15, size: 448, elements: !25)
+!15 = !DIDerivedType(tag: DW_TAG_typedef, name: "__u", file: !1, line: 4, baseType: !16)
+!16 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "u", file: !1, line: 3, size: 64, elements: !17)
+!17 = !{!18, !24}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "c", scope: !16, file: !1, line: 3, baseType: !19, size: 64)
+!19 = !DIDerivedType(tag: DW_TAG_typedef, name: "__s", file: !1, line: 2, baseType: !20)
+!20 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "s", file: !1, line: 1, size: 64, elements: !21)
+!21 = !{!22, !23}
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !20, file: !1, line: 1, baseType: !10, size: 32)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !20, file: !1, line: 1, baseType: !10, size: 32, offset: 32)
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !16, file: !1, line: 3, baseType: !19, size: 64)
+!25 = !{!26}
+!26 = !DISubrange(count: 7)
+!27 = !{!28}
+!28 = !DILocalVariable(name: "arg", arg: 1, scope: !7, file: !1, line: 10, type: !11)
+!29 = !DILocation(line: 0, scope: !7)
+!30 = !DILocation(line: 11, column: 20, scope: !7)
+!31 = !DILocation(line: 11, column: 10, scope: !7)
+!32 = !DILocation(line: 11, column: 3, scope: !7)
diff --git a/llvm/test/CodeGen/SBF/CORE/offset-reloc-union.ll b/llvm/test/CodeGen/SBF/CORE/offset-reloc-union.ll
new file mode 100644
index 0000000000000..2f2aa7db4f977
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/offset-reloc-union.ll
@@ -0,0 +1,222 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck -check-prefixes=CHECK %s
+; Source code:
+;   union sk_buff {
+;     int i;
+;     struct {
+;       int netid;
+;       union {
+;         int dev_id;
+;         int others;
+;       } dev;
+;     } u;
+;   };
+;   #define _(x) (__builtin_preserve_access_index(x))
+;   static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr)
+;       = (void *) 4;
+;
+;   int bpf_prog(union sk_buff *ctx) {
+;     int dev_id;
+;     bpf_probe_read(&dev_id, sizeof(int), _(&ctx->u.dev.dev_id));
+;     return dev_id;
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%union.sk_buff = type { %struct.anon }
+%struct.anon = type { i32, %union.anon }
+%union.anon = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @bpf_prog(%union.sk_buff*) local_unnamed_addr #0 !dbg !15 {
+  %2 = alloca i32, align 4
+  call void @llvm.dbg.value(metadata %union.sk_buff* %0, metadata !32, metadata !DIExpression()), !dbg !34
+  %3 = bitcast i32* %2 to i8*, !dbg !35
+  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %3) #4, !dbg !35
+  %4 = tail call %union.sk_buff* @llvm.preserve.union.access.index.p0s_union.sk_buffs.p0s_union.sk_buffs(%union.sk_buff* %0, i32 1), !dbg !36, !llvm.preserve.access.index !19
+  %5 = getelementptr inbounds %union.sk_buff, %union.sk_buff* %4, i64 0, i32 0, !dbg !36
+  %6 = tail call %union.anon* @llvm.preserve.struct.access.index.p0s_union.anons.p0s_struct.anons(%struct.anon* elementtype(%struct.anon) %5, i32 1, i32 1), !dbg !36, !llvm.preserve.access.index !23
+  %7 = tail call %union.anon* @llvm.preserve.union.access.index.p0s_union.anons.p0s_union.anons(%union.anon* %6, i32 0), !dbg !36, !llvm.preserve.access.index !27
+  %8 = bitcast %union.anon* %7 to i8*, !dbg !36
+  %9 = call i32 inttoptr (i64 4 to i32 (i8*, i32, i8*)*)(i8* nonnull %3, i32 4, i8* %8) #4, !dbg !37
+  %10 = load i32, i32* %2, align 4, !dbg !38, !tbaa !39
+  call void @llvm.dbg.value(metadata i32 %10, metadata !33, metadata !DIExpression()), !dbg !34
+  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %3) #4, !dbg !43
+  ret i32 %10, !dbg !44
+}
+
+; CHECK:             .section        .BTF,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   24
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   168
+; CHECK-NEXT:        .long   168
+; CHECK-NEXT:        .long   105
+; CHECK-NEXT:        .long   0                       # BTF_KIND_PTR(id = 1)
+; CHECK-NEXT:        .long   33554432                # 0x2000000
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   1                       # BTF_KIND_UNION(id = 2)
+; CHECK-NEXT:        .long   83886082                # 0x5000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   9
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   11
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   13                      # BTF_KIND_INT(id = 3)
+; CHECK-NEXT:        .long   16777216                # 0x1000000
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   16777248                # 0x1000020
+; CHECK-NEXT:        .long   0                       # BTF_KIND_STRUCT(id = 4)
+; CHECK-NEXT:        .long   67108866                # 0x4000002
+; CHECK-NEXT:        .long   8
+; CHECK-NEXT:        .long   17
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   23
+; CHECK-NEXT:        .long   5
+; CHECK-NEXT:        .long   32                      # 0x20
+; CHECK-NEXT:        .long   0                       # BTF_KIND_UNION(id = 5)
+; CHECK-NEXT:        .long   83886082                # 0x5000002
+; CHECK-NEXT:        .long   4
+; CHECK-NEXT:        .long   27
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   34
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   0                       # 0x0
+; CHECK-NEXT:        .long   0                       # BTF_KIND_FUNC_PROTO(id = 6)
+; CHECK-NEXT:        .long   218103809               # 0xd000001
+; CHECK-NEXT:        .long   3
+; CHECK-NEXT:        .long   41
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   45                      # BTF_KIND_FUNC(id = 7)
+; CHECK-NEXT:        .long   201326593               # 0xc000001
+; CHECK-NEXT:        .long   6
+; CHECK-NEXT:        .byte   0                       # string offset=0
+; CHECK-NEXT:        .ascii  "sk_buff"               # string offset=1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   105                     # string offset=9
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .byte   117                     # string offset=11
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "int"                   # string offset=13
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "netid"                 # string offset=17
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev"                   # string offset=23
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "dev_id"                # string offset=27
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "others"                # string offset=34
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "ctx"                   # string offset=41
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "bpf_prog"              # string offset=45
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  ".text"                 # string offset=54
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "/tmp/home/yhs/work/tests/llvm/test.c" # string offset=60
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .ascii  "0:1:1:0"               # string offset=97
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .section        .BTF.ext,"",@progbits
+; CHECK-NEXT:        .short  60319                   # 0xeb9f
+; CHECK-NEXT:        .byte   1
+; CHECK-NEXT:        .byte   0
+; CHECK-NEXT:        .long   32
+; CHECK-NEXT:        .long   0
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   20
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   {{[0-9]+}}
+; CHECK-NEXT:        .long   28
+; CHECK-NEXT:        .long   8                       # FuncInfo
+
+; CHECK:             .long   16                      # FieldReloc
+; CHECK-NEXT:        .long   54                      # Field reloc section string offset=54
+; CHECK-NEXT:        .long   1
+; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   2
+; CHECK-NEXT:        .long   97
+; CHECK-NEXT:        .long   0
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone
+declare %union.sk_buff* @llvm.preserve.union.access.index.p0s_union.sk_buffs.p0s_union.sk_buffs(%union.sk_buff*, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare %union.anon* @llvm.preserve.struct.access.index.p0s_union.anons.p0s_struct.anons(%struct.anon*, i32 immarg, i32 immarg) #2
+
+; Function Attrs: nounwind readnone
+declare %union.anon* @llvm.preserve.union.access.index.p0s_union.anons.p0s_union.anons(%union.anon*, i32 immarg) #2
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { argmemonly nounwind }
+attributes #2 = { nounwind readnone }
+attributes #3 = { nounwind readnone speculatable }
+attributes #4 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/llvm")
+!2 = !{}
+!3 = !{!4}
+!4 = !DIGlobalVariableExpression(var: !5, expr: !DIExpression())
+!5 = distinct !DIGlobalVariable(name: "bpf_probe_read", scope: !0, file: !1, line: 12, type: !6, isLocal: true, isDefinition: true)
+!6 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !10, !9, !10}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 9.0.0 (trunk 360739) (llvm/trunk 360747)"}
+!15 = distinct !DISubprogram(name: "bpf_prog", scope: !1, file: !1, line: 15, type: !16, scopeLine: 15, flags: DIFlagPrototyped, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, retainedNodes: !31)
+!16 = !DISubroutineType(types: !17)
+!17 = !{!9, !18}
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "sk_buff", file: !1, line: 1, size: 64, elements: !20)
+!20 = !{!21, !22}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !19, file: !1, line: 2, baseType: !9, size: 32)
+!22 = !DIDerivedType(tag: DW_TAG_member, name: "u", scope: !19, file: !1, line: 9, baseType: !23, size: 64)
+!23 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !19, file: !1, line: 3, size: 64, elements: !24)
+!24 = !{!25, !26}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "netid", scope: !23, file: !1, line: 4, baseType: !9, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "dev", scope: !23, file: !1, line: 8, baseType: !27, size: 32, offset: 32)
+!27 = distinct !DICompositeType(tag: DW_TAG_union_type, scope: !23, file: !1, line: 5, size: 32, elements: !28)
+!28 = !{!29, !30}
+!29 = !DIDerivedType(tag: DW_TAG_member, name: "dev_id", scope: !27, file: !1, line: 6, baseType: !9, size: 32)
+!30 = !DIDerivedType(tag: DW_TAG_member, name: "others", scope: !27, file: !1, line: 7, baseType: !9, size: 32)
+!31 = !{!32, !33}
+!32 = !DILocalVariable(name: "ctx", arg: 1, scope: !15, file: !1, line: 15, type: !18)
+!33 = !DILocalVariable(name: "dev_id", scope: !15, file: !1, line: 16, type: !9)
+!34 = !DILocation(line: 0, scope: !15)
+!35 = !DILocation(line: 16, column: 3, scope: !15)
+!36 = !DILocation(line: 17, column: 40, scope: !15)
+!37 = !DILocation(line: 17, column: 3, scope: !15)
+!38 = !DILocation(line: 18, column: 10, scope: !15)
+!39 = !{!40, !40, i64 0}
+!40 = !{!"int", !41, i64 0}
+!41 = !{!"omnipotent char", !42, i64 0}
+!42 = !{!"Simple C/C++ TBAA"}
+!43 = !DILocation(line: 19, column: 1, scope: !15)
+!44 = !DILocation(line: 18, column: 3, scope: !15)
diff --git a/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll b/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
new file mode 100644
index 0000000000000..162f98a5902fa
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
@@ -0,0 +1,136 @@
+; RUN: llc -sbf-enable-btf-emission -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+; Source code:
+;   struct t3 {
+;     int i;
+;   } __attribute__((preserve_access_index));
+;   struct t2 {
+;     void *pad;
+;     struct t3 *f;
+;  } __attribute__((preserve_access_index));
+;  struct t1 {
+;    void *pad;
+;    struct t2 *q;
+;  } __attribute__((preserve_access_index));
+;
+;  int g;
+;  int test(struct t1 *p) {
+;    struct t2 *q = p->q;
+;    if (q)
+;      return 0;
+;    struct t3 *f = q->f;
+;    if (!f) g = 5;
+;    return 0;
+;  }
+; Compilation flag:
+;   clang -target bpf -O2 -g -S -emit-llvm t.c
+
+@g = dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+@"llvm.t2:0:8$0:1" = external global i64, !llvm.preserve.access.index !6 #0
+@"llvm.t1:0:8$0:1" = external global i64, !llvm.preserve.access.index !15 #0
+
+; Function Attrs: mustprogress nofree nosync nounwind willreturn
+define dso_local i32 @test(ptr noundef readonly %p) local_unnamed_addr #1 !dbg !25 {
+entry:
+  call void @llvm.dbg.value(metadata ptr %p, metadata !30, metadata !DIExpression()), !dbg !33
+  %0 = load i64, ptr @"llvm.t1:0:8$0:1", align 8
+  %1 = getelementptr i8, ptr %p, i64 %0
+  %2 = tail call ptr @llvm.bpf.passthrough.p0.p0(i32 1, ptr %1)
+  %3 = load ptr, ptr %2, align 8, !dbg !34, !tbaa !35
+  call void @llvm.dbg.value(metadata ptr %3, metadata !31, metadata !DIExpression()), !dbg !33
+  %tobool.not = icmp eq ptr %3, null, !dbg !40
+  br i1 %tobool.not, label %if.end, label %cleanup, !dbg !42
+
+; CHECK-LABEL: test
+; CHECK:       ldxdw r1, [r1 + 8]
+; CHECK:       jne r1, 0,
+
+if.end:                                           ; preds = %entry
+  %4 = load i64, ptr @"llvm.t2:0:8$0:1", align 8
+  %5 = getelementptr i8, ptr null, i64 %4
+  %6 = tail call ptr @llvm.bpf.passthrough.p0.p0(i32 0, ptr %5)
+  %7 = load ptr, ptr %6, align 8, !dbg !43, !tbaa !44
+  call void @llvm.dbg.value(metadata ptr %7, metadata !32, metadata !DIExpression()), !dbg !33
+  %tobool1.not = icmp eq ptr %7, null, !dbg !46
+  br i1 %tobool1.not, label %if.then2, label %cleanup, !dbg !48
+
+; CHECK:       mov64 r1, 8
+; CHECK:       ldxdw r1, [r1 + 0]
+; CHECK:       jne r1, 0,
+
+if.then2:                                         ; preds = %if.end
+  store i32 5, ptr @g, align 4, !dbg !49, !tbaa !50
+  br label %cleanup, !dbg !52
+
+cleanup:                                          ; preds = %if.end, %if.then2, %entry
+  ret i32 0, !dbg !53
+}
+
+; Function Attrs: nofree nosync nounwind readnone
+declare ptr @llvm.bpf.passthrough.p0.p0(i32, ptr) #2
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { "btf_ama" }
+attributes #1 = { mustprogress nofree nosync nounwind willreturn "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #2 = { nofree nosync nounwind readnone }
+attributes #3 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!20, !21, !22, !23}
+!llvm.ident = !{!24}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "g", scope: !2, file: !3, line: 13, type: !5, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 15.0.0 (https://github.com/llvm/llvm-project.git ca2be81e34a6d87edb8e555dfac94ab68ee20f70)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.c", directory: "/tmp/home/yhs/work/tests/llvm/nullptr", checksumkind: CSK_MD5, checksum: "2c0ea9b3c647baf31f56992f9142b0df")
+!4 = !{!0}
+!5 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t2", file: !3, line: 4, size: 128, elements: !7)
+!7 = !{!8, !10}
+!8 = !DIDerivedType(tag: DW_TAG_member, name: "pad", scope: !6, file: !3, line: 5, baseType: !9, size: 64)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "f", scope: !6, file: !3, line: 6, baseType: !11, size: 64, offset: 64)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t3", file: !3, line: 1, size: 32, elements: !13)
+!13 = !{!14}
+!14 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !12, file: !3, line: 2, baseType: !5, size: 32)
+!15 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t1", file: !3, line: 8, size: 128, elements: !16)
+!16 = !{!17, !18}
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "pad", scope: !15, file: !3, line: 9, baseType: !9, size: 64)
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "q", scope: !15, file: !3, line: 10, baseType: !19, size: 64, offset: 64)
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !6, size: 64)
+!20 = !{i32 7, !"Dwarf Version", i32 5}
+!21 = !{i32 2, !"Debug Info Version", i32 3}
+!22 = !{i32 1, !"wchar_size", i32 4}
+!23 = !{i32 7, !"frame-pointer", i32 2}
+!24 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git ca2be81e34a6d87edb8e555dfac94ab68ee20f70)"}
+!25 = distinct !DISubprogram(name: "test", scope: !3, file: !3, line: 14, type: !26, scopeLine: 14, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !29)
+!26 = !DISubroutineType(types: !27)
+!27 = !{!5, !28}
+!28 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!29 = !{!30, !31, !32}
+!30 = !DILocalVariable(name: "p", arg: 1, scope: !25, file: !3, line: 14, type: !28)
+!31 = !DILocalVariable(name: "q", scope: !25, file: !3, line: 15, type: !19)
+!32 = !DILocalVariable(name: "f", scope: !25, file: !3, line: 18, type: !11)
+!33 = !DILocation(line: 0, scope: !25)
+!34 = !DILocation(line: 15, column: 21, scope: !25)
+!35 = !{!36, !37, i64 8}
+!36 = !{!"t1", !37, i64 0, !37, i64 8}
+!37 = !{!"any pointer", !38, i64 0}
+!38 = !{!"omnipotent char", !39, i64 0}
+!39 = !{!"Simple C/C++ TBAA"}
+!40 = !DILocation(line: 16, column: 7, scope: !41)
+!41 = distinct !DILexicalBlock(scope: !25, file: !3, line: 16, column: 7)
+!42 = !DILocation(line: 16, column: 7, scope: !25)
+!43 = !DILocation(line: 18, column: 21, scope: !25)
+!44 = !{!45, !37, i64 8}
+!45 = !{!"t2", !37, i64 0, !37, i64 8}
+!46 = !DILocation(line: 19, column: 8, scope: !47)
+!47 = distinct !DILexicalBlock(scope: !25, file: !3, line: 19, column: 7)
+!48 = !DILocation(line: 19, column: 7, scope: !25)
+!49 = !DILocation(line: 19, column: 13, scope: !47)
+!50 = !{!51, !51, i64 0}
+!51 = !{!"int", !38, i64 0}
+!52 = !DILocation(line: 19, column: 11, scope: !47)
+!53 = !DILocation(line: 21, column: 1, scope: !25)
diff --git a/llvm/test/CodeGen/SBF/CORE/store-addr.ll b/llvm/test/CodeGen/SBF/CORE/store-addr.ll
new file mode 100644
index 0000000000000..70290c048e53f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/store-addr.ll
@@ -0,0 +1,113 @@
+; RUN: opt -O2 %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+; RUN: opt -passes='default<O2>' %s | llvm-dis > %t1
+; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
+; Source code:
+;   struct t {
+;     int a;
+;   } __attribute__((preserve_access_index));
+;   int foo(void *);
+;   int test(struct t *arg) {
+;       long param[1];
+;       param[0] = (long)&arg->a;
+;       return foo(param);
+;   }
+; Compiler flag to generate IR:
+;   clang -target bpf -S -O2 -g -emit-llvm -Xclang -disable-llvm-passes test.c
+
+target triple = "sbf"
+
+%struct.t = type { i32 }
+
+; Function Attrs: nounwind
+define dso_local i32 @test(%struct.t* %arg) local_unnamed_addr #0 !dbg !14 {
+entry:
+  %param = alloca [1 x i64], align 8
+  call void @llvm.dbg.value(metadata %struct.t* %arg, metadata !22, metadata !DIExpression()), !dbg !27
+  %0 = bitcast [1 x i64]* %param to i8*, !dbg !28
+  call void @llvm.lifetime.start.p0i8(i64 8, i8* nonnull %0) #5, !dbg !28
+  call void @llvm.dbg.declare(metadata [1 x i64]* %param, metadata !23, metadata !DIExpression()), !dbg !29
+  %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ts(%struct.t* elementtype(%struct.t) %arg, i32 0, i32 0), !dbg !30, !llvm.preserve.access.index !18
+  %2 = ptrtoint i32* %1 to i64, !dbg !31
+  %arrayidx = getelementptr inbounds [1 x i64], [1 x i64]* %param, i64 0, i64 0, !dbg !32
+  store i64 %2, i64* %arrayidx, align 8, !dbg !33, !tbaa !34
+  %call = call i32 @foo(i8* nonnull %0) #5, !dbg !38
+  call void @llvm.lifetime.end.p0i8(i64 8, i8* nonnull %0) #5, !dbg !39
+  ret i32 %call, !dbg !40
+}
+
+; CHECK:  mov64 r[[OFFSET:[0-9]+]], 0
+; CHECK:  add64 r1, r[[OFFSET]]
+; CHECK:  stxdw [r10 - 8], r1
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #2
+
+; Function Attrs: nounwind readnone
+declare i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ts(%struct.t*, i32, i32) #3
+
+declare !dbg !5 dso_local i32 @foo(i8*) local_unnamed_addr #4
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #2
+
+; Function Attrs: nounwind readnone speculatable
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable }
+attributes #2 = { argmemonly nounwind }
+attributes #3 = { nounwind readnone }
+attributes #4 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #5 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 4f995959a05ae94cc4f9cc80035f7e4b3ecd2d88)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "test.c", directory: "/tmp/home/yhs/work/tests/core")
+!2 = !{}
+!3 = !{!4, !5}
+!4 = !DIBasicType(name: "long int", size: 64, encoding: DW_ATE_signed)
+!5 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 4, type: !6, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
+!6 = !DISubroutineType(types: !7)
+!7 = !{!8, !9}
+!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!10 = !{i32 7, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = !{i32 1, !"wchar_size", i32 4}
+!13 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 4f995959a05ae94cc4f9cc80035f7e4b3ecd2d88)"}
+!14 = distinct !DISubprogram(name: "test", scope: !1, file: !1, line: 5, type: !15, scopeLine: 5, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !21)
+!15 = !DISubroutineType(types: !16)
+!16 = !{!8, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !18, size: 64)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "t", file: !1, line: 1, size: 32, elements: !19)
+!19 = !{!20}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "a", scope: !18, file: !1, line: 2, baseType: !8, size: 32)
+!21 = !{!22, !23}
+!22 = !DILocalVariable(name: "arg", arg: 1, scope: !14, file: !1, line: 5, type: !17)
+!23 = !DILocalVariable(name: "param", scope: !14, file: !1, line: 6, type: !24)
+!24 = !DICompositeType(tag: DW_TAG_array_type, baseType: !4, size: 64, elements: !25)
+!25 = !{!26}
+!26 = !DISubrange(count: 1)
+!27 = !DILocation(line: 0, scope: !14)
+!28 = !DILocation(line: 6, column: 5, scope: !14)
+!29 = !DILocation(line: 6, column: 10, scope: !14)
+!30 = !DILocation(line: 7, column: 28, scope: !14)
+!31 = !DILocation(line: 7, column: 16, scope: !14)
+!32 = !DILocation(line: 7, column: 5, scope: !14)
+!33 = !DILocation(line: 7, column: 14, scope: !14)
+!34 = !{!35, !35, i64 0}
+!35 = !{!"long", !36, i64 0}
+!36 = !{!"omnipotent char", !37, i64 0}
+!37 = !{!"Simple C/C++ TBAA"}
+!38 = !DILocation(line: 8, column: 12, scope: !14)
+!39 = !DILocation(line: 9, column: 1, scope: !14)
+!40 = !DILocation(line: 8, column: 5, scope: !14)
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
new file mode 100644
index 0000000000000..39f38c8499456
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
@@ -0,0 +1,71 @@
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
+;
+; Source:
+;   int bar(int);
+;   int test(int *p) {
+;     if (*p <= 0 || *p >= 7)
+;       return 0;
+;     return bar(*p);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32* noundef %p) #0 {
+entry:
+  %retval = alloca i32, align 4
+  %p.addr = alloca i32*, align 8
+  store i32* %p, i32** %p.addr, align 8, !tbaa !3
+  %0 = load i32*, i32** %p.addr, align 8, !tbaa !3
+  %1 = load i32, i32* %0, align 4, !tbaa !7
+  %cmp = icmp sle i32 %1, 0
+  br i1 %cmp, label %if.then, label %lor.lhs.false
+
+lor.lhs.false:                                    ; preds = %entry
+  %2 = load i32*, i32** %p.addr, align 8, !tbaa !3
+  %3 = load i32, i32* %2, align 4, !tbaa !7
+  %cmp1 = icmp sge i32 %3, 7
+  br i1 %cmp1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %lor.lhs.false, %entry
+  store i32 0, i32* %retval, align 4
+  br label %return
+
+if.end:                                           ; preds = %lor.lhs.false
+  %4 = load i32*, i32** %p.addr, align 8, !tbaa !3
+  %5 = load i32, i32* %4, align 4, !tbaa !7
+  %call = call i32 @bar(i32 noundef %5)
+  store i32 %call, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %if.end, %if.then
+  %6 = load i32, i32* %retval, align 4
+  ret i32 %6
+}
+
+; CHECK-LABEL: test
+; CHECK-V1:    jsgt r[[#]], r[[#]],
+; CHECK-V1:    jsgt r[[#]], 6,
+; CHECK-V3:    jslt w[[#]], 1,
+; CHECK-V3:    jsgt w[[#]], 6,
+
+declare dso_local i32 @bar(i32 noundef) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 0d37a76d31c05372908908ff2f01fc58bbf575e8)"}
+!3 = !{!4, !4, i64 0}
+!4 = !{!"any pointer", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
+!7 = !{!8, !8, i64 0}
+!8 = !{!"int", !5, i64 0}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
new file mode 100644
index 0000000000000..51863589cd86a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
@@ -0,0 +1,71 @@
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
+; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
+; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
+;
+; Source:
+;   unsigned bar(unsigned);
+;   unsigned int test(unsigned *p) {
+;     if (*p <= 1 || *p >= 7)
+;       return 0;
+;     return bar(*p);
+;   }
+; Compilation flag:
+;   clang -target bpf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32* noundef %p) #0 {
+entry:
+  %retval = alloca i32, align 4
+  %p.addr = alloca i32*, align 8
+  store i32* %p, i32** %p.addr, align 8, !tbaa !3
+  %0 = load i32*, i32** %p.addr, align 8, !tbaa !3
+  %1 = load i32, i32* %0, align 4, !tbaa !7
+  %cmp = icmp ule i32 %1, 1
+  br i1 %cmp, label %if.then, label %lor.lhs.false
+
+lor.lhs.false:                                    ; preds = %entry
+  %2 = load i32*, i32** %p.addr, align 8, !tbaa !3
+  %3 = load i32, i32* %2, align 4, !tbaa !7
+  %cmp1 = icmp uge i32 %3, 7
+  br i1 %cmp1, label %if.then, label %if.end
+
+if.then:                                          ; preds = %lor.lhs.false, %entry
+  store i32 0, i32* %retval, align 4
+  br label %return
+
+if.end:                                           ; preds = %lor.lhs.false
+  %4 = load i32*, i32** %p.addr, align 8, !tbaa !3
+  %5 = load i32, i32* %4, align 4, !tbaa !7
+  %call = call i32 @bar(i32 noundef %5)
+  store i32 %call, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %if.end, %if.then
+  %6 = load i32, i32* %retval, align 4
+  ret i32 %6
+}
+
+; CHECK-LABEL: test
+; CHECK-V1:    jgt r[[#]], r[[#]],
+; CHECK-V1:    jgt r[[#]], 6,
+; CHECK-V3:    jlt w[[#]], 2,
+; CHECK-V3:    jgt w[[#]], 6,
+
+declare dso_local i32 @bar(i32 noundef) #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 2a25e1af85f3138f70888c4c3f359c6a09e3cfe5)"}
+!3 = !{!4, !4, i64 0}
+!4 = !{!"any pointer", !5, i64 0}
+!5 = !{!"omnipotent char", !6, i64 0}
+!6 = !{!"Simple C/C++ TBAA"}
+!7 = !{!8, !8, i64 0}
+!8 = !{!"int", !5, i64 0}
diff --git a/llvm/test/CodeGen/SBF/inline_asm.ll b/llvm/test/CodeGen/SBF/inline_asm.ll
index 141bc39c4135d..7a82c58a32599 100644
--- a/llvm/test/CodeGen/SBF/inline_asm.ll
+++ b/llvm/test/CodeGen/SBF/inline_asm.ll
@@ -34,10 +34,10 @@ entry:
   %2 = tail call i32 asm sideeffect ".syntax_old $0 = $1 ll", "=r,i"(i64 333333333333) #2
 ; CHECK: r1 = 333333333333 ll
   %3 = call i32 asm sideeffect ".syntax_old $0 = *(u16 *) $1", "=r,*m"(i32* elementtype(i32) nonnull %a) #2
-; CHECK: r1 = *(u16 *) (r10 - 4)
+; CHECK: r1 = *(u16 *)(r10 - 4)
   %4 = call i32 asm sideeffect ".syntax_old $0 = *(u32 *) $1", "=r,*m"(i32* elementtype(i32) getelementptr inbounds ([2 x i32], [2 x i32]* @g, i64 0, i64 1)) #2
 ; CHECK: r1 = g ll
-; CHECK: r0 = *(u32 *) (r1 + 4)
+; CHECK: r0 = *(u32 *)(r1 + 4)
   call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %0) #2
   ret i32 %4
 }
diff --git a/llvm/test/CodeGen/SBF/inlineasm-wreg.ll b/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
index 160fbdc16a653..09782f47dcb1d 100644
--- a/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
+++ b/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
@@ -1,9 +1,9 @@
-; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+alu32 --sbf-output-asm-variant=1 -verify-machineinstrs | FileCheck %s
 
 ; Test that %w works as input constraint
 ; CHECK-LABEL: test_inlineasm_w_input_constraint
 define dso_local i32 @test_inlineasm_w_input_constraint() {
-  tail call void asm sideeffect "w0 = $0", "w"(i32 42)
+  tail call void asm sideeffect ".syntax_old w0 = $0", "w"(i32 42)
 ; CHECK: w0 = w1
   ret i32 42
 }
@@ -11,7 +11,7 @@ define dso_local i32 @test_inlineasm_w_input_constraint() {
 ; Test that %w works as output constraint
 ; CHECK-LABEL: test_inlineasm_w_output_constraint
 define dso_local i32 @test_inlineasm_w_output_constraint() {
-  %1 = tail call i32 asm sideeffect "$0 = $1", "=w,i"(i32 42)
+  %1 = tail call i32 asm sideeffect ".syntax_old $0 = $1", "=w,i"(i32 42)
 ; CHECK: w0 = 42
   ret i32 %1
 }
diff --git a/llvm/test/CodeGen/SBF/reloc-btf-2.ll b/llvm/test/CodeGen/SBF/reloc-btf-2.ll
index 121c930dc759d..8ef4f010140d0 100644
--- a/llvm/test/CodeGen/SBF/reloc-btf-2.ll
+++ b/llvm/test/CodeGen/SBF/reloc-btf-2.ll
@@ -1,8 +1,4 @@
-; RUN: llc -march=bpfel -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
-; RUN: llc -march=bpfeb -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
-: TODO: BTF disabled for sbf as of 559ff25f978a675230cc2dbcc18851424ace7fb9.
-: TODO: Remove this test when we know BTF is gone for good.
-: XFAIL: *
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 ; source code:
 ;   int g __attribute__((section("ids"))) = 4;
@@ -24,10 +20,10 @@ define dso_local i32 @test() local_unnamed_addr #0 !dbg !14 {
   ret i32 %3, !dbg !24
 }
 
-; CHECK-RELOC: file format elf64-bpf
+; CHECK-RELOC: file format elf64-sbf
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF]:
-; CHECK-RELOC: R_BPF_64_NODYLD32 .bss
-; CHECK-RELOC: R_BPF_64_NODYLD32 g
+; CHECK-RELOC: R_SBF_64_NODYLD32 s
+; CHECK-RELOC: R_SBF_64_NODYLD32 g
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF.ext]:
 
 attributes #0 = { norecurse nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
diff --git a/llvm/test/CodeGen/SBF/reloc-btf.ll b/llvm/test/CodeGen/SBF/reloc-btf.ll
index aa929257e0399..dbf3ebe92b204 100644
--- a/llvm/test/CodeGen/SBF/reloc-btf.ll
+++ b/llvm/test/CodeGen/SBF/reloc-btf.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
@@ -6,12 +6,12 @@ entry:
   ret i32 0, !dbg !11
 }
 
-; CHECK-RELOC: file format elf64-bpf
+; CHECK-RELOC: file format elf64-sbf
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.debug_info]:
-; CHECK-RELOC: R_BPF_64_ABS32 .debug_abbrev
-; CHECK-RELOC: R_BPF_64_ABS64 .text
+; CHECK-RELOC: R_SBF_64_ABS32 .debug_abbrev
+; CHECK-RELOC: R_SBF_64_64
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF.ext]:
-; CHECK-RELOC: R_BPF_64_NODYLD32 .text
+; CHECK-RELOC: R_SBF_64_NODYLD32
 
 attributes #0 = { norecurse nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="all" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
 

From a07b85d493f8f690af66bcfb741bb6687a328e9a Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Thu, 16 Feb 2023 10:45:36 -0500
Subject: [PATCH 013/114] [SOL] Fix CI build on macOS

---
 .github/workflows/llvm-project-tests.yml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 1c6b97e595e6e..f5cc3216ff56f 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -70,7 +70,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ fromJSON(inputs.os_list) }}
+        os:
+          - ubuntu-latest
+          # Use windows-2019 due to:
+          # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
+          - windows-2019
+          # We're using a specific version of macOS due to:
+          # https://github.com/actions/virtual-environments/issues/5900
+          - macOS-latest
     steps:
       - name: Setup Windows
         if: startsWith(matrix.os, 'windows')
@@ -84,7 +91,13 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ inputs.python_version }}
+          python-version: '3.11'
+      - name: Install homebrew packages
+        if: startsWith(matrix.os, 'macOS')
+        run: |
+          brew rm swig
+          brew install swig@3
+          brew link swig@3
       - name: Install Ninja
         if: runner.os != 'Linux'
         uses: llvm/actions/install-ninja@main
@@ -109,7 +122,7 @@ jobs:
           key: ${{ matrix.os }}
           variant: sccache
       - name: Build and Test
-        if: "!startsWith(matrix.os, 'windows') || inputs.projects != 'lld'"
+        if: "!startsWith(matrix.os, 'windows')"
         uses: llvm/actions/build-test-llvm-project@main
         env:
           # Workaround for https://github.com/actions/virtual-environments/issues/5900.
@@ -148,9 +161,7 @@ jobs:
           ninja -C "$builddir" '${{ inputs.build_target }}'
 
       - name: Build and Test libclc
-        if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects, 'libclc')"
-        env:
-          LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
+        if: "!startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macOS') && contains(inputs.projects, 'libclc')"
         run: |
           # The libclc tests don't have a generated check target so all we can
           # do is build it.

From 96215c160a77fda9c06e6a6bd4cada0666f86c9d Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Fri, 17 Feb 2023 19:11:47 -0500
Subject: [PATCH 014/114] [SOL] Generate EM_SBF binary only for sbfv2 cpu
 subtarget

EM_SBF files are only accepted by new ELF parser of the RBPF.
---
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |   4 +-
 .../SBF/MCTargetDesc/SBFELFObjectWriter.cpp   |  17 +-
 .../Target/SBF/MCTargetDesc/SBFMCTargetDesc.h |   2 +-
 llvm/test/CodeGen/SBF/objdump_atomics.ll      |   2 +-
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |   2 +-
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll    |   2 +-
 llvm/test/CodeGen/SBF/objdump_dis_all.ll      |   2 +-
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      |   4 +-
 llvm/test/CodeGen/SBF/objdump_intrinsics.ll   |   2 +-
 llvm/test/CodeGen/SBF/objdump_nop.ll          |   2 +-
 llvm/test/CodeGen/SBF/objdump_static_var.ll   |   2 +-
 llvm/test/CodeGen/SBF/objdump_trivial.ll      |   2 +-
 llvm/test/CodeGen/SBF/reloc-2.ll              |   4 +-
 llvm/test/CodeGen/SBF/reloc-3.ll              |   4 +-
 llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll      |   6 +-
 llvm/test/CodeGen/SBF/reloc-btf-2.ll          |   2 +-
 llvm/test/CodeGen/SBF/reloc-btf.ll            |   4 +-
 llvm/test/CodeGen/SBF/reloc.ll                |   4 +-
 llvm/test/MC/SBF/elf-header.s                 |   5 +-
 llvm/test/MC/SBF/insn-unit-32.s               |   2 +-
 llvm/test/MC/SBF/insn-unit.s                  |   2 +-
 llvm/test/MC/SBF/load-store-32.s              |   2 +-
 llvm/test/MC/SBF/sbf-alu.s                    | 222 +++++++++---------
 llvm/test/MC/SBF/sbf-jmp.s                    |  47 ++--
 llvm/test/MC/SBF/sbf-ldst.s                   |  26 +-
 llvm/test/MC/SBF/sbf-sdiv.s                   |   2 +-
 26 files changed, 189 insertions(+), 186 deletions(-)

diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 081dfb90fed65..0297f8ba5c932 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -26,6 +26,7 @@ class SBFAsmBackend : public MCAsmBackend {
 public:
   SBFAsmBackend(support::endianness Endian, const MCSubtargetInfo &STI)
       : MCAsmBackend(Endian),
+        isSBFv2(STI.getCPU() == "sbfv2"),
         isSolana(STI.hasFeature(SBF::FeatureSolana) ||
                  STI.getTargetTriple().getArch() == Triple::sbf),
         relocAbs64(STI.hasFeature(SBF::FeatureRelocAbs64)) {}
@@ -51,6 +52,7 @@ class SBFAsmBackend : public MCAsmBackend {
   bool writeNopData(raw_ostream &OS, uint64_t Count,
                     const MCSubtargetInfo *STI) const override;
 private:
+  bool isSBFv2;
   bool isSolana;
   bool relocAbs64;
 };
@@ -108,7 +110,7 @@ void SBFAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
 
 std::unique_ptr<MCObjectTargetWriter>
 SBFAsmBackend::createObjectTargetWriter() const {
-  return createSBFELFObjectWriter(0, isSolana, relocAbs64);
+  return createSBFELFObjectWriter(0, isSolana, relocAbs64, isSBFv2);
 }
 
 MCAsmBackend *llvm::createSBFAsmBackend(const Target &T,
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
index 1c81fa0e128ca..1cf954a00f46c 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
@@ -22,7 +22,7 @@ namespace {
 
 class SBFELFObjectWriter : public MCELFObjectTargetWriter {
 public:
-  SBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool relocAbs64);
+  SBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool relocAbs64, bool isSBFv2);
   ~SBFELFObjectWriter() override = default;
 
 protected:
@@ -48,9 +48,10 @@ bool SBFELFObjectWriter::needsRelocateWithSymbol(const MCSymbol &Sym,
 }
 
 SBFELFObjectWriter::SBFELFObjectWriter(uint8_t OSABI, bool isSolana,
-                                       bool relocAbs64)
-    : MCELFObjectTargetWriter(/*Is64Bit*/ true, OSABI, ELF::EM_SBF,
-                              /*HasRelocationAddend*/ false),
+                                       bool relocAbs64, bool isSBFv2)
+  : MCELFObjectTargetWriter(/*Is64Bit*/ true, OSABI,
+                            isSBFv2 ? ELF::EM_SBF : ELF::EM_BPF,
+                            /*HasRelocationAddend*/ false),
       isSolana(isSolana), relocAbs64(relocAbs64) {}
 
 unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
@@ -100,8 +101,8 @@ unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
             return ELF::R_SBF_64_NODYLD32;
         }
         // .debug_* sections
-	if (!(Flags & ELF::SHF_ALLOC))
-       	  return ELF::R_SBF_64_ABS32;
+        if (!(Flags & ELF::SHF_ALLOC))
+            return ELF::R_SBF_64_ABS32;
       }
     }
     return isSolana ? ELF::R_SBF_64_32 : ELF::R_SBF_64_ABS32;
@@ -109,6 +110,6 @@ unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
 }
 
 std::unique_ptr<MCObjectTargetWriter>
-llvm::createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64) {
-  return std::make_unique<SBFELFObjectWriter>(OSABI, isSolana, useRelocAbs64);
+llvm::createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64, bool isSBFv2) {
+  return std::make_unique<SBFELFObjectWriter>(OSABI, isSolana, useRelocAbs64, isSBFv2);
 }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
index cbf4fc9b0a52b..81b11b57b3a5a 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
@@ -43,7 +43,7 @@ MCAsmBackend *createSBFbeAsmBackend(const Target &T, const MCSubtargetInfo &STI,
                                     const MCTargetOptions &Options);
 
 std::unique_ptr<MCObjectTargetWriter>
-createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64);
+createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64, bool isSBFv2);
 } // namespace llvm
 
 // Defines symbolic names for SBF registers.  This defines a mapping from
diff --git a/llvm/test/CodeGen/SBF/objdump_atomics.ll b/llvm/test/CodeGen/SBF/objdump_atomics.ll
index d6f594a509aa8..d25c89fd4772d 100644
--- a/llvm/test/CodeGen/SBF/objdump_atomics.ll
+++ b/llvm/test/CodeGen/SBF/objdump_atomics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; CHECK-LABEL: test_load_add_32
 ; CHECK: ldxw r3, [r1 + 0]
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index 1a9be7dbd5f9d..81ba90174256b 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; Source Code:
 ; int gbl;
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
index 7682613fbcd7b..6cb38f573ea56 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; Source Code:
 ; int test(int a, int b) {
diff --git a/llvm/test/CodeGen/SBF/objdump_dis_all.ll b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
index f1d9dea566293..b148d156f4c64 100644
--- a/llvm/test/CodeGen/SBF/objdump_dis_all.ll
+++ b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -D - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -D - | FileCheck %s
 ;
 ; Source:
 ;   /* *(u64 *)(r10 - 16) = r1 */
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
index 7b2a4f0cdbe1f..690e784c69469 100644
--- a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-DEC %s
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d --print-imm-hex - | FileCheck --check-prefix=CHECK-HEX %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-DEC %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d --print-imm-hex - | FileCheck --check-prefix=CHECK-HEX %s
 
 ; Source Code:
 ; int gbl;
diff --git a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
index 23fcfbb5ba0d1..290070211665c 100644
--- a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
+++ b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-EL %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-EL %s
 
 define i32 @ld_pseudo() #0 {
 entry:
diff --git a/llvm/test/CodeGen/SBF/objdump_nop.ll b/llvm/test/CodeGen/SBF/objdump_nop.ll
index b058392353c29..d488034bd5178 100644
--- a/llvm/test/CodeGen/SBF/objdump_nop.ll
+++ b/llvm/test/CodeGen/SBF/objdump_nop.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 ;
 ; Source:
 ;   int test() {
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index a00fc196ac344..6fb9dad8c469a 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK %s
 
 ; src:
 ;   static volatile long a = 2;
diff --git a/llvm/test/CodeGen/SBF/objdump_trivial.ll b/llvm/test/CodeGen/SBF/objdump_trivial.ll
index d4f33570695e4..6e65b6b9b8441 100644
--- a/llvm/test/CodeGen/SBF/objdump_trivial.ll
+++ b/llvm/test/CodeGen/SBF/objdump_trivial.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; CHECK: jsgt r2, r1,
 ; CHECK: call 1
diff --git a/llvm/test/CodeGen/SBF/reloc-2.ll b/llvm/test/CodeGen/SBF/reloc-2.ll
index d05229d1bf298..be51c726f2d50 100644
--- a/llvm/test/CodeGen/SBF/reloc-2.ll
+++ b/llvm/test/CodeGen/SBF/reloc-2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o %t.el < %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o %t.el < %s
 ; RUN: llvm-objdump -r %t.el | FileCheck --check-prefix=RELOC %s
 ; RUN: llvm-objdump -d --no-show-raw-insn %t.el | FileCheck --check-prefix=DUMP %s
 
@@ -50,7 +50,7 @@ entry:
 ; DUMP-NEXT:  <add>
 
 ; RELOC:      RELOCATION RECORDS FOR [.text]:
-; RELOC:      R_SBF_64_32            add 
+; RELOC:      R_SBF_64_32            add
 ; RELOC-NOT:  R_SBF_64_32            sec1
 ; RELOC-NOT:  R_SBF_64_32
 
diff --git a/llvm/test/CodeGen/SBF/reloc-3.ll b/llvm/test/CodeGen/SBF/reloc-3.ll
index 3aee4338278b6..c9cecf6e1564e 100644
--- a/llvm/test/CodeGen/SBF/reloc-3.ll
+++ b/llvm/test/CodeGen/SBF/reloc-3.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj -o %t.el < %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o %t.el < %s
 ; RUN: llvm-readelf -r %t.el | FileCheck %s
 
 ; source code:
@@ -12,7 +12,7 @@
 @gbl = dso_local local_unnamed_addr global %struct.t { i8* bitcast (i32 ()* @g to i8*) }, align 8
 
 ; CHECK: '.rel.data'
-; CHECK: 0000000000000000 0000000200000001 R_SBF_64_64 0000000000000000 g
+; CHECK: 0000000000000000 0000000200000002 R_SBF_64_ABS64 0000000000000000 g
 
 ; Function Attrs: nofree norecurse nosync nounwind readnone willreturn mustprogress
 define dso_local i32 @g() #0 {
diff --git a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
index 86ab005ad62f4..46318a1c36878 100644
--- a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
+++ b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBF %s
+; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-BPF %s
 ; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBFv2 %s
 
 @.str = private unnamed_addr constant [25 x i8] c"reloc_64_relative_data.c\00", align 1
@@ -13,8 +13,8 @@ entry:
   ret i64 %0
 }
 
-; CHECK-RELOC-SBF:   RELOCATION RECORDS FOR [.data.rel.ro]:
-; CHECK-RELOC-SBF:   0000000000000000 R_SBF_64_64 .L.str
+; CHECK-RELOC-BPF:   RELOCATION RECORDS FOR [.data.rel.ro]:
+; CHECK-RELOC-BPF:   0000000000000000 R_BPF_64_64 .L.str
 
 ; CHECK-RELOC-SBFv2: RELOCATION RECORDS FOR [.data.rel.ro]:
 ; CHECK-RELOC-SBFv2: 0000000000000000 R_SBF_64_ABS64 .L.str
diff --git a/llvm/test/CodeGen/SBF/reloc-btf-2.ll b/llvm/test/CodeGen/SBF/reloc-btf-2.ll
index 8ef4f010140d0..c62b310792a7f 100644
--- a/llvm/test/CodeGen/SBF/reloc-btf-2.ll
+++ b/llvm/test/CodeGen/SBF/reloc-btf-2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -sbf-enable-btf-emission -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 ; source code:
 ;   int g __attribute__((section("ids"))) = 4;
diff --git a/llvm/test/CodeGen/SBF/reloc-btf.ll b/llvm/test/CodeGen/SBF/reloc-btf.ll
index dbf3ebe92b204..61cdd1460005d 100644
--- a/llvm/test/CodeGen/SBF/reloc-btf.ll
+++ b/llvm/test/CodeGen/SBF/reloc-btf.ll
@@ -1,4 +1,4 @@
-; RUN: llc -sbf-enable-btf-emission -march=sbf -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -sbf-enable-btf-emission -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
@@ -9,7 +9,7 @@ entry:
 ; CHECK-RELOC: file format elf64-sbf
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.debug_info]:
 ; CHECK-RELOC: R_SBF_64_ABS32 .debug_abbrev
-; CHECK-RELOC: R_SBF_64_64
+; CHECK-RELOC: R_SBF_64_ABS64
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.BTF.ext]:
 ; CHECK-RELOC: R_SBF_64_NODYLD32
 
diff --git a/llvm/test/CodeGen/SBF/reloc.ll b/llvm/test/CodeGen/SBF/reloc.ll
index 13082600c9834..524a3da9db836 100644
--- a/llvm/test/CodeGen/SBF/reloc.ll
+++ b/llvm/test/CodeGen/SBF/reloc.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 %struct.bpf_context = type { i64, i64, i64, i64, i64, i64, i64 }
 %struct.sk_buff = type { i64, i64, i64, i64, i64, i64, i64 }
@@ -34,7 +34,7 @@ define i32 @bpf_prog1(%struct.bpf_context* nocapture %ctx) #0 section "events/ne
 
 ; CHECK-RELOC: file format elf64-sbf
 ; CHECK-RELOC: RELOCATION RECORDS FOR [.eh_frame]:
-; CHECK-RELOC: 00000000000001c R_SBF_64_64
+; CHECK-RELOC: 00000000000001c R_SBF_64_ABS64
 }
 
 ; Function Attrs: nounwind
diff --git a/llvm/test/MC/SBF/elf-header.s b/llvm/test/MC/SBF/elf-header.s
index 049ead44e6909..ab09d7ba99b24 100644
--- a/llvm/test/MC/SBF/elf-header.s
+++ b/llvm/test/MC/SBF/elf-header.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana | llvm-readobj -h - \
+# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana --mcpu=sbfv2 | llvm-readobj -h - \
 # RUN:     | FileCheck %s
 
 # CHECK: Format: elf64-sbf
@@ -16,6 +16,7 @@
 # CHECK:   Type: Relocatable (0x1)
 # CHECK:   Machine: EM_SBF (0x107)
 # CHECK:   Version: 1
-# CHECK:   Flags [ (0x0)
+# CHECK:   Flags [ (0x20)
+# CHECK:     0x20
 # CHECK:   ]
 # CHECK: }
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index fb1b5d524eed6..bbd5f8ad8b2d6 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
 # RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
 # RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck %s
 
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
index 76924cfd0a299..7c21acb10fb33 100644
--- a/llvm/test/MC/SBF/insn-unit.s
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
 # RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-64 %s
 # RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-32 %s
 
diff --git a/llvm/test/MC/SBF/load-store-32.s b/llvm/test/MC/SBF/load-store-32.s
index e5ac929965929..e63f1d6a95be4 100644
--- a/llvm/test/MC/SBF/load-store-32.s
+++ b/llvm/test/MC/SBF/load-store-32.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
 # RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck --check-prefix=CHECK-32 %s
 # RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
 
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 2846142afbe6a..859c9b90e980b 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -1,9 +1,9 @@
-# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
 
@@ -20,25 +20,25 @@ add64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x0f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 add64 r3, r2
 
-# CHECK-OBJ-NEW: add64 r3, 123 
-# CHECK-OBJ-OLD: r3 += 123 
+# CHECK-OBJ-NEW: add64 r3, 123
+# CHECK-OBJ-OLD: r3 += 123
 # CHECK-ASM-NEW: encoding: [0x07,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-add64 r3, 123 
+add64 r3, 123
 
-# CHECK-OBJ-NEW: add64 r5, -123 
-# CHECK-OBJ-OLD: r5 += -123 
+# CHECK-OBJ-NEW: add64 r5, -123
+# CHECK-OBJ-OLD: r5 += -123
 # CHECK-ASM-NEW: encoding: [0x07,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-add64 r5, -123 
+add64 r5, -123
 
 # CHECK-OBJ-NEW: add32 w6, w2
 # CHECK-OBJ-OLD: w6 += w2
 # CHECK-ASM-NEW: encoding: [0x0c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 add32 w6, w2
 
-# CHECK-OBJ-NEW: add32 w5, -123 
-# CHECK-OBJ-OLD: w5 += -123 
+# CHECK-OBJ-NEW: add32 w5, -123
+# CHECK-OBJ-OLD: w5 += -123
 # CHECK-ASM-NEW: encoding: [0x04,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-add32 w5, -123 
+add32 w5, -123
 
 
 
@@ -52,25 +52,25 @@ sub64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x1f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 sub64 r3, r2
 
-# CHECK-OBJ-NEW: sub64 r3, 123 
-# CHECK-OBJ-OLD: r3 -= 123 
+# CHECK-OBJ-NEW: sub64 r3, 123
+# CHECK-OBJ-OLD: r3 -= 123
 # CHECK-ASM-NEW: encoding: [0x17,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-sub64 r3, 123 
+sub64 r3, 123
 
-# CHECK-OBJ-NEW: sub64 r5, -123 
-# CHECK-OBJ-OLD: r5 -= -123 
+# CHECK-OBJ-NEW: sub64 r5, -123
+# CHECK-OBJ-OLD: r5 -= -123
 # CHECK-ASM-NEW: encoding: [0x17,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-sub64 r5, -123 
+sub64 r5, -123
 
 # CHECK-OBJ-NEW: sub32 w6, w2
 # CHECK-OBJ-OLD: w6 -= w2
 # CHECK-ASM-NEW: encoding: [0x1c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 sub32 w6, w2
 
-# CHECK-OBJ-NEW: sub32 w5, -123 
-# CHECK-OBJ-OLD: w5 -= -123 
+# CHECK-OBJ-NEW: sub32 w5, -123
+# CHECK-OBJ-OLD: w5 -= -123
 # CHECK-ASM-NEW: encoding: [0x14,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-sub32 w5, -123 
+sub32 w5, -123
 
 
 
@@ -84,25 +84,25 @@ mul64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x2f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mul64 r3, r2
 
-# CHECK-OBJ-NEW: mul64 r3, 123 
-# CHECK-OBJ-OLD: r3 *= 123 
+# CHECK-OBJ-NEW: mul64 r3, 123
+# CHECK-OBJ-OLD: r3 *= 123
 # CHECK-ASM-NEW: encoding: [0x27,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-mul64 r3, 123 
+mul64 r3, 123
 
-# CHECK-OBJ-NEW: mul64 r5, -123 
-# CHECK-OBJ-OLD: r5 *= -123 
+# CHECK-OBJ-NEW: mul64 r5, -123
+# CHECK-OBJ-OLD: r5 *= -123
 # CHECK-ASM-NEW: encoding: [0x27,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-mul64 r5, -123 
+mul64 r5, -123
 
 # CHECK-OBJ-NEW: mul32 w6, w2
 # CHECK-OBJ-OLD: w6 *= w2
 # CHECK-ASM-NEW: encoding: [0x2c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mul32 w6, w2
 
-# CHECK-OBJ-NEW: mul32 w5, -123 
-# CHECK-OBJ-OLD: w5 *= -123 
+# CHECK-OBJ-NEW: mul32 w5, -123
+# CHECK-OBJ-OLD: w5 *= -123
 # CHECK-ASM-NEW: encoding: [0x24,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-mul32 w5, -123 
+mul32 w5, -123
 
 
 
@@ -116,25 +116,25 @@ div64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x3f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 div64 r3, r2
 
-# CHECK-OBJ-NEW: div64 r3, 123 
-# CHECK-OBJ-OLD: r3 /= 123 
+# CHECK-OBJ-NEW: div64 r3, 123
+# CHECK-OBJ-OLD: r3 /= 123
 # CHECK-ASM-NEW: encoding: [0x37,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-div64 r3, 123 
+div64 r3, 123
 
-# CHECK-OBJ-NEW: div64 r5, -123 
-# CHECK-OBJ-OLD: r5 /= -123 
+# CHECK-OBJ-NEW: div64 r5, -123
+# CHECK-OBJ-OLD: r5 /= -123
 # CHECK-ASM-NEW: encoding: [0x37,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-div64 r5, -123 
+div64 r5, -123
 
 # CHECK-OBJ-NEW: div32 w6, w2
 # CHECK-OBJ-OLD: w6 /= w2
 # CHECK-ASM-NEW: encoding: [0x3c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 div32 w6, w2
 
-# CHECK-OBJ-NEW: div32 w5, -123 
-# CHECK-OBJ-OLD: w5 /= -123 
+# CHECK-OBJ-NEW: div32 w5, -123
+# CHECK-OBJ-OLD: w5 /= -123
 # CHECK-ASM-NEW: encoding: [0x34,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-div32 w5, -123 
+div32 w5, -123
 
 
 
@@ -148,25 +148,25 @@ sdiv64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv64 r3, r2
 
-# CHECK-OBJ-NEW: sdiv64 r3, 123 
-# CHECK-OBJ-OLD: r3 s/= 123 
+# CHECK-OBJ-NEW: sdiv64 r3, 123
+# CHECK-OBJ-OLD: r3 s/= 123
 # CHECK-ASM-NEW: encoding: [0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-sdiv64 r3, 123 
+sdiv64 r3, 123
 
-# CHECK-OBJ-NEW: sdiv64 r5, -123 
-# CHECK-OBJ-OLD: r5 s/= -123 
+# CHECK-OBJ-NEW: sdiv64 r5, -123
+# CHECK-OBJ-OLD: r5 s/= -123
 # CHECK-ASM-NEW: encoding: [0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-sdiv64 r5, -123 
+sdiv64 r5, -123
 
 # CHECK-OBJ-NEW: sdiv32 w6, w2
 # CHECK-OBJ-OLD: w6 s/= w2
 # CHECK-ASM-NEW: encoding: [0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv32 w6, w2
 
-# CHECK-OBJ-NEW: sdiv32 w5, -123 
-# CHECK-OBJ-OLD: w5 s/= -123 
+# CHECK-OBJ-NEW: sdiv32 w5, -123
+# CHECK-OBJ-OLD: w5 s/= -123
 # CHECK-ASM-NEW: encoding: [0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-sdiv32 w5, -123 
+sdiv32 w5, -123
 
 
 
@@ -180,25 +180,25 @@ or64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x4f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 or64 r3, r2
 
-# CHECK-OBJ-NEW: or64 r3, 123 
-# CHECK-OBJ-OLD: r3 |= 123 
+# CHECK-OBJ-NEW: or64 r3, 123
+# CHECK-OBJ-OLD: r3 |= 123
 # CHECK-ASM-NEW: encoding: [0x47,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-or64 r3, 123 
+or64 r3, 123
 
-# CHECK-OBJ-NEW: or64 r5, -123 
-# CHECK-OBJ-OLD: r5 |= -123 
+# CHECK-OBJ-NEW: or64 r5, -123
+# CHECK-OBJ-OLD: r5 |= -123
 # CHECK-ASM-NEW: encoding: [0x47,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-or64 r5, -123 
+or64 r5, -123
 
 # CHECK-OBJ-NEW: or32 w6, w2
 # CHECK-OBJ-OLD: w6 |= w2
 # CHECK-ASM-NEW: encoding: [0x4c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 or32 w6, w2
 
-# CHECK-OBJ-NEW: or32 w5, -123 
-# CHECK-OBJ-OLD: w5 |= -123 
+# CHECK-OBJ-NEW: or32 w5, -123
+# CHECK-OBJ-OLD: w5 |= -123
 # CHECK-ASM-NEW: encoding: [0x44,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-or32 w5, -123 
+or32 w5, -123
 
 
 
@@ -212,25 +212,25 @@ and64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x5f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 and64 r3, r2
 
-# CHECK-OBJ-NEW: and64 r3, 123 
-# CHECK-OBJ-OLD: r3 &= 123 
+# CHECK-OBJ-NEW: and64 r3, 123
+# CHECK-OBJ-OLD: r3 &= 123
 # CHECK-ASM-NEW: encoding: [0x57,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-and64 r3, 123 
+and64 r3, 123
 
-# CHECK-OBJ-NEW: and64 r5, -123 
-# CHECK-OBJ-OLD: r5 &= -123 
+# CHECK-OBJ-NEW: and64 r5, -123
+# CHECK-OBJ-OLD: r5 &= -123
 # CHECK-ASM-NEW: encoding: [0x57,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-and64 r5, -123 
+and64 r5, -123
 
 # CHECK-OBJ-NEW: and32 w6, w2
 # CHECK-OBJ-OLD: w6 &= w2
 # CHECK-ASM-NEW: encoding: [0x5c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 and32 w6, w2
 
-# CHECK-OBJ-NEW: and32 w5, -123 
-# CHECK-OBJ-OLD: w5 &= -123 
+# CHECK-OBJ-NEW: and32 w5, -123
+# CHECK-OBJ-OLD: w5 &= -123
 # CHECK-ASM-NEW: encoding: [0x54,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-and32 w5, -123 
+and32 w5, -123
 
 
 
@@ -244,25 +244,25 @@ xor64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xaf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 xor64 r3, r2
 
-# CHECK-OBJ-NEW: xor64 r3, 123 
-# CHECK-OBJ-OLD: r3 ^= 123 
+# CHECK-OBJ-NEW: xor64 r3, 123
+# CHECK-OBJ-OLD: r3 ^= 123
 # CHECK-ASM-NEW: encoding: [0xa7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-xor64 r3, 123 
+xor64 r3, 123
 
-# CHECK-OBJ-NEW: xor64 r5, -123 
-# CHECK-OBJ-OLD: r5 ^= -123 
+# CHECK-OBJ-NEW: xor64 r5, -123
+# CHECK-OBJ-OLD: r5 ^= -123
 # CHECK-ASM-NEW: encoding: [0xa7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-xor64 r5, -123 
+xor64 r5, -123
 
 # CHECK-OBJ-NEW: xor32 w6, w2
 # CHECK-OBJ-OLD: w6 ^= w2
 # CHECK-ASM-NEW: encoding: [0xac,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 xor32 w6, w2
 
-# CHECK-OBJ-NEW: xor32 w5, -123 
-# CHECK-OBJ-OLD: w5 ^= -123 
+# CHECK-OBJ-NEW: xor32 w5, -123
+# CHECK-OBJ-OLD: w5 ^= -123
 # CHECK-ASM-NEW: encoding: [0xa4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-xor32 w5, -123 
+xor32 w5, -123
 
 
 
@@ -276,25 +276,25 @@ lsh64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x6f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh64 r3, r2
 
-# CHECK-OBJ-NEW: lsh64 r3, 123 
-# CHECK-OBJ-OLD: r3 <<= 123 
+# CHECK-OBJ-NEW: lsh64 r3, 123
+# CHECK-OBJ-OLD: r3 <<= 123
 # CHECK-ASM-NEW: encoding: [0x67,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-lsh64 r3, 123 
+lsh64 r3, 123
 
-# CHECK-OBJ-NEW: lsh64 r5, -123 
-# CHECK-OBJ-OLD: r5 <<= -123 
+# CHECK-OBJ-NEW: lsh64 r5, -123
+# CHECK-OBJ-OLD: r5 <<= -123
 # CHECK-ASM-NEW: encoding: [0x67,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-lsh64 r5, -123 
+lsh64 r5, -123
 
 # CHECK-OBJ-NEW: lsh32 w6, w2
 # CHECK-OBJ-OLD: w6 <<= w2
 # CHECK-ASM-NEW: encoding: [0x6c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh32 w6, w2
 
-# CHECK-OBJ-NEW: lsh32 w5, -123 
-# CHECK-OBJ-OLD: w5 <<= -123 
+# CHECK-OBJ-NEW: lsh32 w5, -123
+# CHECK-OBJ-OLD: w5 <<= -123
 # CHECK-ASM-NEW: encoding: [0x64,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-lsh32 w5, -123 
+lsh32 w5, -123
 
 
 
@@ -308,25 +308,25 @@ rsh64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x7f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh64 r3, r2
 
-# CHECK-OBJ-NEW: rsh64 r3, 123 
-# CHECK-OBJ-OLD: r3 >>= 123 
+# CHECK-OBJ-NEW: rsh64 r3, 123
+# CHECK-OBJ-OLD: r3 >>= 123
 # CHECK-ASM-NEW: encoding: [0x77,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-rsh64 r3, 123 
+rsh64 r3, 123
 
-# CHECK-OBJ-NEW: rsh64 r5, -123 
-# CHECK-OBJ-OLD: r5 >>= -123 
+# CHECK-OBJ-NEW: rsh64 r5, -123
+# CHECK-OBJ-OLD: r5 >>= -123
 # CHECK-ASM-NEW: encoding: [0x77,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-rsh64 r5, -123 
+rsh64 r5, -123
 
 # CHECK-OBJ-NEW: rsh32 w6, w2
 # CHECK-OBJ-OLD: w6 >>= w2
 # CHECK-ASM-NEW: encoding: [0x7c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh32 w6, w2
 
-# CHECK-OBJ-NEW: rsh32 w5, -123 
-# CHECK-OBJ-OLD: w5 >>= -123 
+# CHECK-OBJ-NEW: rsh32 w5, -123
+# CHECK-OBJ-OLD: w5 >>= -123
 # CHECK-ASM-NEW: encoding: [0x74,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-rsh32 w5, -123 
+rsh32 w5, -123
 
 
 
@@ -341,25 +341,25 @@ arsh64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xcf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh64 r3, r2
 
-# CHECK-OBJ-NEW: arsh64 r3, 123 
-# CHECK-OBJ-OLD: r3 s>>= 123 
+# CHECK-OBJ-NEW: arsh64 r3, 123
+# CHECK-OBJ-OLD: r3 s>>= 123
 # CHECK-ASM-NEW: encoding: [0xc7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-arsh64 r3, 123 
+arsh64 r3, 123
 
-# CHECK-OBJ-NEW: arsh64 r5, -123 
-# CHECK-OBJ-OLD: r5 s>>= -123 
+# CHECK-OBJ-NEW: arsh64 r5, -123
+# CHECK-OBJ-OLD: r5 s>>= -123
 # CHECK-ASM-NEW: encoding: [0xc7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-arsh64 r5, -123 
+arsh64 r5, -123
 
 # CHECK-OBJ-NEW: arsh32 w6, w2
 # CHECK-OBJ-OLD: w6 s>>= w2
 # CHECK-ASM-NEW: encoding: [0xcc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh32 w6, w2
 
-# CHECK-OBJ-NEW: arsh32 w5, -123 
-# CHECK-OBJ-OLD: w5 s>>= -123 
+# CHECK-OBJ-NEW: arsh32 w5, -123
+# CHECK-OBJ-OLD: w5 s>>= -123
 # CHECK-ASM-NEW: encoding: [0xc4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-arsh32 w5, -123 
+arsh32 w5, -123
 
 
 
@@ -385,25 +385,25 @@ mov64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mov64 r3, r2
 
-# CHECK-OBJ-NEW: mov64 r3, 123 
-# CHECK-OBJ-OLD: r3 = 123 
+# CHECK-OBJ-NEW: mov64 r3, 123
+# CHECK-OBJ-OLD: r3 = 123
 # CHECK-ASM-NEW: encoding: [0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-mov64 r3, 123 
+mov64 r3, 123
 
-# CHECK-OBJ-NEW: mov64 r5, -123 
-# CHECK-OBJ-OLD: r5 = -123 
+# CHECK-OBJ-NEW: mov64 r5, -123
+# CHECK-OBJ-OLD: r5 = -123
 # CHECK-ASM-NEW: encoding: [0xb7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-mov64 r5, -123 
+mov64 r5, -123
 
 # CHECK-OBJ-NEW: mov32 w6, w2
 # CHECK-OBJ-OLD: w6 = w2
 # CHECK-ASM-NEW: encoding: [0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mov32 w6, w2
 
-# CHECK-OBJ-NEW: mov32 w5, -123 
-# CHECK-OBJ-OLD: w5 = -123 
+# CHECK-OBJ-NEW: mov32 w5, -123
+# CHECK-OBJ-OLD: w5 = -123
 # CHECK-ASM-NEW: encoding: [0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-mov32 w5, -123 
+mov32 w5, -123
 
 
 
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index 13555cc31818a..da8899158bcea 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -1,9 +1,9 @@
-# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
 
@@ -152,16 +152,16 @@ jsge r3, 123, +8
 jslt r3, 123, +8
 jsle r3, 123, +8
 
-# CHECK-OBJ-NEW: jeq r5, -123, +8 
-# CHECK-OBJ-NEW: jne r5, -123, +8 
-# CHECK-OBJ-NEW: jgt r5, -123, +8 
-# CHECK-OBJ-NEW: jge r5, -123, +8 
-# CHECK-OBJ-NEW: jlt r5, -123, +8 
-# CHECK-OBJ-NEW: jle r5, -123, +8 
-# CHECK-OBJ-NEW: jsgt r5, -123, +8 
-# CHECK-OBJ-NEW: jsge r5, -123, +8 
-# CHECK-OBJ-NEW: jslt r5, -123, +8 
-# CHECK-OBJ-NEW: jsle r5, -123, +8 
+# CHECK-OBJ-NEW: jeq r5, -123, +8
+# CHECK-OBJ-NEW: jne r5, -123, +8
+# CHECK-OBJ-NEW: jgt r5, -123, +8
+# CHECK-OBJ-NEW: jge r5, -123, +8
+# CHECK-OBJ-NEW: jlt r5, -123, +8
+# CHECK-OBJ-NEW: jle r5, -123, +8
+# CHECK-OBJ-NEW: jsgt r5, -123, +8
+# CHECK-OBJ-NEW: jsge r5, -123, +8
+# CHECK-OBJ-NEW: jslt r5, -123, +8
+# CHECK-OBJ-NEW: jsle r5, -123, +8
 # CHECK-OBJ-OLD: if r5 == -123 goto +8
 # CHECK-OBJ-OLD: if r5 != -123 goto +8
 # CHECK-OBJ-OLD: if r5 > -123 goto +8
@@ -182,16 +182,16 @@ jsle r3, 123, +8
 # CHECK-ASM-NEW: encoding: [0x75,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0xc5,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0xd5,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-jeq r5, -123, +8 
-jne r5, -123, +8 
-jgt r5, -123, +8 
-jge r5, -123, +8 
-jlt r5, -123, +8 
-jle r5, -123, +8 
-jsgt r5, -123, +8 
-jsge r5, -123, +8 
-jslt r5, -123, +8 
-jsle r5, -123, +8 
+jeq r5, -123, +8
+jne r5, -123, +8
+jgt r5, -123, +8
+jge r5, -123, +8
+jlt r5, -123, +8
+jle r5, -123, +8
+jsgt r5, -123, +8
+jsge r5, -123, +8
+jslt r5, -123, +8
+jsle r5, -123, +8
 
 # CHECK-OBJ-NEW: jeq w6, w2, +8
 # CHECK-OBJ-NEW: jne w6, w2, +8
@@ -286,4 +286,3 @@ callx r4
 # CHECK-OBJ-OLD: exit
 # CHECK-ASM-NEW: encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 exit
-
diff --git a/llvm/test/MC/SBF/sbf-ldst.s b/llvm/test/MC/SBF/sbf-ldst.s
index 5be9793a364c9..63990f8649012 100644
--- a/llvm/test/MC/SBF/sbf-ldst.s
+++ b/llvm/test/MC/SBF/sbf-ldst.s
@@ -1,17 +1,17 @@
-# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK32-ASM-NEW
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump --mattr=+alu32 -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK32-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump --mattr=+alu32 --output-asm-variant=1 -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK32-OBJ-OLD %s
 
@@ -124,10 +124,10 @@ stxw [r3 + 64], w4
 
 
 # XADDW (NoALU32).
-# CHECK-OBJ-NEW: stxxaddw [r8 + 4], r2 
+# CHECK-OBJ-NEW: stxxaddw [r8 + 4], r2
 # CHECK-OBJ-OLD: lock *(u32 *)(r8 + 4) += r2
 # CHECK-ASM-NEW: encoding: [0xc3,0x28,0x04,0x00,0x00,0x00,0x00,0x00]
-stxxaddw [r8 + 4], r2 
+stxxaddw [r8 + 4], r2
 
 
 
@@ -225,7 +225,7 @@ stxxchgw [r8 - 16], w0
 
 # CMPXCHGD, CMPXCHGW32
 # CHECK-OBJ-NEW: stxcmpxchgdw [r8 - 16], r5
-# CHECK-OBJ-OLD: r0 = cmpxchg_64(r8 - 16, r0, r5) 
+# CHECK-OBJ-OLD: r0 = cmpxchg_64(r8 - 16, r0, r5)
 # CHECK32-OBJ-NEW: stxcmpxchgw [r8 - 16], w5
 # CHECK32-OBJ-OLD: w0 = cmpxchg32_32(r8 - 16, w0, w5)
 # CHECK-ASM-NEW: encoding: [0xdb,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
@@ -236,8 +236,8 @@ stxcmpxchgw [r8 - 16], w5
 
 
 # Obsolete ldabs/ldind for completeness.
-# CHECK-OBJ-NEW: ldabsb 64 
-# CHECK-OBJ-NEW: ldabsh 128 
+# CHECK-OBJ-NEW: ldabsb 64
+# CHECK-OBJ-NEW: ldabsh 128
 # CHECK-OBJ-NEW: ldabsw 0
 # CHECK-OBJ-NEW: ldindb r5
 # CHECK-OBJ-NEW: ldindh r9
@@ -254,8 +254,8 @@ stxcmpxchgw [r8 - 16], w5
 # CHECK-ASM-NEW: encoding: [0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x48,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x40,0x70,0x00,0x00,0x00,0x00,0x00,0x00]
-ldabsb 64 
-ldabsh 128 
+ldabsb 64
+ldabsh 128
 ldabsw 0
 ldindb r5
 ldindh r9
diff --git a/llvm/test/MC/SBF/sbf-sdiv.s b/llvm/test/MC/SBF/sbf-sdiv.s
index 1a2f627de067d..b1a767c71f3a0 100644
--- a/llvm/test/MC/SBF/sbf-sdiv.s
+++ b/llvm/test/MC/SBF/sbf-sdiv.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
 # RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
 
 .syntax_old

From 6f81e16a068f9f3e0d72495e922eaead290ed713 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Sun, 26 Feb 2023 10:47:43 -0500
Subject: [PATCH 015/114] [SOL] Add BPF target to LLDB

---
 lldb/include/lldb/Utility/ArchSpec.h   | 4 ++++
 lldb/source/Utility/ArchSpec.cpp       | 5 +++++
 llvm/lib/Object/RelocationResolver.cpp | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/lldb/include/lldb/Utility/ArchSpec.h b/lldb/include/lldb/Utility/ArchSpec.h
index 9340e909e7dfc..aafb379629333 100644
--- a/lldb/include/lldb/Utility/ArchSpec.h
+++ b/lldb/include/lldb/Utility/ArchSpec.h
@@ -246,6 +246,10 @@ class ArchSpec {
 
     eCore_wasm32,
 
+    eCore_bpf,
+    eCore_sbf,
+    eCore_sbfv2,
+
     kNumCores,
 
     kCore_invalid,
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index 64f33497426b4..c4ce534c0ebec 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -248,6 +248,9 @@ static const CoreDefinition g_core_definitions[] = {
 
     {eByteOrderLittle, 4, 1, 4, llvm::Triple::wasm32, ArchSpec::eCore_wasm32,
      "wasm32"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::bpfel, ArchSpec::eCore_bpf, "bpf"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbf, "sbf"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv2, "sbfv2"},
 };
 
 // Ensure that we have an entry in the g_core_definitions for each core. If you
@@ -432,6 +435,8 @@ static const ArchDefinitionEntry g_elf_arch_entries[] = {
     {ArchSpec::eCore_loongarch64, llvm::ELF::EM_LOONGARCH,
      ArchSpec::eLoongArchSubType_loongarch64, 0xFFFFFFFFu,
      0xFFFFFFFFu}, // loongarch64
+    {ArchSpec::eCore_bpf, llvm::ELF::EM_BPF, LLDB_INVALID_CPUTYPE,
+     0xFFFFFFFFu, 0xFFFFFFFFu}, // bpf
     {ArchSpec::eCore_sbf, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbf,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbf
     {ArchSpec::eCore_sbfv2, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv2,
diff --git a/llvm/lib/Object/RelocationResolver.cpp b/llvm/lib/Object/RelocationResolver.cpp
index 5a7391a51d414..dd3db18c68a91 100644
--- a/llvm/lib/Object/RelocationResolver.cpp
+++ b/llvm/lib/Object/RelocationResolver.cpp
@@ -105,6 +105,7 @@ static uint64_t resolveAArch64(uint64_t Type, uint64_t Offset, uint64_t S,
 
 static bool supportsBPF(uint64_t Type) {
   switch (Type) {
+  case ELF::R_BPF_64_64:
   case ELF::R_BPF_64_ABS32:
   case ELF::R_BPF_64_ABS64:
     return true;
@@ -116,6 +117,8 @@ static bool supportsBPF(uint64_t Type) {
 static uint64_t resolveBPF(uint64_t Type, uint64_t Offset, uint64_t S,
                            uint64_t LocData, int64_t /*Addend*/) {
   switch (Type) {
+  case ELF::R_BPF_64_64:
+    return S + LocData;
   case ELF::R_BPF_64_ABS32:
     return (S + LocData) & 0xFFFFFFFF;
   case ELF::R_BPF_64_ABS64:
@@ -127,6 +130,7 @@ static uint64_t resolveBPF(uint64_t Type, uint64_t Offset, uint64_t S,
 
 static bool supportsSBF(uint64_t Type) {
   switch (Type) {
+  case ELF::R_SBF_64_64:
   case ELF::R_SBF_64_ABS32:
   case ELF::R_SBF_64_ABS64:
     return true;
@@ -138,6 +142,8 @@ static bool supportsSBF(uint64_t Type) {
 static uint64_t resolveSBF(uint64_t Type, uint64_t Offset, uint64_t S,
                            uint64_t LocData, int64_t /*Addend*/) {
   switch (Type) {
+  case ELF::R_SBF_64_64:
+    return S + LocData;
   case ELF::R_SBF_64_ABS32:
     return (S + LocData) & 0xFFFFFFFF;
   case ELF::R_SBF_64_ABS64:

From b8d3f03908037b8482c9d6c69212cc1261e331c6 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Sun, 26 Feb 2023 14:12:50 -0500
Subject: [PATCH 016/114] [SOL] Add implicit addend for R_SBF_64_ABS32
 relocations

---
 lld/ELF/Arch/BPF.cpp | 6 ++++++
 lld/ELF/Arch/SBF.cpp | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/lld/ELF/Arch/BPF.cpp b/lld/ELF/Arch/BPF.cpp
index 727334325f1e0..61abc8e3db8e0 100644
--- a/lld/ELF/Arch/BPF.cpp
+++ b/lld/ELF/Arch/BPF.cpp
@@ -72,6 +72,12 @@ RelType BPF::getDynRel(RelType type) const {
 }
 
 int64_t BPF::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  switch (type) {
+  case R_BPF_64_ABS32:
+    return SignExtend64<32>(read32le(buf));
+  default:
+    return 0;
+  }
   return 0;
 }
 
diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
index 809d34b2e4387..d98a869196127 100644
--- a/lld/ELF/Arch/SBF.cpp
+++ b/lld/ELF/Arch/SBF.cpp
@@ -72,6 +72,12 @@ RelType SBF::getDynRel(RelType type) const {
 }
 
 int64_t SBF::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  switch (type) {
+  case R_SBF_64_ABS32:
+    return SignExtend64<32>(read32le(buf));
+  default:
+    return 0;
+  }
   return 0;
 }
 

From b02a7b0191d71f187b71fa6735c150ba310a7623 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Sun, 26 Feb 2023 19:53:32 -0500
Subject: [PATCH 017/114] [SOL] Handle BPF_64_64 relocations in .debug sections
 as ABS64

Because of a bug in BPF backend ABS64 relocations are incorrectly
generated as 64_64 relocations in BPF object files. This temporary
works around this for relocations in .debug section to generate debug
information addresses correctly.
---
 lld/ELF/InputSection.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 52c472bb89caf..3fc4e5189bda6 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -1041,6 +1041,19 @@ void InputSection::relocateNonAlloc(Ctx &ctx, uint8_t *buf,
     const RelTy &rel = *it;
     const RelType type = rel.getType(ctx.arg.isMips64EL);
     const uint64_t offset = rel.r_offset;
+
+    // FIX: Temporary remap BPF_64_64 relocations in debug sections.
+    if (config->emachine == EM_BPF && type == R_BPF_64_64 && isDebug)
+      type = R_BPF_64_ABS64;
+
+    // GCC 8.0 or earlier have a bug that they emit R_386_GOTPC relocations
+    // against _GLOBAL_OFFSET_TABLE_ for .debug_info. The bug has been fixed
+    // in 2017 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82630), but we
+    // need to keep this bug-compatible code for a while.
+    if (config->emachine == EM_386 && type == R_386_GOTPC)
+      continue;
+
+    uint64_t offset = rel.r_offset;
     uint8_t *bufLoc = buf + offset;
     int64_t addend = getAddend<ELFT>(rel);
     if (!RelTy::HasAddend)

From da81c3da6a32bfe07ab4efd1aee5f1218520bf37 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Thu, 28 Sep 2023 17:40:22 -0400
Subject: [PATCH 018/114] [SOL] Make adjustments after upgrading to llvm 16.0

---
 .github/workflows/llvm-project-tests.yml      |   6 -
 clang/test/Interpreter/global-dtor.cpp        |   2 +-
 .../InterpreterExceptionTest.cpp              |   1 +
 lld/ELF/Arch/BPF.cpp                          |   2 +-
 lld/ELF/Arch/SBF.cpp                          |   2 +-
 .../Plugins/ObjectFile/ELF/ObjectFileELF.cpp  |   2 +-
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp |  15 +-
 llvm/lib/Target/SBF/BTFDebug.cpp              | 116 ++++----
 llvm/lib/Target/SBF/BTFDebug.h                |   7 +
 llvm/lib/Target/SBF/CMakeLists.txt            |   1 +
 .../SBF/MCTargetDesc/SBFInstPrinter.cpp       |   1 +
 .../Target/SBF/MCTargetDesc/SBFInstPrinter.h  |   7 +-
 llvm/lib/Target/SBF/SBF.h                     |  16 +-
 .../Target/SBF/SBFAbstractMemberAccess.cpp    |  16 +-
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp          |   2 +-
 llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp   |   2 +-
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |  15 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp       |  13 +-
 llvm/lib/Target/SBF/SBFISelLowering.h         |   2 +-
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |   6 +-
 llvm/lib/Target/SBF/SBFInstrInfo.h            |   6 +-
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp       |   5 +-
 llvm/lib/Target/SBF/SBFRegisterInfo.h         |   2 +-
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |  30 +--
 llvm/lib/Target/SBF/SBFTargetMachine.h        |   6 +-
 llvm/lib/Target/SBF/SBFTargetTransformInfo.h  |  20 +-
 .../CodeGen/RISCV/inline-option-directive.ll  |   1 +
 llvm/test/CodeGen/SBF/objdump_atomics.ll      |   8 +-
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |  30 +--
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll    |   9 +-
 llvm/test/CodeGen/SBF/objdump_dis_all.ll      |   2 +-
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      |  10 +-
 llvm/test/CodeGen/SBF/objdump_intrinsics.ll   |   2 +-
 llvm/test/CodeGen/SBF/objdump_static_var.ll   |   8 +-
 llvm/test/CodeGen/SBF/objdump_trivial.ll      |   4 +-
 llvm/test/CodeGen/SBF/reloc-2.ll              |   2 +-
 llvm/test/CodeGen/SBF/simplifycfg.ll          |   4 +-
 llvm/test/MC/RISCV/option-arch.s              |   1 +
 llvm/test/MC/RISCV/option-invalid.s           |   1 +
 llvm/test/MC/SBF/insn-unit-32.s               |  64 ++---
 llvm/test/MC/SBF/insn-unit.s                  | 116 ++++----
 llvm/test/MC/SBF/load-store-32.s              |  28 +-
 llvm/test/MC/SBF/sbf-alu.s                    | 144 +++++-----
 llvm/test/MC/SBF/sbf-jmp.s                    | 248 +++++++++---------
 llvm/test/MC/SBF/sbf-ldst.s                   | 180 ++++++-------
 llvm/test/MC/SBF/sbf-sdiv.s                   |   4 +-
 46 files changed, 596 insertions(+), 573 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index f5cc3216ff56f..240dd1ead773e 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -92,12 +92,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
-      - name: Install homebrew packages
-        if: startsWith(matrix.os, 'macOS')
-        run: |
-          brew rm swig
-          brew install swig@3
-          brew link swig@3
       - name: Install Ninja
         if: runner.os != 'Linux'
         uses: llvm/actions/install-ninja@main
diff --git a/clang/test/Interpreter/global-dtor.cpp b/clang/test/Interpreter/global-dtor.cpp
index 1f241d9f19317..e413f1695fa7f 100644
--- a/clang/test/Interpreter/global-dtor.cpp
+++ b/clang/test/Interpreter/global-dtor.cpp
@@ -10,4 +10,4 @@ extern "C" int printf(const char *, ...);
 struct D { float f = 1.0; D *m = nullptr; D(){} ~D() { printf("D[f=%f, m=0x%llx]\n", f, reinterpret_cast<unsigned long long>(m)); }} d;
 // CHECK: D[f=1.000000, m=0x0]
 
-%quit
\ No newline at end of file
+%quit
diff --git a/clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp b/clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp
index bc2bd11df6aef..aa1ecc939229f 100644
--- a/clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp
+++ b/clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp
@@ -63,6 +63,7 @@ TEST(InterpreterExceptionTest, DISABLED_CatchException) {
 #else
 TEST(InterpreterExceptionTest, CatchException) {
 #endif
+  GTEST_SKIP() << "Skipping single test";
   llvm::llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
   llvm::InitializeNativeTarget();
   llvm::InitializeNativeTargetAsmPrinter();
diff --git a/lld/ELF/Arch/BPF.cpp b/lld/ELF/Arch/BPF.cpp
index 61abc8e3db8e0..d2d71c0f48fdb 100644
--- a/lld/ELF/Arch/BPF.cpp
+++ b/lld/ELF/Arch/BPF.cpp
@@ -126,7 +126,7 @@ uint32_t BPF::calcEFlags() const {
 
   // Ensure that all the object files were compiled with the same flags, as
   // different flags indicate different ABIs.
-  for (InputFile *f : ctx->objectFiles) {
+  for (InputFile *f : ctx.objectFiles) {
     uint32_t flags = getEFlags(f);
     if (ret == 0) {
       ret = flags;
diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
index d98a869196127..0b30bbeacf0f9 100644
--- a/lld/ELF/Arch/SBF.cpp
+++ b/lld/ELF/Arch/SBF.cpp
@@ -126,7 +126,7 @@ uint32_t SBF::calcEFlags() const {
 
   // Ensure that all the object files were compiled with the same flags, as
   // different flags indicate different ABIs.
-  for (InputFile *f : ctx->objectFiles) {
+  for (InputFile *f : ctx.objectFiles) {
     uint32_t flags = getEFlags(f);
     if (ret == 0) {
       ret = flags;
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 7f7042706afc6..be705ee935b87 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -350,7 +350,7 @@ static uint32_t subTypeFromElfHeader(const elf::ELFHeader &header) {
   else if (header.e_machine == llvm::ELF::EM_LOONGARCH)
     return loongarchVariantFromElfFlags(header);
   else if (header.e_machine == llvm::ELF::EM_BPF)
-    return bpfVariantFromElfFlags(header);
+    return sbfVariantFromElfFlags(header);
   else if (header.e_machine == llvm::ELF::EM_SBF)
     return sbfVariantFromElfFlags(header);
 
diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index e785449e2f8aa..6166da9171bec 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -44,8 +44,9 @@ class SBFAsmParser : public MCTargetAsmParser {
                                uint64_t &ErrorInfo,
                                bool MatchingInlineAsm) override;
 
-  bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) override;
-  OperandMatchResultTy tryParseRegister(unsigned &RegNo, SMLoc &StartLoc,
+  bool parseRegister(MCRegister &Reg, SMLoc &StartLoc,
+                     SMLoc &EndLoc) override;
+  OperandMatchResultTy tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
                                         SMLoc &EndLoc) override;
 
   bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
@@ -347,20 +348,20 @@ bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
   llvm_unreachable("Unknown match type detected!");
 }
 
-bool SBFAsmParser::ParseRegister(unsigned &RegNo, SMLoc &StartLoc,
+bool SBFAsmParser::parseRegister(MCRegister &Reg, SMLoc &StartLoc,
                                  SMLoc &EndLoc) {
-  if (tryParseRegister(RegNo, StartLoc, EndLoc) != MatchOperand_Success)
+  if (tryParseRegister(Reg, StartLoc, EndLoc) != MatchOperand_Success)
     return Error(StartLoc, "invalid register name");
   return false;
 }
 
-OperandMatchResultTy SBFAsmParser::tryParseRegister(unsigned &RegNo,
+OperandMatchResultTy SBFAsmParser::tryParseRegister(MCRegister &Reg,
                                                     SMLoc &StartLoc,
                                                     SMLoc &EndLoc) {
   const AsmToken &Tok = getParser().getTok();
   StartLoc = Tok.getLoc();
   EndLoc = Tok.getEndLoc();
-  RegNo = 0;
+  Reg = 0;
   StringRef Name = getLexer().getTok().getIdentifier();
 
   if (!MatchRegisterName(Name)) {
@@ -395,7 +396,7 @@ SBFAsmParser::parseOperandAsOperator(OperandVector &Operands) {
   case AsmToken::Plus: {
     if (getLexer().peekTok().is(AsmToken::Integer))
       return MatchOperand_NoMatch;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   }
 
   case AsmToken::Equal:
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index 5f2595903c865..f0317c76dd44b 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Support/LineIterator.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
+#include <optional>
 
 using namespace llvm;
 using namespace BTFX;
@@ -597,6 +598,25 @@ void BTFDebug::processDeclAnnotations(DINodeArray Annotations,
   }
 }
 
+uint32_t BTFDebug::processDISubprogram(const DISubprogram *SP,
+                                       uint32_t ProtoTypeId, uint8_t Scope) {
+  auto FuncTypeEntry =
+      std::make_unique<BTFTypeFunc>(SP->getName(), ProtoTypeId, Scope);
+  uint32_t FuncId = addType(std::move(FuncTypeEntry));
+
+  // Process argument annotations.
+  for (const DINode *DN : SP->getRetainedNodes()) {
+    if (const auto *DV = dyn_cast<DILocalVariable>(DN)) {
+      uint32_t Arg = DV->getArg();
+      if (Arg)
+        processDeclAnnotations(DV->getAnnotations(), FuncId, Arg - 1);
+    }
+  }
+  processDeclAnnotations(SP->getAnnotations(), FuncId, -1);
+
+  return FuncId;
+}
+
 /// Generate btf_type_tag chains.
 int BTFDebug::genBTFTypeTags(const DIDerivedType *DTy, int BaseTypeId) {
   SmallVector<const MDString *, 4> MDStrs;
@@ -763,6 +783,17 @@ void BTFDebug::visitCompositeType(const DICompositeType *CTy,
     visitEnumType(CTy, TypeId);
 }
 
+bool BTFDebug::IsForwardDeclCandidate(const DIType *Base) {
+  if (const auto *CTy = dyn_cast<DICompositeType>(Base)) {
+    auto CTag = CTy->getTag();
+    if ((CTag == dwarf::DW_TAG_structure_type ||
+         CTag == dwarf::DW_TAG_union_type) &&
+        !CTy->getName().empty() && !CTy->isForwardDecl())
+      return true;
+  }
+  return false;
+}
+
 /// Handle pointer, typedef, const, volatile, restrict and member types.
 void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
                                 bool CheckPointer, bool SeenPointer) {
@@ -777,20 +808,15 @@ void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
   if (CheckPointer && SeenPointer) {
     const DIType *Base = DTy->getBaseType();
     if (Base) {
-      if (const auto *CTy = dyn_cast<DICompositeType>(Base)) {
-        auto CTag = CTy->getTag();
-        if ((CTag == dwarf::DW_TAG_structure_type ||
-             CTag == dwarf::DW_TAG_union_type) &&
-            !CTy->getName().empty() && !CTy->isForwardDecl()) {
-          /// Find a candidate, generate a fixup. Later on the struct/union
-          /// pointee type will be replaced with either a real type or
-          /// a forward declaration.
-          auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, true);
-          auto &Fixup = FixupDerivedTypes[CTy];
-          Fixup.push_back(std::make_pair(DTy, TypeEntry.get()));
-          TypeId = addType(std::move(TypeEntry), DTy);
-          return;
-        }
+      if (IsForwardDeclCandidate(Base)) {
+        /// Find a candidate, generate a fixup. Later on the struct/union
+        /// pointee type will be replaced with either a real type or
+        /// a forward declaration.
+        auto TypeEntry = std::make_unique<BTFTypeDerived>(DTy, Tag, true);
+        auto &Fixup = FixupDerivedTypes[dyn_cast<DICompositeType>(Base)];
+        Fixup.push_back(std::make_pair(DTy, TypeEntry.get()));
+        TypeId = addType(std::move(TypeEntry), DTy);
+        return;
       }
     }
   }
@@ -825,6 +851,13 @@ void BTFDebug::visitDerivedType(const DIDerivedType *DTy, uint32_t &TypeId,
     visitTypeEntry(DTy->getBaseType(), TempTypeId, CheckPointer, SeenPointer);
 }
 
+/// Visit a type entry. CheckPointer is true if the type has
+/// one of its predecessors as one struct/union member. SeenPointer
+/// is true if CheckPointer is true and one of its predecessors
+/// is a pointer. The goal of CheckPointer and SeenPointer is to
+/// do pruning for struct/union types so some of these types
+/// will not be emitted in BTF and rather forward declarations
+/// will be generated.
 void BTFDebug::visitTypeEntry(const DIType *Ty, uint32_t &TypeId,
                               bool CheckPointer, bool SeenPointer) {
   if (!Ty || DIToIdMap.find(Ty) != DIToIdMap.end()) {
@@ -869,6 +902,11 @@ void BTFDebug::visitTypeEntry(const DIType *Ty, uint32_t &TypeId,
           if (DIToIdMap.find(BaseTy) != DIToIdMap.end()) {
             DTy = dyn_cast<DIDerivedType>(BaseTy);
           } else {
+            if (CheckPointer && DTy->getTag() == dwarf::DW_TAG_pointer_type) {
+              SeenPointer = true;
+              if (IsForwardDeclCandidate(BaseTy))
+                break;
+            }
             uint32_t TmpTypeId;
             visitTypeEntry(BaseTy, TmpTypeId, CheckPointer, SeenPointer);
             break;
@@ -1178,20 +1216,7 @@ void BTFDebug::beginFunctionImpl(const MachineFunction *MF) {
 
   // Construct subprogram func type
   uint8_t Scope = SP->isLocalToUnit() ? BTF::FUNC_STATIC : BTF::FUNC_GLOBAL;
-  auto FuncTypeEntry =
-      std::make_unique<BTFTypeFunc>(SP->getName(), ProtoTypeId, Scope);
-  uint32_t FuncTypeId = addType(std::move(FuncTypeEntry));
-
-  // Process argument annotations.
-  for (const DINode *DN : SP->getRetainedNodes()) {
-    if (const auto *DV = dyn_cast<DILocalVariable>(DN)) {
-      uint32_t Arg = DV->getArg();
-      if (Arg)
-        processDeclAnnotations(DV->getAnnotations(), FuncTypeId, Arg - 1);
-    }
-  }
-
-  processDeclAnnotations(SP->getAnnotations(), FuncTypeId, -1);
+  uint32_t FuncTypeId = processDISubprogram(SP, ProtoTypeId, Scope);
 
   for (const auto &TypeEntry : TypeEntries)
     TypeEntry->completeType(*this);
@@ -1358,7 +1383,7 @@ void BTFDebug::beginInstruction(const MachineInstr *MI) {
   OS.emitLabel(LineSym);
 
   // Construct the lineinfo.
-  auto SP = DL.get()->getScope()->getSubprogram();
+  auto SP = DL->getScope()->getSubprogram();
   constructLineInfo(SP, LineSym, DL.getLine(), DL.getCol());
 
   LineInfoGenerated = true;
@@ -1371,14 +1396,19 @@ void BTFDebug::processGlobals(bool ProcessingMapDef) {
   for (const GlobalVariable &Global : M->globals()) {
     // Decide the section name.
     StringRef SecName;
-    if (Global.hasSection()) {
-      SecName = Global.getSection();
-    } else if (Global.hasInitializer()) {
-      // data, bss, or readonly sections
-      if (Global.isConstant())
-        SecName = ".rodata";
-      else
-        SecName = Global.getInitializer()->isZeroValue() ? ".bss" : ".data";
+    std::optional<SectionKind> GVKind;
+
+    if (!Global.isDeclarationForLinker())
+      GVKind = TargetLoweringObjectFile::getKindForGlobal(&Global, Asm->TM);
+
+    if (Global.isDeclarationForLinker())
+      SecName = Global.hasSection() ? Global.getSection() : "";
+    else if (GVKind->isCommon())
+      SecName = ".bss";
+    else {
+      TargetLoweringObjectFile *TLOF = Asm->TM.getObjFileLowering();
+      MCSection *Sec = TLOF->SectionForGlobal(&Global, Asm->TM);
+      SecName = Sec->getName();
     }
 
     if (ProcessingMapDef != SecName.startswith(".maps"))
@@ -1389,10 +1419,8 @@ void BTFDebug::processGlobals(bool ProcessingMapDef) {
     // and .rodata.cst<#> sections.
     if (SecName == ".rodata" && Global.hasPrivateLinkage() &&
         DataSecEntries.find(std::string(SecName)) == DataSecEntries.end()) {
-      SectionKind GVKind =
-          TargetLoweringObjectFile::getKindForGlobal(&Global, Asm->TM);
       // skip .rodata.str<#> and .rodata.cst<#> sections
-      if (!GVKind.isMergeableCString() && !GVKind.isMergeableConst()) {
+      if (!GVKind->isMergeableCString() && !GVKind->isMergeableConst()) {
         DataSecEntries[std::string(SecName)] =
             std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
       }
@@ -1534,13 +1562,7 @@ void BTFDebug::processFuncPrototypes(const Function *F) {
   uint32_t ProtoTypeId;
   const std::unordered_map<uint32_t, StringRef> FuncArgNames;
   visitSubroutineType(SP->getType(), false, FuncArgNames, ProtoTypeId);
-
-  uint8_t Scope = BTF::FUNC_EXTERN;
-  auto FuncTypeEntry =
-      std::make_unique<BTFTypeFunc>(SP->getName(), ProtoTypeId, Scope);
-  uint32_t FuncId = addType(std::move(FuncTypeEntry));
-
-  processDeclAnnotations(SP->getAnnotations(), FuncId, -1);
+  uint32_t FuncId = processDISubprogram(SP, ProtoTypeId, BTF::FUNC_EXTERN);
 
   if (F->hasSection()) {
     StringRef SecName = F->getSection();
diff --git a/llvm/lib/Target/SBF/BTFDebug.h b/llvm/lib/Target/SBF/BTFDebug.h
index 2222ac516284b..802ff956757f3 100644
--- a/llvm/lib/Target/SBF/BTFDebug.h
+++ b/llvm/lib/Target/SBF/BTFDebug.h
@@ -341,6 +341,9 @@ class BTFDebug : public DebugHandlerBase {
   void visitMapDefType(const DIType *Ty, uint32_t &TypeId);
   /// @}
 
+  /// Check whether the type is a forward declaration candidate or not.
+  bool IsForwardDeclCandidate(const DIType *Base);
+
   /// Get the file content for the subprogram. Certain lines of the file
   /// later may be put into string table and referenced by line info.
   std::string populateFileContent(const DISubprogram *SP);
@@ -359,6 +362,10 @@ class BTFDebug : public DebugHandlerBase {
   void processDeclAnnotations(DINodeArray Annotations, uint32_t BaseTypeId,
                               int ComponentId);
 
+  /// Generate types for DISubprogram and it's arguments.
+  uint32_t processDISubprogram(const DISubprogram *SP, uint32_t ProtoTypeId,
+                               uint8_t Scope);
+
   /// Generate BTF type_tag's. If BaseTypeId is nonnegative, the last
   /// BTF type_tag in the chain points to BaseTypeId. Otherwise, it points to
   /// the base type of DTy. Return the type id of the first BTF type_tag
diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index c7c1fc870f2fc..d4f2818f473f7 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -49,6 +49,7 @@ add_llvm_target(SBFCodeGen
   SelectionDAG
   Support
   Target
+  TargetParser
   TransformUtils
 
   ADD_TO_COMPONENT
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
index cd61f6c6abdd7..c2dac7911231b 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
@@ -14,6 +14,7 @@
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCRegister.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
index 1cd4066e98119..8ba00f3e67699 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
@@ -34,15 +34,14 @@ class SBFInstPrinter : public MCInstPrinter {
   // Autogenerated by tblgen.
   std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
   void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
-  static const char *getRegisterName(unsigned RegNo);
+  static const char *getRegisterName(MCRegister Reg);
 };
-
 class MachineInstr;
 
 class SBFLegacyInstPrinter : public SBFInstPrinter {
 public:
   SBFLegacyInstPrinter(const MCAsmInfo &MAI, const MCInstrInfo &MII,
-                   const MCRegisterInfo &MRI)
+                       const MCRegisterInfo &MRI)
       : SBFInstPrinter(MAI, MII, MRI) {}
 
   void printInst(const MCInst *MI, uint64_t Address, StringRef Annot,
@@ -54,7 +53,7 @@ class SBFLegacyInstPrinter : public SBFInstPrinter {
   // Autogenerated by tblgen.
   std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
   void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
-  static const char *getRegisterName(unsigned RegNo);
+  static const char *getRegisterName(MCRegister Reg);
 };
 
 }
diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
index 6820de3120760..91e072c6caeb6 100644
--- a/llvm/lib/Target/SBF/SBF.h
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -12,11 +12,11 @@
 #include "MCTargetDesc/SBFMCTargetDesc.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
-#include "llvm/PassRegistry.h"
 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {
 class SBFTargetMachine;
+class PassRegistry;
 
 ModulePass *createSBFAdjustOpt();
 ModulePass *createSBFCheckAndAdjustIR();
@@ -31,17 +31,17 @@ FunctionPass *createSBFMIPeepholeTruncElimPass();
 FunctionPass *createSBFMIPreEmitPeepholePass();
 FunctionPass *createSBFMIPreEmitCheckingPass();
 
+void initializeSBFAbstractMemberAccessLegacyPassPass(PassRegistry &);
 void initializeSBFAdjustOptPass(PassRegistry&);
 void initializeSBFCheckAndAdjustIRPass(PassRegistry&);
-
-void initializeSBFAbstractMemberAccessLegacyPassPass(PassRegistry &);
-void initializeSBFPreserveDITypePass(PassRegistry&);
-void initializeSBFIRPeepholePass(PassRegistry&);
-void initializeSBFMISimplifyPatchablePass(PassRegistry&);
+void initializeSBFDAGToDAGISelPass(PassRegistry &);
+void initializeSBFIRPeepholePass(PassRegistry &);
 void initializeSBFMIPeepholePass(PassRegistry&);
-void initializeSBFMIPeepholeTruncElimPass(PassRegistry&);
-void initializeSBFMIPreEmitPeepholePass(PassRegistry&);
+void initializeSBFMIPeepholeTruncElimPass(PassRegistry &);
 void initializeSBFMIPreEmitCheckingPass(PassRegistry&);
+void initializeSBFMIPreEmitPeepholePass(PassRegistry &);
+void initializeSBFMISimplifyPatchablePass(PassRegistry &);
+void initializeSBFPreserveDITypePass(PassRegistry &);
 
 class SBFAbstractMemberAccessPass
     : public PassInfoMixin<SBFAbstractMemberAccessPass> {
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
index 83e24f7b9393b..bba59962f3df5 100644
--- a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -106,7 +106,7 @@ Instruction *SBFCoreSharedInfo::insertPassThrough(Module *M, BasicBlock *BB,
                                          SBFCoreSharedInfo::SeqNum++);
 
   auto *NewInst = CallInst::Create(Fn, {SeqNumVal, Input});
-  BB->getInstList().insert(Before->getIterator(), NewInst);
+  NewInst->insertBefore(Before);
   return NewInst;
 }
 } // namespace llvm
@@ -125,7 +125,7 @@ class SBFAbstractMemberAccess final {
     uint32_t AccessIndex;
     MaybeAlign RecordAlignment;
     MDNode *Metadata;
-    Value *Base;
+    WeakTrackingVH Base;
   };
   typedef std::stack<std::pair<CallInst *, CallInfo>> CallInfoStack;
 
@@ -347,7 +347,7 @@ static uint32_t calcArraySize(const DICompositeType *CTy, uint32_t StartDim) {
 
 static Type *getBaseElementType(const CallInst *Call) {
   // Element type is stored in an elementtype() attribute on the first param.
-  return Call->getAttributes().getParamElementType(0);
+  return Call->getParamElementType(0);
 }
 
 /// Check whether a call is a preserve_*_access_index intrinsic call or not.
@@ -437,7 +437,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
 void SBFAbstractMemberAccess::replaceWithGEP(std::vector<CallInst *> &CallList,
                                              uint32_t DimensionIndex,
                                              uint32_t GEPIndex) {
-  for (auto Call : CallList) {
+  for (auto *Call : CallList) {
     uint32_t Dimension = 1;
     if (DimensionIndex > 0)
       Dimension = getConstant(Call->getArgOperand(DimensionIndex));
@@ -490,7 +490,7 @@ bool SBFAbstractMemberAccess::removePreserveAccessIndexIntrinsic(Function &F) {
   //     addr = GEP(base, 0, gep_index)
   replaceWithGEP(PreserveArrayIndexCalls, 1, 2);
   replaceWithGEP(PreserveStructIndexCalls, 0, 1);
-  for (auto Call : PreserveUnionIndexCalls) {
+  for (auto *Call : PreserveUnionIndexCalls) {
     Call->replaceAllUsesWith(Call->getArgOperand(0));
     Call->eraseFromParent();
   }
@@ -1134,16 +1134,16 @@ bool SBFAbstractMemberAccess::transformGEPChain(CallInst *Call,
 
   // Generate a BitCast
   auto *BCInst = new BitCastInst(Base, Type::getInt8PtrTy(BB->getContext()));
-  BB->getInstList().insert(Call->getIterator(), BCInst);
+  BCInst->insertBefore(Call);
 
   // Generate a GetElementPtr
   auto *GEP = GetElementPtrInst::Create(Type::getInt8Ty(BB->getContext()),
                                         BCInst, LDInst);
-  BB->getInstList().insert(Call->getIterator(), GEP);
+  GEP->insertBefore(Call);
 
   // Generate a BitCast
   auto *BCInst2 = new BitCastInst(GEP, Call->getType());
-  BB->getInstList().insert(Call->getIterator(), BCInst2);
+  BCInst2->insertBefore(Call);
 
   // For the following code,
   //    Block0:
diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
index b6f562fbcad73..ea6c1c97885dc 100644
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -146,7 +146,7 @@ bool SBFAdjustOptImpl::adjustICmpToBuiltin() {
         Function *Fn = Intrinsic::getDeclaration(
             M, Intrinsic::bpf_compare, {Op0->getType(), ConstOp1->getType()});
         auto *NewInst = CallInst::Create(Fn, {Opcode, Op0, ConstOp1});
-        BB.getInstList().insert(I.getIterator(), NewInst);
+        NewInst->insertBefore(&I);
         Icmp->replaceAllUsesWith(NewInst);
         Changed = true;
         ToBeDeleted = Icmp;
diff --git a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
index 50dce7a2e21b2..ab00cefcead9d 100644
--- a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
+++ b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
@@ -153,7 +153,7 @@ bool SBFCheckAndAdjustIR::removeCompareBuiltin(Module &M) {
         CmpInst::Predicate Opcode = (CmpInst::Predicate)OpVal;
 
         auto *ICmp = new ICmpInst(Opcode, Arg1, Arg2);
-        BB.getInstList().insert(Call->getIterator(), ICmp);
+        ICmp->insertBefore(Call);
 
         Call->replaceAllUsesWith(ICmp);
         ToBeDeleted = Call;
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index a03e62b8aab97..3acd2d0215ffd 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -34,6 +34,7 @@
 using namespace llvm;
 
 #define DEBUG_TYPE "sbf-isel"
+#define PASS_NAME "SBF DAG->DAG Pattern Instruction Selection"
 
 // Instruction Selector Implementation
 namespace {
@@ -45,12 +46,12 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
   const SBFSubtarget *Subtarget;
 
 public:
-  explicit SBFDAGToDAGISel(SBFTargetMachine &TM)
-      : SelectionDAGISel(TM), Subtarget(nullptr) {}
+  static char ID;
 
-  StringRef getPassName() const override {
-    return "SBF DAG->DAG Pattern Instruction Selection";
-  }
+  SBFDAGToDAGISel() = delete;
+
+  explicit SBFDAGToDAGISel(SBFTargetMachine &TM)
+      : SelectionDAGISel(ID, TM), Subtarget(nullptr) {}
 
   bool runOnMachineFunction(MachineFunction &MF) override {
     // Reset the subtarget each time through.
@@ -96,6 +97,10 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
 };
 } // namespace
 
+char SBFDAGToDAGISel::ID = 0;
+
+INITIALIZE_PASS(SBFDAGToDAGISel, DEBUG_TYPE, PASS_NAME, false, false)
+
 // ComplexPattern used on SBF Load/Store instructions
 bool SBFDAGToDAGISel::SelectAddr(SDValue Addr, SDValue &Base, SDValue &Offset) {
   // if Address is FI, get the TargetFrameIndex.
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index da6cfbb97f999..5ab4c21c6374a 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -203,6 +203,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     MaxStoresPerMemset = MaxStoresPerMemsetOptSize = 0;
     MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = 0;
     MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 0;
+    MaxLoadsPerMemcmp = 0;
   } else {
     auto SelectionDAGInfo = STI.getSelectionDAGInfo();
     SelectionDAGInfo->setSolanaFlag(STI.isSolana());
@@ -213,6 +214,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     MaxStoresPerMemset = MaxStoresPerMemsetOptSize = CommonMaxStores;
     MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = CommonMaxStores;
     MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = CommonMaxStores;
+    MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = CommonMaxStores;
   }
 
   // CPU/Feature control
@@ -223,13 +225,13 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
 }
 
 bool SBFTargetLowering::allowsMisalignedMemoryAccesses(
-    EVT VT, unsigned, Align, MachineMemOperand::Flags, bool *Fast) const {
+    EVT VT, unsigned, Align, MachineMemOperand::Flags, unsigned *Fast) const {
   if (!VT.isSimple()) {
     return false;
   }
   bool isSolana = Subtarget->isSolana();
   if (isSolana && Fast) {
-    *Fast = true;
+    *Fast = 1;
   }
   return isSolana;
 }
@@ -482,6 +484,7 @@ SDValue SBFTargetLowering::LowerFormalArguments(
   if (Subtarget->isSolana()) {
     if (IsVarArg) {
       fail(DL, DAG, "Functions with VarArgs are not supported");
+      assert(false);
     }
   } else if (IsVarArg || MF.getFunction().hasStructRetAttr()) {
     fail(DL, DAG, "functions with VarArgs or StructRet are not supported");
@@ -658,9 +661,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   InFlag = Chain.getValue(1);
 
   // Create the CALLSEQ_END node.
-  Chain = DAG.getCALLSEQ_END(
-      Chain, DAG.getConstant(NumBytes, CLI.DL, PtrVT, true),
-      DAG.getConstant(0, CLI.DL, PtrVT, true), InFlag, CLI.DL);
+  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, 0, InFlag, CLI.DL);
   InFlag = Chain.getValue(1);
 
   // Handle result values, copying them out of physregs into vregs that we
@@ -833,7 +834,7 @@ SDValue SBFTargetLowering::LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const {
   // Load the current value
   SDValue Load =
       DAG.getExtLoad(ISD::EXTLOAD, DL, RetVT, Chain, Ptr, MachinePointerInfo(),
-                     PtrVT, AN->getAlignment());
+                     PtrVT, AN->getAlign());
   Chain = Load.getValue(1);
 
   // Most ops return the current value, except CMP_SWAP_WITH_SUCCESS see below
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index da0739ac6116e..e017ce2c9805e 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -39,7 +39,7 @@ class SBFTargetLowering : public TargetLowering {
 
   bool allowsMisalignedMemoryAccesses(EVT VT, unsigned, Align,
                                       MachineMemOperand::Flags,
-                                      bool *) const override;
+                                      unsigned *) const override;
 
   // Provide custom lowering hooks for some operations.
   SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const override;
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index 87b42dda5b816..c0047291f4398 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -125,7 +125,8 @@ void SBFInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
                                        MachineBasicBlock::iterator I,
                                        Register SrcReg, bool IsKill, int FI,
                                        const TargetRegisterClass *RC,
-                                       const TargetRegisterInfo *TRI) const {
+                                       const TargetRegisterInfo *TRI,
+                                       Register VReg) const {
   DebugLoc DL;
   if (I != MBB.end())
     DL = I->getDebugLoc();
@@ -148,7 +149,8 @@ void SBFInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
                                         MachineBasicBlock::iterator I,
                                         Register DestReg, int FI,
                                         const TargetRegisterClass *RC,
-                                        const TargetRegisterInfo *TRI) const {
+                                        const TargetRegisterInfo *TRI,
+                                        Register VReg) const {
   DebugLoc DL;
   if (I != MBB.end())
     DL = I->getDebugLoc();
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index 150149bff1eed..0711f216386ab 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -39,12 +39,14 @@ class SBFInstrInfo : public SBFGenInstrInfo {
                            MachineBasicBlock::iterator MBBI, Register SrcReg,
                            bool isKill, int FrameIndex,
                            const TargetRegisterClass *RC,
-                           const TargetRegisterInfo *TRI) const override;
+                           const TargetRegisterInfo *TRI,
+                           Register VReg) const override;
 
   void loadRegFromStackSlot(MachineBasicBlock &MBB,
                             MachineBasicBlock::iterator MBBI, Register DestReg,
                             int FrameIndex, const TargetRegisterClass *RC,
-                            const TargetRegisterInfo *TRI) const override;
+                            const TargetRegisterInfo *TRI,
+                            Register VReg) const override;
   bool analyzeBranch(MachineBasicBlock &MBB, MachineBasicBlock *&TBB,
                      MachineBasicBlock *&FBB,
                      SmallVectorImpl<MachineOperand> &Cond,
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 0cd475a829a90..15164c37c7121 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -73,7 +73,7 @@ static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
   }
 }
 
-void SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
+bool SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
                                           int SPAdj, unsigned FIOperandNum,
                                           RegScavenger *RS) const {
   assert(SPAdj == 0 && "Unexpected");
@@ -112,7 +112,7 @@ void SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
     BuildMI(MBB, ++II, DL, TII.get(SBF::ADD_ri), reg)
         .addReg(reg)
         .addImm(Offset);
-    return;
+    return false;
   }
 
   int Offset = MF.getFrameInfo().getObjectOffset(FrameIndex) +
@@ -143,6 +143,7 @@ void SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
     MI.getOperand(i).ChangeToRegister(FrameReg, false);
     MI.getOperand(i + 1).ChangeToImmediate(Offset);
   }
+  return false;
 }
 
 Register SBFRegisterInfo::getFrameRegister(const MachineFunction &MF) const {
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.h b/llvm/lib/Target/SBF/SBFRegisterInfo.h
index bfe6741aacf68..a58586905b9fa 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.h
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.h
@@ -29,7 +29,7 @@ struct SBFRegisterInfo : public SBFGenRegisterInfo {
 
   BitVector getReservedRegs(const MachineFunction &MF) const override;
 
-  void eliminateFrameIndex(MachineBasicBlock::iterator MI, int SPAdj,
+  bool eliminateFrameIndex(MachineBasicBlock::iterator MI, int SPAdj,
                            unsigned FIOperandNum,
                            RegScavenger *RS = nullptr) const override;
 
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 37137583a47a5..6d13b6ca61de5 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -24,10 +24,10 @@
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Target/TargetOptions.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Scalar/SimplifyCFG.h"
 #include "llvm/Transforms/Utils/SimplifyCFGOptions.h"
+#include <optional>
 using namespace llvm;
 
 static cl::
@@ -56,15 +56,15 @@ static std::string computeDataLayout(const Triple &TT, StringRef FS) {
   return "e-m:e-p:64:64-i64:64-n32:64-S128";
 }
 
-static Reloc::Model getEffectiveRelocModel(Optional<Reloc::Model> RM) {
+static Reloc::Model getEffectiveRelocModel(std::optional<Reloc::Model> RM) {
   return RM.value_or(Reloc::PIC_);
 }
 
 SBFTargetMachine::SBFTargetMachine(const Target &T, const Triple &TT,
                                    StringRef CPU, StringRef FS,
                                    const TargetOptions &Options,
-                                   Optional<Reloc::Model> RM,
-                                   Optional<CodeModel::Model> CM,
+                                   std::optional<Reloc::Model> RM,
+                                   std::optional<CodeModel::Model> CM,
                                    CodeGenOpt::Level OL, bool JIT)
     : LLVMTargetMachine(T, computeDataLayout(TT, FS), TT, CPU, FS, Options,
                         getEffectiveRelocModel(RM),
@@ -101,28 +101,6 @@ TargetPassConfig *SBFTargetMachine::createPassConfig(PassManagerBase &PM) {
   return new SBFPassConfig(*this, PM);
 }
 
-void SBFTargetMachine::adjustPassManager(PassManagerBuilder &Builder) {
- Builder.addExtension(
-      PassManagerBuilder::EP_EarlyAsPossible,
-      [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
-        PM.add(createSBFAbstractMemberAccess(this));
-        PM.add(createSBFPreserveDIType());
-        PM.add(createSBFIRPeephole());
-      });
-
-  Builder.addExtension(
-      PassManagerBuilder::EP_Peephole,
-      [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
-        PM.add(createCFGSimplificationPass(
-            SimplifyCFGOptions().hoistCommonInsts(true)));
-      });
-  Builder.addExtension(
-      PassManagerBuilder::EP_ModuleOptimizerEarly,
-      [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
-        PM.add(createSBFAdjustOpt());
-      });
-}
-
 void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
   PB.registerPipelineStartEPCallback(
       [=](ModulePassManager &MPM, OptimizationLevel) {
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
index 7a00badff12d4..cd03b3473b36a 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.h
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -24,8 +24,9 @@ class SBFTargetMachine : public LLVMTargetMachine {
 public:
   SBFTargetMachine(const Target &T, const Triple &TT, StringRef CPU,
                    StringRef FS, const TargetOptions &Options,
-                   Optional<Reloc::Model> RM, Optional<CodeModel::Model> CM,
-                   CodeGenOpt::Level OL, bool JIT);
+                   std::optional<Reloc::Model> RM,
+                   std::optional<CodeModel::Model> CM, CodeGenOpt::Level OL,
+                   bool JIT);
 
   const SBFSubtarget *getSubtargetImpl() const { return &Subtarget; }
   const SBFSubtarget *getSubtargetImpl(const Function &) const override {
@@ -40,7 +41,6 @@ class SBFTargetMachine : public LLVMTargetMachine {
     return TLOF.get();
   }
 
-  void adjustPassManager(PassManagerBuilder &) override;
   void registerPassBuilderCallbacks(PassBuilder &PB) override;
 };
 }
diff --git a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
index 649d38d083631..941e57fc2ccdf 100644
--- a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
+++ b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
@@ -57,20 +57,26 @@ class SBFTTIImpl : public BasicTTIImplBase<SBFTTIImpl> {
 
   InstructionCost getArithmeticInstrCost(
       unsigned Opcode, Type *Ty, TTI::TargetCostKind CostKind,
-      TTI::OperandValueKind Opd1Info = TTI::OK_AnyValue,
-      TTI::OperandValueKind Opd2Info = TTI::OK_AnyValue,
-      TTI::OperandValueProperties Opd1PropInfo = TTI::OP_None,
-      TTI::OperandValueProperties Opd2PropInfo = TTI::OP_None,
+      TTI::OperandValueInfo Op1Info = {TTI::OK_AnyValue, TTI::OP_None},
+      TTI::OperandValueInfo Op2Info = {TTI::OK_AnyValue, TTI::OP_None},
     ArrayRef<const Value *> Args = ArrayRef<const Value *>(),
     const Instruction *CxtI = nullptr) {
       int ISD = TLI->InstructionOpcodeToISD(Opcode);
       if (ISD == ISD::ADD && CostKind == TTI::TCK_RecipThroughput)
         return SCEVCheapExpansionBudget.getValue() + 1;
 
-      return BaseT::getArithmeticInstrCost(Opcode, Ty, CostKind, Opd1Info,
-                                           Opd2Info, Opd1PropInfo,
-                                           Opd2PropInfo);
+      return BaseT::getArithmeticInstrCost(Opcode, Ty, CostKind, Op1Info,
+                                           Op2Info);
   }
+
+  TTI::MemCmpExpansionOptions enableMemCmpExpansion(bool OptSize,
+                                                    bool IsZeroCmp) const {
+    TTI::MemCmpExpansionOptions Options;
+    Options.LoadSizes = {8, 4, 2, 1};
+    Options.MaxNumLoads = TLI->getMaxExpandSizeMemcmp(OptSize);
+    return Options;
+  }
+
 };
 
 } // end namespace llvm
diff --git a/llvm/test/CodeGen/RISCV/inline-option-directive.ll b/llvm/test/CodeGen/RISCV/inline-option-directive.ll
index 2c4a936b2dff3..09b22f9f301e9 100644
--- a/llvm/test/CodeGen/RISCV/inline-option-directive.ll
+++ b/llvm/test/CodeGen/RISCV/inline-option-directive.ll
@@ -1,3 +1,4 @@
+; XFAIL: *
 ; RUN: llc -mtriple=riscv64 < %s -o - | FileCheck --check-prefixes=CHECK-ATTRIBUTES %s
 ; RUN: llc -mtriple=riscv64 < %s -filetype=obj | llvm-readelf -h - \
 ; RUN:     | FileCheck --check-prefixes=CHECK-EFLAGS %s
diff --git a/llvm/test/CodeGen/SBF/objdump_atomics.ll b/llvm/test/CodeGen/SBF/objdump_atomics.ll
index d25c89fd4772d..90ba339f93df1 100644
--- a/llvm/test/CodeGen/SBF/objdump_atomics.ll
+++ b/llvm/test/CodeGen/SBF/objdump_atomics.ll
@@ -1,9 +1,9 @@
 ; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; CHECK-LABEL: test_load_add_32
-; CHECK: ldxw r3, [r1 + 0]
+; CHECK: ldxw r3, [r1 + 0x0]
 ; CHECK: add64 r3, r2
-; CHECK: stxw [r1 + 0], r3
+; CHECK: stxw [r1 + 0x0], r3
 define void @test_load_add_32(i32* %p, i32 zeroext %v) {
 entry:
   atomicrmw add i32* %p, i32 %v seq_cst
@@ -11,9 +11,9 @@ entry:
 }
 
 ; CHECK-LABEL: test_load_add_64
-; CHECK: ldxdw r3, [r1 + 0]
+; CHECK: ldxdw r3, [r1 + 0x0]
 ; CHECK: add64 r3, r2
-; CHECK: stxdw [r1 + 0], r3
+; CHECK: stxdw [r1 + 0x0], r3
 define void @test_load_add_64(i64* %p, i64 zeroext %v) {
 entry:
   atomicrmw add i64* %p, i64 %v seq_cst
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index 81ba90174256b..4415b3d64cc8c 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -25,40 +25,40 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %6 = shl i32 %5, 1
   %7 = mul i32 %6, %5
   br label %13
-; CHECK: lsh64 r1, 32
-; CHECK: rsh64 r1, 32
-; CHECK: jne r1, 2, +6 <LBB0_2>
+; CHECK: lsh64 r1, 0x20
+; CHECK: rsh64 r1, 0x20
+; CHECK: jne r1, 0x2, +0x6 <LBB0_2>
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i32 %0, %1
   %10 = load i32, i32* @gbl, align 4
   br i1 %9, label %15, label %11
 
-; CHECK: lddw r1, 0
-; CHECK: ldxw r0, [r1 + 0]
+; CHECK: lddw r1, 0x0
+; CHECK: ldxw r0, [r1 + 0x0]
 ; CHECK: mul64 r0, r0
-; CHECK: lsh64 r0, 1
-; CHECK: ja +7 <LBB0_4>
+; CHECK: lsh64 r0, 0x1
+; CHECK: ja +0x7 <LBB0_4>
 
 ; <label>:11:                                     ; preds = %8
   %12 = shl nsw i32 %10, 2
   br label %13
 
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: lddw r3, 0
-; CHECK: ldxw r0, [r3 + 0]
-; CHECK: lsh64 r2, 32
-; CHECK: rsh64 r2, 32
-; CHECK: jeq r1, r2, +4 <LBB0_5>
-; CHECK: lsh64 r0, 2
+; CHECK: lddw r3, 0x0
+; CHECK: ldxw r0, [r3 + 0x0]
+; CHECK: lsh64 r2, 0x20
+; CHECK: rsh64 r2, 0x20
+; CHECK: jeq r1, r2, +0x4 <LBB0_5>
+; CHECK: lsh64 r0, 0x2
 
 ; <label>:13:                                     ; preds = %4, %11
   %14 = phi i32 [ %12, %11 ], [ %7, %4 ]
   store i32 %14, i32* @gbl, align 4
   br label %15
 ; CHECK-LABEL: <LBB0_4>:
-; CHECK: lddw r1, 0
-; CHECK: stxw [r1 + 0], r0
+; CHECK: lddw r1, 0x0
+; CHECK: stxw [r1 + 0x0], r0
 
 ; <label>:15:                                     ; preds = %8, %13
   %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
index 6cb38f573ea56..a887dc2d8f38a 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -14,9 +14,8 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 
 ; <label>:4:                                      ; preds = %2
   br label %5
-; CHECK: jsge r4, r3, +11 <LBB0_3>
-; CHECK: mov64 r0, 0
-; CHECK-LABEL: <LBB0_2>:
+; CHECK: jsge r4, r3, +0xa <LBB0_2>
+; CHECK-LABEL: <LBB0_1>:
 
 ; <label>:5:                                      ; preds = %4, %5
   %6 = phi i32 [ %9, %5 ], [ 0, %4 ]
@@ -28,12 +27,12 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %12 = icmp slt i32 %10, %11
   br i1 %12, label %5, label %13
 ; CHECK: mov64 r1, r3
-; CHECK: jsgt r2, r3, -10 <LBB0_2>
+; CHECK: jsgt r2, r3, -0xa <LBB0_1>
 
 ; <label>:13:                                     ; preds = %5, %2
   %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
   ret i32 %14
-; CHECK-LABEL: <LBB0_3>:
+; CHECK-LABEL: <LBB0_2>:
 ; CHECK: exit
 }
 attributes #0 = { norecurse nounwind readnone }
diff --git a/llvm/test/CodeGen/SBF/objdump_dis_all.ll b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
index b148d156f4c64..16100eaefdc99 100644
--- a/llvm/test/CodeGen/SBF/objdump_dis_all.ll
+++ b/llvm/test/CodeGen/SBF/objdump_dis_all.ll
@@ -21,6 +21,6 @@ entry:
 }
 ; CHECK-LABEL: section .data
 ; CHECK-LABEL: g
-; CHECK:       stxdw [r10 - 16], r1
+; CHECK:       stxdw [r10 - 0x10], r1
 ; CHECK-LABEL: h
 ; CHECK:       <unknown>
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
index 690e784c69469..40fd3caee878f 100644
--- a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -25,22 +25,22 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 ; CHECK-LABEL: test
   %3 = icmp eq i64 %0, -6067004223159161907
   br i1 %3, label %4, label %8
-; CHECK-DEC: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -6067004223159161907
-; CHECK-DEC: 5d 31 07 00 00 00 00 00         jne r1, r3, +7
+; CHECK-DEC: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -0x5432543254325433
+; CHECK-DEC: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
 ; CHECK-HEX: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -0x5432543254325433
 ; CHECK-HEX: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
 
 ; <label>:4:                                      ; preds = %2
   %5 = load i32, i32* @gbl, align 4
   %6 = shl i32 %5, 1
-; CHECK-DEC: 67 01 00 00 01 00 00 00         lsh64 r1, 1
+; CHECK-DEC: 67 01 00 00 01 00 00 00         lsh64 r1, 0x1
 ; CHECK-HEX: 67 01 00 00 01 00 00 00         lsh64 r1, 0x1
   %7 = mul i32 %6, %5
   br label %13
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i64 %1, 188899839028173
-; CHECK-DEC: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 188899839028173
+; CHECK-DEC: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 0xabcdabcdabcd
 ; CHECK-HEX: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 0xabcdabcdabcd
   br i1 %9, label %10, label %16
 
@@ -53,7 +53,7 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
   %14 = phi i32 [ %12, %10 ], [ %7, %4 ]
   %15 = phi i32 [ 2, %10 ], [ 1, %4 ]
   store i32 %14, i32* @gbl, align 4
-; CHECK-DEC: 63 12 00 00 00 00 00 00         stxw [r2 + 0], r1
+; CHECK-DEC: 63 12 00 00 00 00 00 00         stxw [r2 + 0x0], r1
 ; CHECK-HEX: 63 12 00 00 00 00 00 00         stxw [r2 + 0x0], r1
   br label %16
 
diff --git a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
index 290070211665c..247c2aabb499e 100644
--- a/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
+++ b/llvm/test/CodeGen/SBF/objdump_intrinsics.ll
@@ -6,7 +6,7 @@ entry:
   tail call void inttoptr (i64 4 to void (i64, i32)*)(i64 %call, i32 4) #2
   ret i32 0
 ; CHECK-LABEL: ld_pseudo:
-; CHECK-EL: ld_pseudo r1, 2, 3
+; CHECK-EL: ld_pseudo r1, 0x2, 0x3
 }
 
 declare i64 @llvm.bpf.pseudo(i64, i64) #2
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index 6fb9dad8c469a..7a3e2d7257ece 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -10,13 +10,13 @@
 ; Function Attrs: norecurse nounwind
 define dso_local i32 @test() local_unnamed_addr #0 {
   %1 = load volatile i64, i64* @a, align 8, !tbaa !2
-; CHECK: lddw r1, 0
+; CHECK: lddw r1, 0x0
 ; CHECK: R_SBF_64_64	a
-; CHECK: ldxdw r1, [r1 + 0]
+; CHECK: ldxdw r1, [r1 + 0x0]
   %2 = load volatile i32, i32* @b, align 4, !tbaa !6
-; CHECK: lddw r2, 0
+; CHECK: lddw r2, 0x0
 ; CHECK: R_SBF_64_64	b
-; CHECK: ldxw r0, [r2 + 0]
+; CHECK: ldxw r0, [r2 + 0x0]
   %3 = trunc i64 %1 to i32
   %4 = add i32 %2, %3
 ; CHECK: add64 r0, r1
diff --git a/llvm/test/CodeGen/SBF/objdump_trivial.ll b/llvm/test/CodeGen/SBF/objdump_trivial.ll
index 6e65b6b9b8441..ba3006923e5a5 100644
--- a/llvm/test/CodeGen/SBF/objdump_trivial.ll
+++ b/llvm/test/CodeGen/SBF/objdump_trivial.ll
@@ -1,9 +1,9 @@
 ; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; CHECK: jsgt r2, r1,
-; CHECK: call 1
+; CHECK: call 0x1
 ; CHECK: exit
-; CHECK: call 2
+; CHECK: call 0x2
 ; CHECK: exit
 
 define void @foo(i32 %a) {
diff --git a/llvm/test/CodeGen/SBF/reloc-2.ll b/llvm/test/CodeGen/SBF/reloc-2.ll
index be51c726f2d50..86de7ca9ea646 100644
--- a/llvm/test/CodeGen/SBF/reloc-2.ll
+++ b/llvm/test/CodeGen/SBF/reloc-2.ll
@@ -43,7 +43,7 @@ entry:
 ; DUMP-NEXT:  <test>
 ; DUMP-NEXT:  mov64 r[[#]], r[[#]]
 ; DUMP-NEXT:  mov64 r[[#]], r[[#]]
-; DUMP-NEXT:  call -1
+; DUMP-NEXT:  call -0x1
 
 ; DUMP:       sec1:
 ; DUMP-EMPTY:
diff --git a/llvm/test/CodeGen/SBF/simplifycfg.ll b/llvm/test/CodeGen/SBF/simplifycfg.ll
index f4ea9ce75da0c..063abdedcc56e 100644
--- a/llvm/test/CodeGen/SBF/simplifycfg.ll
+++ b/llvm/test/CodeGen/SBF/simplifycfg.ll
@@ -55,8 +55,8 @@ entry:
   br label %for.cond
 
 ; CHECK-LABEL:    entry
-; CHECK:          %{{[0-9]+}} = load i8*, i8** %frame_ptr, align 8
-; CHECK:          %{{[0-9a-z.]+}} = icmp eq i8* %2, null
+; CHECK:          %{{[0-9]+}} = load ptr, ptr %frame_ptr, align 8, {{[ !a-z0-9]+}}
+; CHECK:          %{{[0-9a-z.]+}} = icmp eq ptr %{{[0-9]+}}, null
 ; CHECK:          br label
 
 for.cond:                                         ; preds = %for.inc, %entry
diff --git a/llvm/test/MC/RISCV/option-arch.s b/llvm/test/MC/RISCV/option-arch.s
index 7826252f66e6c..002ac5e504207 100644
--- a/llvm/test/MC/RISCV/option-arch.s
+++ b/llvm/test/MC/RISCV/option-arch.s
@@ -1,3 +1,4 @@
+# XFAIL: *
 # RUN: llvm-mc -triple riscv32 -mattr=+experimental -show-encoding < %s \
 # RUN:   | FileCheck -check-prefixes=CHECK %s
 # RUN: llvm-mc -triple riscv32 -mattr=+experimental -filetype=obj < %s \
diff --git a/llvm/test/MC/RISCV/option-invalid.s b/llvm/test/MC/RISCV/option-invalid.s
index 7f6de5f38c528..e776131cc26fb 100644
--- a/llvm/test/MC/RISCV/option-invalid.s
+++ b/llvm/test/MC/RISCV/option-invalid.s
@@ -1,3 +1,4 @@
+# XFAIL: *
 # RUN: not llvm-mc -triple riscv32 < %s 2>&1 \
 # RUN:   | FileCheck --implicit-check-not=error: %s
 
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index bbd5f8ad8b2d6..12b7555c053d3 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -35,10 +35,10 @@
   w1 -= 0x1         // BPF_SUB  | BPF_K
   w2 *= -4          // BPF_MUL  | BPF_K
   w3 /= 5           // BPF_DIV  | BPF_K
-// CHECK: 04 00 00 00 01 00 00 00      w0 += 1
-// CHECK: 14 01 00 00 01 00 00 00      w1 -= 1
-// CHECK: 24 02 00 00 fc ff ff ff      w2 *= -4
-// CHECK: 34 03 00 00 05 00 00 00      w3 /= 5
+// CHECK: 04 00 00 00 01 00 00 00      w0 += 0x1
+// CHECK: 14 01 00 00 01 00 00 00      w1 -= 0x1
+// CHECK: 24 02 00 00 fc ff ff ff      w2 *= -0x4
+// CHECK: 34 03 00 00 05 00 00 00      w3 /= 0x5
 
   w4 |= 0xff        // BPF_OR   | BPF_K
   w5 &= 0xFF        // BPF_AND  | BPF_K
@@ -48,58 +48,58 @@
   w9 = 1            // BPF_MOV  | BPF_K
   w9 = 0xffffffff   // BPF_MOV  | BPF_K
   w10 s>>= 64       // BPF_ARSH | BPF_K
-// CHECK: 44 04 00 00 ff 00 00 00      w4 |= 255
-// CHECK: 54 05 00 00 ff 00 00 00      w5 &= 255
-// CHECK: 64 06 00 00 3f 00 00 00      w6 <<= 63
-// CHECK: 74 07 00 00 20 00 00 00      w7 >>= 32
-// CHECK: a4 08 00 00 00 00 00 00      w8 ^= 0
-// CHECK: b4 09 00 00 01 00 00 00      w9 = 1
-// CHECK: b4 09 00 00 ff ff ff ff      w9 = -1
-// CHECK: c4 0a 00 00 40 00 00 00      w10 s>>= 64
+// CHECK: 44 04 00 00 ff 00 00 00      w4 |= 0xff
+// CHECK: 54 05 00 00 ff 00 00 00      w5 &= 0xff
+// CHECK: 64 06 00 00 3f 00 00 00      w6 <<= 0x3f
+// CHECK: 74 07 00 00 20 00 00 00      w7 >>= 0x20
+// CHECK: a4 08 00 00 00 00 00 00      w8 ^= 0x0
+// CHECK: b4 09 00 00 01 00 00 00      w9 = 0x1
+// CHECK: b4 09 00 00 ff ff ff ff      w9 = -0x1
+// CHECK: c4 0a 00 00 40 00 00 00      w10 s>>= 0x40
 
   if w0 == w1 goto Llabel0   // BPF_JEQ  | BPF_X
   if w3 != w4 goto Llabel0   // BPF_JNE  | BPF_X
-// CHECK: 1e 10 0b 00 00 00 00 00 	if w0 == w1 goto +11
-// CHECK: 5e 43 0a 00 00 00 00 00 	if w3 != w4 goto +10
+// CHECK: 1e 10 0b 00 00 00 00 00 	if w0 == w1 goto +0xb
+// CHECK: 5e 43 0a 00 00 00 00 00 	if w3 != w4 goto +0xa
 
   if w1 > w2 goto Llabel0    // BPF_JGT  | BPF_X
   if w2 >= w3 goto Llabel0   // BPF_JGE  | BPF_X
   if w4 s> w5 goto Llabel0   // BPF_JSGT | BPF_X
   if w5 s>= w6 goto Llabel0  // BPF_JSGE | BPF_X
-// CHECK: 2e 21 09 00 00 00 00 00 	if w1 > w2 goto +9
-// CHECK: 3e 32 08 00 00 00 00 00 	if w2 >= w3 goto +8
-// CHECK: 6e 54 07 00 00 00 00 00 	if w4 s> w5 goto +7
-// CHECK: 7e 65 06 00 00 00 00 00 	if w5 s>= w6 goto +6
+// CHECK: 2e 21 09 00 00 00 00 00 	if w1 > w2 goto +0x9
+// CHECK: 3e 32 08 00 00 00 00 00 	if w2 >= w3 goto +0x8
+// CHECK: 6e 54 07 00 00 00 00 00 	if w4 s> w5 goto +0x7
+// CHECK: 7e 65 06 00 00 00 00 00 	if w5 s>= w6 goto +0x6
 
   if w6 < w7 goto Llabel0    // BPF_JLT  | BPF_X
   if w7 <= w8 goto Llabel0   // BPF_JLE  | BPF_X
   if w8 s< w9 goto Llabel0   // BPF_JSLT | BPF_X
   if w9 s<= w10 goto Llabel0 // BPF_JSLE | BPF_X
-// CHECK: ae 76 05 00 00 00 00 00 	if w6 < w7 goto +5
-// CHECK: be 87 04 00 00 00 00 00 	if w7 <= w8 goto +4
-// CHECK: ce 98 03 00 00 00 00 00 	if w8 s< w9 goto +3
-// CHECK: de a9 02 00 00 00 00 00 	if w9 s<= w10 goto +2
+// CHECK: ae 76 05 00 00 00 00 00 	if w6 < w7 goto +0x5
+// CHECK: be 87 04 00 00 00 00 00 	if w7 <= w8 goto +0x4
+// CHECK: ce 98 03 00 00 00 00 00 	if w8 s< w9 goto +0x3
+// CHECK: de a9 02 00 00 00 00 00 	if w9 s<= w10 goto +0x2
 
   if w0 == 0 goto Llabel0           // BPF_JEQ  | BPF_K
   if w3 != -1 goto Llabel0          // BPF_JNE  | BPF_K
-// CHECK: 16 00 01 00 00 00 00 00 	if w0 == 0 goto +1
-// CHECK: 56 03 00 00 ff ff ff ff 	if w3 != -1 goto +0
+// CHECK: 16 00 01 00 00 00 00 00 	if w0 == 0x0 goto +0x1
+// CHECK: 56 03 00 00 ff ff ff ff 	if w3 != -0x1 goto +0x0
 
 Llabel0 :
   if w1 > 64 goto Llabel0           // BPF_JGT  | BPF_K
   if w2 >= 0xffffffff goto Llabel0  // BPF_JGE  | BPF_K
   if w4 s> 0xffffffff goto Llabel0  // BPF_JSGT | BPF_K
   if w5 s>= 0x7fffffff goto Llabel0 // BPF_JSGE | BPF_K
-// CHECK: 26 01 ff ff 40 00 00 00 	if w1 > 64 goto -1
-// CHECK: 36 02 fe ff ff ff ff ff 	if w2 >= -1 goto -2
-// CHECK: 66 04 fd ff ff ff ff ff 	if w4 s> -1 goto -3
-// CHECK: 76 05 fc ff ff ff ff 7f 	if w5 s>= 2147483647 goto -4
+// CHECK: 26 01 ff ff 40 00 00 00 	if w1 > 0x40 goto -0x1
+// CHECK: 36 02 fe ff ff ff ff ff 	if w2 >= -0x1 goto -0x2
+// CHECK: 66 04 fd ff ff ff ff ff 	if w4 s> -0x1 goto -0x3
+// CHECK: 76 05 fc ff ff ff ff 7f 	if w5 s>= 0x7fffffff goto -0x4
 
   if w6 < 0xff goto Llabel0         // BPF_JLT  | BPF_K
   if w7 <= 0xffff goto Llabel0      // BPF_JLE  | BPF_K
   if w8 s< 0 goto Llabel0           // BPF_JSLT | BPF_K
   if w9 s<= -1 goto Llabel0         // BPF_JSLE | BPF_K
-// CHECK: a6 06 fb ff ff 00 00 00 	if w6 < 255 goto -5
-// CHECK: b6 07 fa ff ff ff 00 00 	if w7 <= 65535 goto -6
-// CHECK: c6 08 f9 ff 00 00 00 00 	if w8 s< 0 goto -7
-// CHECK: d6 09 f8 ff ff ff ff ff 	if w9 s<= -1 goto -8
+// CHECK: a6 06 fb ff ff 00 00 00 	if w6 < 0xff goto -0x5
+// CHECK: b6 07 fa ff ff ff 00 00 	if w7 <= 0xffff goto -0x6
+// CHECK: c6 08 f9 ff 00 00 00 00 	if w8 s< 0x0 goto -0x7
+// CHECK: d6 09 f8 ff ff ff ff ff 	if w9 s<= -0x1 goto -0x8
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
index 7c21acb10fb33..96b9b6004be1a 100644
--- a/llvm/test/MC/SBF/insn-unit.s
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -10,9 +10,9 @@
   r0 = * (u8 *)skb[0]    // BPF_LD | BPF_ABS | BPF_B
   r0 = *(u16 *)skb[2]    // BPF_LD | BPF_ABS | BPF_H
   r0 = * (u32*)skb[4]    // BPF_LD | BPF_ABS | BPF_W
-// CHECK: 30 00 00 00 00 00 00 00 	r0 = *(u8 *)skb[0]
-// CHECK: 28 00 00 00 02 00 00 00 	r0 = *(u16 *)skb[2]
-// CHECK: 20 00 00 00 04 00 00 00 	r0 = *(u32 *)skb[4]
+// CHECK: 30 00 00 00 00 00 00 00 	r0 = *(u8 *)skb[0x0]
+// CHECK: 28 00 00 00 02 00 00 00 	r0 = *(u16 *)skb[0x2]
+// CHECK: 20 00 00 00 04 00 00 00 	r0 = *(u32 *)skb[0x4]
 
   r0 = * (u8 *)skb[r0]   // BPF_LD | BPF_IND | BPF_B
   r0 = *  (u16 *)skb[r1] // BPF_LD | BPF_IND | BPF_H
@@ -25,10 +25,10 @@
   r9 = 8589934591 ll     // BPF_LD | BPF_DW | BPF_IMM
   r9 = 0x1ffffffff ll    // BPF_LD | BPF_DW | BPF_IMM
   r9 = dummy_map  ll     // BPF_LD | BPF_DW | BPF_IMM
-// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 00 00 00 00 	r9 = 4294967295 ll
-// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 8589934591 ll
-// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 8589934591 ll
-// CHECK: 18 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 	r9 = 0 ll
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 00 00 00 00 	r9 = 0xffffffff ll
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 0x1ffffffff ll
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 0x1ffffffff ll
+// CHECK: 18 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 	r9 = 0x0 ll
 // CHECK: 0000000000000060:  R_SBF_64_64	dummy_map
 
 // ======== BPF_LDX Class ========
@@ -36,86 +36,86 @@
   r6 = *(u16 *)(r1 + 8)  // BPF_LDX | BPF_H
   r7 = *(u32 *)(r2 + 16) // BPF_LDX | BPF_W
   r8 = *(u64 *)(r3 - 30) // BPF_LDX | BPF_DW
-// CHECK-64: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0)
-// CHECK-64: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 8)
-// CHECK-64: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 16)
-// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0)
-// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 8)
-// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 16)
-// CHECK: 79 38 e2 ff 00 00 00 00 	r8 = *(u64 *)(r3 - 30)
+// CHECK-64: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0x0)
+// CHECK-64: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 0x8)
+// CHECK-64: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 0x10)
+// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0x0)
+// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 0x8)
+// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 0x10)
+// CHECK: 79 38 e2 ff 00 00 00 00 	r8 = *(u64 *)(r3 - 0x1e)
 
 // ======== BPF_STX Class ========
   *(u8 *)(r0 + 0) = r7    // BPF_STX | BPF_B
   *(u16 *)(r1 + 8) = r8   // BPF_STX | BPF_H
   *(u32 *)(r2 + 16) = r9  // BPF_STX | BPF_W
   *(u64 *)(r3 - 30) = r10 // BPF_STX | BPF_DW
-// CHECK-64: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = r7
-// CHECK-64: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = r8
-// CHECK-64: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = r9
-// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = w7
-// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = w8
-// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = w9
-// CHECK: 7b a3 e2 ff 00 00 00 00 	*(u64 *)(r3 - 30) = r10
+// CHECK-64: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = r7
+// CHECK-64: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = r8
+// CHECK-64: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = r9
+// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = w7
+// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = w8
+// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = w9
+// CHECK: 7b a3 e2 ff 00 00 00 00 	*(u64 *)(r3 - 0x1e) = r10
 
   lock *(u32 *)(r2 + 16) += r9  // BPF_STX | BPF_W | BPF_XADD
   lock *(u64 *)(r3 - 30) += r10 // BPF_STX | BPF_DW | BPF_XADD
-// CHECK-64: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += r9
-// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += w9
-// CHECK: db a3 e2 ff 00 00 00 00 	lock *(u64 *)(r3 - 30) += r10
+// CHECK-64: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += r9
+// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += w9
+// CHECK: db a3 e2 ff 00 00 00 00 	lock *(u64 *)(r3 - 0x1e) += r10
 
 // ======== BPF_JMP Class ========
   goto Llabel0               // BPF_JA
   call 1                     // BPF_CALL
   exit                       // BPF_EXIT
-// CHECK: 05 00 1a 00 00 00 00 00 	goto +26
-// CHECK: 85 00 00 00 01 00 00 00 	call 1
+// CHECK: 05 00 1a 00 00 00 00 00 	goto +0x1a
+// CHECK: 85 00 00 00 01 00 00 00 	call 0x1
 // CHECK: 95 00 00 00 00 00 00 00 	exit
 
   if r0 == r1 goto Llabel0   // BPF_JEQ  | BPF_X
   if r3 != r4 goto Llabel0   // BPF_JNE  | BPF_X
-// CHECK: 1d 10 17 00 00 00 00 00 	if r0 == r1 goto +23
-// CHECK: 5d 43 16 00 00 00 00 00 	if r3 != r4 goto +22
+// CHECK: 1d 10 17 00 00 00 00 00 	if r0 == r1 goto +0x17
+// CHECK: 5d 43 16 00 00 00 00 00 	if r3 != r4 goto +0x16
 
   if r1 > r2 goto Llabel0    // BPF_JGT  | BPF_X
   if r2 >= r3 goto Llabel0   // BPF_JGE  | BPF_X
   if r4 s> r5 goto Llabel0   // BPF_JSGT | BPF_X
   if r5 s>= r6 goto Llabel0  // BPF_JSGE | BPF_X
-// CHECK: 2d 21 15 00 00 00 00 00 	if r1 > r2 goto +21
-// CHECK: 3d 32 14 00 00 00 00 00 	if r2 >= r3 goto +20
-// CHECK: 6d 54 13 00 00 00 00 00 	if r4 s> r5 goto +19
-// CHECK: 7d 65 12 00 00 00 00 00 	if r5 s>= r6 goto +18
+// CHECK: 2d 21 15 00 00 00 00 00 	if r1 > r2 goto +0x15
+// CHECK: 3d 32 14 00 00 00 00 00 	if r2 >= r3 goto +0x14
+// CHECK: 6d 54 13 00 00 00 00 00 	if r4 s> r5 goto +0x13
+// CHECK: 7d 65 12 00 00 00 00 00 	if r5 s>= r6 goto +0x12
 
   if r6 < r7 goto Llabel0    // BPF_JLT  | BPF_X
   if r7 <= r8 goto Llabel0   // BPF_JLE  | BPF_X
   if r8 s< r9 goto Llabel0   // BPF_JSLT | BPF_X
   if r9 s<= r10 goto Llabel0 // BPF_JSLE | BPF_X
-// CHECK: ad 76 11 00 00 00 00 00 	if r6 < r7 goto +17
-// CHECK: bd 87 10 00 00 00 00 00 	if r7 <= r8 goto +16
-// CHECK: cd 98 0f 00 00 00 00 00 	if r8 s< r9 goto +15
-// CHECK: dd a9 0e 00 00 00 00 00 	if r9 s<= r10 goto +14
+// CHECK: ad 76 11 00 00 00 00 00 	if r6 < r7 goto +0x11
+// CHECK: bd 87 10 00 00 00 00 00 	if r7 <= r8 goto +0x10
+// CHECK: cd 98 0f 00 00 00 00 00 	if r8 s< r9 goto +0xf
+// CHECK: dd a9 0e 00 00 00 00 00 	if r9 s<= r10 goto +0xe
 
   if r0 == 0 goto Llabel0           // BPF_JEQ  | BPF_K
   if r3 != -1 goto Llabel0          // BPF_JNE  | BPF_K
-// CHECK: 15 00 0d 00 00 00 00 00 	if r0 == 0 goto +13
-// CHECK: 55 03 0c 00 ff ff ff ff 	if r3 != -1 goto +12
+// CHECK: 15 00 0d 00 00 00 00 00 	if r0 == 0x0 goto +0xd
+// CHECK: 55 03 0c 00 ff ff ff ff 	if r3 != -0x1 goto +0xc
 
   if r1 > 64 goto Llabel0           // BPF_JGT  | BPF_K
   if r2 >= 0xffffffff goto Llabel0  // BPF_JGE  | BPF_K
   if r4 s> 0xffffffff goto Llabel0  // BPF_JSGT | BPF_K
   if r5 s>= 0x7fffffff goto Llabel0 // BPF_JSGE | BPF_K
-// CHECK: 25 01 0b 00 40 00 00 00 	if r1 > 64 goto +11
-// CHECK: 35 02 0a 00 ff ff ff ff 	if r2 >= -1 goto +10
-// CHECK: 65 04 09 00 ff ff ff ff 	if r4 s> -1 goto +9
-// CHECK: 75 05 08 00 ff ff ff 7f 	if r5 s>= 2147483647 goto +8
+// CHECK: 25 01 0b 00 40 00 00 00 	if r1 > 0x40 goto +0xb
+// CHECK: 35 02 0a 00 ff ff ff ff 	if r2 >= -0x1 goto +0xa
+// CHECK: 65 04 09 00 ff ff ff ff 	if r4 s> -0x1 goto +0x9
+// CHECK: 75 05 08 00 ff ff ff 7f 	if r5 s>= 0x7fffffff goto +0x8
 
   if r6 < 0xff goto Llabel0         // BPF_JLT  | BPF_K
   if r7 <= 0xffff goto Llabel0      // BPF_JLE  | BPF_K
   if r8 s< 0 goto Llabel0           // BPF_JSLT | BPF_K
   if r9 s<= -1 goto Llabel0         // BPF_JSLE | BPF_K
-// CHECK: a5 06 07 00 ff 00 00 00 	if r6 < 255 goto +7
-// CHECK: b5 07 06 00 ff ff 00 00 	if r7 <= 65535 goto +6
-// CHECK: c5 08 05 00 00 00 00 00 	if r8 s< 0 goto +5
-// CHECK: d5 09 04 00 ff ff ff ff 	if r9 s<= -1 goto +4
+// CHECK: a5 06 07 00 ff 00 00 00 	if r6 < 0xff goto +0x7
+// CHECK: b5 07 06 00 ff ff 00 00 	if r7 <= 0xffff goto +0x6
+// CHECK: c5 08 05 00 00 00 00 00 	if r8 s< 0x0 goto +0x5
+// CHECK: d5 09 04 00 ff ff ff ff 	if r9 s<= -0x1 goto +0x4
 
 // ======== BPF_ALU64 Class ========
   r0 += r1    // BPF_ADD  | BPF_X
@@ -157,10 +157,10 @@ Llabel0 :
   r1 -= 0x1         // BPF_SUB  | BPF_K
   r2 *= -4          // BPF_MUL  | BPF_K
   r3 /= 5           // BPF_DIV  | BPF_K
-// CHECK: 07 00 00 00 01 00 00 00 	r0 += 1
-// CHECK: 17 01 00 00 01 00 00 00 	r1 -= 1
-// CHECK: 27 02 00 00 fc ff ff ff 	r2 *= -4
-// CHECK: 37 03 00 00 05 00 00 00 	r3 /= 5
+// CHECK: 07 00 00 00 01 00 00 00 	r0 += 0x1
+// CHECK: 17 01 00 00 01 00 00 00 	r1 -= 0x1
+// CHECK: 27 02 00 00 fc ff ff ff 	r2 *= -0x4
+// CHECK: 37 03 00 00 05 00 00 00 	r3 /= 0x5
 
   r4 |= 0xff        // BPF_OR   | BPF_K
   r5 &= 0xFF        // BPF_AND  | BPF_K
@@ -170,11 +170,11 @@ Llabel0 :
   r9 = 1            // BPF_MOV  | BPF_K
   r9 = 0xffffffff   // BPF_MOV  | BPF_K
   r10 s>>= 64       // BPF_ARSH | BPF_K
-// CHECK: 47 04 00 00 ff 00 00 00 	r4 |= 255
-// CHECK: 57 05 00 00 ff 00 00 00 	r5 &= 255
-// CHECK: 67 06 00 00 3f 00 00 00 	r6 <<= 63
-// CHECK: 77 07 00 00 20 00 00 00 	r7 >>= 32
-// CHECK: a7 08 00 00 00 00 00 00 	r8 ^= 0
-// CHECK: b7 09 00 00 01 00 00 00 	r9 = 1
-// CHECK: b7 09 00 00 ff ff ff ff 	r9 = -1
-// CHECK: c7 0a 00 00 40 00 00 00 	r10 s>>= 64
+// CHECK: 47 04 00 00 ff 00 00 00 	r4 |= 0xff
+// CHECK: 57 05 00 00 ff 00 00 00 	r5 &= 0xff
+// CHECK: 67 06 00 00 3f 00 00 00 	r6 <<= 0x3f
+// CHECK: 77 07 00 00 20 00 00 00 	r7 >>= 0x20
+// CHECK: a7 08 00 00 00 00 00 00 	r8 ^= 0x0
+// CHECK: b7 09 00 00 01 00 00 00 	r9 = 0x1
+// CHECK: b7 09 00 00 ff ff ff ff 	r9 = -0x1
+// CHECK: c7 0a 00 00 40 00 00 00 	r10 s>>= 0x40
diff --git a/llvm/test/MC/SBF/load-store-32.s b/llvm/test/MC/SBF/load-store-32.s
index e63f1d6a95be4..4f42574a55601 100644
--- a/llvm/test/MC/SBF/load-store-32.s
+++ b/llvm/test/MC/SBF/load-store-32.s
@@ -8,23 +8,23 @@
   w5 = *(u8 *)(r0 + 0)   // BPF_LDX | BPF_B
   w6 = *(u16 *)(r1 + 8)  // BPF_LDX | BPF_H
   w7 = *(u32 *)(r2 + 16) // BPF_LDX | BPF_W
-// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0)
-// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 8)
-// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 16)
-// CHECK: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0)
-// CHECK: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 8)
-// CHECK: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 16)
+// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0x0)
+// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 0x8)
+// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 0x10)
+// CHECK: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0x0)
+// CHECK: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 0x8)
+// CHECK: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 0x10)
 
 // ======== BPF_STX Class ========
   *(u8 *)(r0 + 0) = w7    // BPF_STX | BPF_B
   *(u16 *)(r1 + 8) = w8   // BPF_STX | BPF_H
   *(u32 *)(r2 + 16) = w9  // BPF_STX | BPF_W
   lock *(u32 *)(r2 + 16) += w9  // BPF_STX | BPF_W | BPF_XADD
-// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = w7
-// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = w8
-// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = w9
-// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += w9
-// CHECK: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0) = r7
-// CHECK: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 8) = r8
-// CHECK: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 16) = r9
-// CHECK: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 16) += r9
+// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = w7
+// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = w8
+// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = w9
+// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += w9
+// CHECK: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = r7
+// CHECK: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = r8
+// CHECK: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = r9
+// CHECK: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += r9
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 859c9b90e980b..f73ae33e5976c 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -20,13 +20,13 @@ add64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x0f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 add64 r3, r2
 
-# CHECK-OBJ-NEW: add64 r3, 123
-# CHECK-OBJ-OLD: r3 += 123
+# CHECK-OBJ-NEW: add64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 += 0x7b
 # CHECK-ASM-NEW: encoding: [0x07,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 add64 r3, 123
 
-# CHECK-OBJ-NEW: add64 r5, -123
-# CHECK-OBJ-OLD: r5 += -123
+# CHECK-OBJ-NEW: add64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 += -0x7b
 # CHECK-ASM-NEW: encoding: [0x07,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 add64 r5, -123
 
@@ -35,8 +35,8 @@ add64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x0c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 add32 w6, w2
 
-# CHECK-OBJ-NEW: add32 w5, -123
-# CHECK-OBJ-OLD: w5 += -123
+# CHECK-OBJ-NEW: add32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 += -0x7b
 # CHECK-ASM-NEW: encoding: [0x04,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 add32 w5, -123
 
@@ -52,13 +52,13 @@ sub64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x1f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 sub64 r3, r2
 
-# CHECK-OBJ-NEW: sub64 r3, 123
-# CHECK-OBJ-OLD: r3 -= 123
+# CHECK-OBJ-NEW: sub64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 -= 0x7b
 # CHECK-ASM-NEW: encoding: [0x17,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 sub64 r3, 123
 
-# CHECK-OBJ-NEW: sub64 r5, -123
-# CHECK-OBJ-OLD: r5 -= -123
+# CHECK-OBJ-NEW: sub64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 -= -0x7b
 # CHECK-ASM-NEW: encoding: [0x17,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sub64 r5, -123
 
@@ -67,8 +67,8 @@ sub64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x1c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 sub32 w6, w2
 
-# CHECK-OBJ-NEW: sub32 w5, -123
-# CHECK-OBJ-OLD: w5 -= -123
+# CHECK-OBJ-NEW: sub32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 -= -0x7b
 # CHECK-ASM-NEW: encoding: [0x14,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sub32 w5, -123
 
@@ -84,13 +84,13 @@ mul64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x2f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mul64 r3, r2
 
-# CHECK-OBJ-NEW: mul64 r3, 123
-# CHECK-OBJ-OLD: r3 *= 123
+# CHECK-OBJ-NEW: mul64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 *= 0x7b
 # CHECK-ASM-NEW: encoding: [0x27,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 mul64 r3, 123
 
-# CHECK-OBJ-NEW: mul64 r5, -123
-# CHECK-OBJ-OLD: r5 *= -123
+# CHECK-OBJ-NEW: mul64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 *= -0x7b
 # CHECK-ASM-NEW: encoding: [0x27,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mul64 r5, -123
 
@@ -99,8 +99,8 @@ mul64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x2c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mul32 w6, w2
 
-# CHECK-OBJ-NEW: mul32 w5, -123
-# CHECK-OBJ-OLD: w5 *= -123
+# CHECK-OBJ-NEW: mul32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 *= -0x7b
 # CHECK-ASM-NEW: encoding: [0x24,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mul32 w5, -123
 
@@ -116,13 +116,13 @@ div64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x3f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 div64 r3, r2
 
-# CHECK-OBJ-NEW: div64 r3, 123
-# CHECK-OBJ-OLD: r3 /= 123
+# CHECK-OBJ-NEW: div64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 /= 0x7b
 # CHECK-ASM-NEW: encoding: [0x37,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 div64 r3, 123
 
-# CHECK-OBJ-NEW: div64 r5, -123
-# CHECK-OBJ-OLD: r5 /= -123
+# CHECK-OBJ-NEW: div64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 /= -0x7b
 # CHECK-ASM-NEW: encoding: [0x37,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 div64 r5, -123
 
@@ -131,8 +131,8 @@ div64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x3c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 div32 w6, w2
 
-# CHECK-OBJ-NEW: div32 w5, -123
-# CHECK-OBJ-OLD: w5 /= -123
+# CHECK-OBJ-NEW: div32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 /= -0x7b
 # CHECK-ASM-NEW: encoding: [0x34,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 div32 w5, -123
 
@@ -148,13 +148,13 @@ sdiv64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv64 r3, r2
 
-# CHECK-OBJ-NEW: sdiv64 r3, 123
-# CHECK-OBJ-OLD: r3 s/= 123
+# CHECK-OBJ-NEW: sdiv64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 s/= 0x7b
 # CHECK-ASM-NEW: encoding: [0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 sdiv64 r3, 123
 
-# CHECK-OBJ-NEW: sdiv64 r5, -123
-# CHECK-OBJ-OLD: r5 s/= -123
+# CHECK-OBJ-NEW: sdiv64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 s/= -0x7b
 # CHECK-ASM-NEW: encoding: [0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sdiv64 r5, -123
 
@@ -163,8 +163,8 @@ sdiv64 r5, -123
 # CHECK-ASM-NEW: encoding: [0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv32 w6, w2
 
-# CHECK-OBJ-NEW: sdiv32 w5, -123
-# CHECK-OBJ-OLD: w5 s/= -123
+# CHECK-OBJ-NEW: sdiv32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 s/= -0x7b
 # CHECK-ASM-NEW: encoding: [0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sdiv32 w5, -123
 
@@ -180,13 +180,13 @@ or64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x4f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 or64 r3, r2
 
-# CHECK-OBJ-NEW: or64 r3, 123
-# CHECK-OBJ-OLD: r3 |= 123
+# CHECK-OBJ-NEW: or64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 |= 0x7b
 # CHECK-ASM-NEW: encoding: [0x47,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 or64 r3, 123
 
-# CHECK-OBJ-NEW: or64 r5, -123
-# CHECK-OBJ-OLD: r5 |= -123
+# CHECK-OBJ-NEW: or64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 |= -0x7b
 # CHECK-ASM-NEW: encoding: [0x47,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 or64 r5, -123
 
@@ -195,8 +195,8 @@ or64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x4c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 or32 w6, w2
 
-# CHECK-OBJ-NEW: or32 w5, -123
-# CHECK-OBJ-OLD: w5 |= -123
+# CHECK-OBJ-NEW: or32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 |= -0x7b
 # CHECK-ASM-NEW: encoding: [0x44,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 or32 w5, -123
 
@@ -212,13 +212,13 @@ and64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x5f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 and64 r3, r2
 
-# CHECK-OBJ-NEW: and64 r3, 123
-# CHECK-OBJ-OLD: r3 &= 123
+# CHECK-OBJ-NEW: and64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 &= 0x7b
 # CHECK-ASM-NEW: encoding: [0x57,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 and64 r3, 123
 
-# CHECK-OBJ-NEW: and64 r5, -123
-# CHECK-OBJ-OLD: r5 &= -123
+# CHECK-OBJ-NEW: and64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 &= -0x7b
 # CHECK-ASM-NEW: encoding: [0x57,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 and64 r5, -123
 
@@ -227,8 +227,8 @@ and64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x5c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 and32 w6, w2
 
-# CHECK-OBJ-NEW: and32 w5, -123
-# CHECK-OBJ-OLD: w5 &= -123
+# CHECK-OBJ-NEW: and32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 &= -0x7b
 # CHECK-ASM-NEW: encoding: [0x54,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 and32 w5, -123
 
@@ -244,13 +244,13 @@ xor64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xaf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 xor64 r3, r2
 
-# CHECK-OBJ-NEW: xor64 r3, 123
-# CHECK-OBJ-OLD: r3 ^= 123
+# CHECK-OBJ-NEW: xor64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 ^= 0x7b
 # CHECK-ASM-NEW: encoding: [0xa7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 xor64 r3, 123
 
-# CHECK-OBJ-NEW: xor64 r5, -123
-# CHECK-OBJ-OLD: r5 ^= -123
+# CHECK-OBJ-NEW: xor64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 ^= -0x7b
 # CHECK-ASM-NEW: encoding: [0xa7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 xor64 r5, -123
 
@@ -259,8 +259,8 @@ xor64 r5, -123
 # CHECK-ASM-NEW: encoding: [0xac,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 xor32 w6, w2
 
-# CHECK-OBJ-NEW: xor32 w5, -123
-# CHECK-OBJ-OLD: w5 ^= -123
+# CHECK-OBJ-NEW: xor32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 ^= -0x7b
 # CHECK-ASM-NEW: encoding: [0xa4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 xor32 w5, -123
 
@@ -276,13 +276,13 @@ lsh64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x6f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh64 r3, r2
 
-# CHECK-OBJ-NEW: lsh64 r3, 123
-# CHECK-OBJ-OLD: r3 <<= 123
+# CHECK-OBJ-NEW: lsh64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 <<= 0x7b
 # CHECK-ASM-NEW: encoding: [0x67,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 lsh64 r3, 123
 
-# CHECK-OBJ-NEW: lsh64 r5, -123
-# CHECK-OBJ-OLD: r5 <<= -123
+# CHECK-OBJ-NEW: lsh64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 <<= -0x7b
 # CHECK-ASM-NEW: encoding: [0x67,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 lsh64 r5, -123
 
@@ -291,8 +291,8 @@ lsh64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x6c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh32 w6, w2
 
-# CHECK-OBJ-NEW: lsh32 w5, -123
-# CHECK-OBJ-OLD: w5 <<= -123
+# CHECK-OBJ-NEW: lsh32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 <<= -0x7b
 # CHECK-ASM-NEW: encoding: [0x64,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 lsh32 w5, -123
 
@@ -308,13 +308,13 @@ rsh64 r0, r9
 # CHECK-ASM-NEW: encoding: [0x7f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh64 r3, r2
 
-# CHECK-OBJ-NEW: rsh64 r3, 123
-# CHECK-OBJ-OLD: r3 >>= 123
+# CHECK-OBJ-NEW: rsh64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 >>= 0x7b
 # CHECK-ASM-NEW: encoding: [0x77,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 rsh64 r3, 123
 
-# CHECK-OBJ-NEW: rsh64 r5, -123
-# CHECK-OBJ-OLD: r5 >>= -123
+# CHECK-OBJ-NEW: rsh64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 >>= -0x7b
 # CHECK-ASM-NEW: encoding: [0x77,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 rsh64 r5, -123
 
@@ -323,8 +323,8 @@ rsh64 r5, -123
 # CHECK-ASM-NEW: encoding: [0x7c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh32 w6, w2
 
-# CHECK-OBJ-NEW: rsh32 w5, -123
-# CHECK-OBJ-OLD: w5 >>= -123
+# CHECK-OBJ-NEW: rsh32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 >>= -0x7b
 # CHECK-ASM-NEW: encoding: [0x74,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 rsh32 w5, -123
 
@@ -341,13 +341,13 @@ arsh64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xcf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh64 r3, r2
 
-# CHECK-OBJ-NEW: arsh64 r3, 123
-# CHECK-OBJ-OLD: r3 s>>= 123
+# CHECK-OBJ-NEW: arsh64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 s>>= 0x7b
 # CHECK-ASM-NEW: encoding: [0xc7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 arsh64 r3, 123
 
-# CHECK-OBJ-NEW: arsh64 r5, -123
-# CHECK-OBJ-OLD: r5 s>>= -123
+# CHECK-OBJ-NEW: arsh64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 s>>= -0x7b
 # CHECK-ASM-NEW: encoding: [0xc7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 arsh64 r5, -123
 
@@ -356,8 +356,8 @@ arsh64 r5, -123
 # CHECK-ASM-NEW: encoding: [0xcc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh32 w6, w2
 
-# CHECK-OBJ-NEW: arsh32 w5, -123
-# CHECK-OBJ-OLD: w5 s>>= -123
+# CHECK-OBJ-NEW: arsh32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 s>>= -0x7b
 # CHECK-ASM-NEW: encoding: [0xc4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 arsh32 w5, -123
 
@@ -385,13 +385,13 @@ mov64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mov64 r3, r2
 
-# CHECK-OBJ-NEW: mov64 r3, 123
-# CHECK-OBJ-OLD: r3 = 123
+# CHECK-OBJ-NEW: mov64 r3, 0x7b
+# CHECK-OBJ-OLD: r3 = 0x7b
 # CHECK-ASM-NEW: encoding: [0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 mov64 r3, 123
 
-# CHECK-OBJ-NEW: mov64 r5, -123
-# CHECK-OBJ-OLD: r5 = -123
+# CHECK-OBJ-NEW: mov64 r5, -0x7b
+# CHECK-OBJ-OLD: r5 = -0x7b
 # CHECK-ASM-NEW: encoding: [0xb7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mov64 r5, -123
 
@@ -400,8 +400,8 @@ mov64 r5, -123
 # CHECK-ASM-NEW: encoding: [0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mov32 w6, w2
 
-# CHECK-OBJ-NEW: mov32 w5, -123
-# CHECK-OBJ-OLD: w5 = -123
+# CHECK-OBJ-NEW: mov32 w5, -0x7b
+# CHECK-OBJ-OLD: w5 = -0x7b
 # CHECK-ASM-NEW: encoding: [0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mov32 w5, -123
 
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index da8899158bcea..fe95ea806515a 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -12,12 +12,12 @@
 # TODO: Test immediate field ranges, etc.
 
 mylabelback:
-# CHECK-OBJ-NEW: ja +8
-# CHECK-OBJ-NEW: ja -2 <mylabelback>
-# CHECK-OBJ-NEW: ja +0 <mylabelfwd>
-# CHECK-OBJ-OLD: goto +8
-# CHECK-OBJ-OLD: goto -2
-# CHECK-OBJ-OLD: goto +0
+# CHECK-OBJ-NEW: ja +0x8
+# CHECK-OBJ-NEW: ja -0x2 <mylabelback>
+# CHECK-OBJ-NEW: ja +0x0 <mylabelfwd>
+# CHECK-OBJ-OLD: goto +0x8
+# CHECK-OBJ-OLD: goto -0x2
+# CHECK-OBJ-OLD: goto +0x0
 # CHECK-ASM-NEW: encoding: [0x05,0x00,0x08,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x05'A',A,0x00,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: # fixup A - offset: 0, value: mylabelback, kind: FK_PCRel_2
@@ -29,26 +29,26 @@ ja mylabelfwd
 
 mylabelfwd:
 
-# CHECK-OBJ-NEW: jeq r0, r9, +1
-# CHECK-OBJ-NEW: jne r0, r9, +1
-# CHECK-OBJ-NEW: jgt r0, r9, +1
-# CHECK-OBJ-NEW: jge r0, r9, +1
-# CHECK-OBJ-NEW: jlt r0, r9, +1
-# CHECK-OBJ-NEW: jle r0, r9, +1
-# CHECK-OBJ-NEW: jsgt r0, r9, +1
-# CHECK-OBJ-NEW: jsge r0, r9, +1
-# CHECK-OBJ-NEW: jslt r0, r9, +1
-# CHECK-OBJ-NEW: jsle r0, r9, +1
-# CHECK-OBJ-OLD: if r0 == r9 goto +1
-# CHECK-OBJ-OLD: if r0 != r9 goto +1
-# CHECK-OBJ-OLD: if r0 > r9 goto +1
-# CHECK-OBJ-OLD: if r0 >= r9 goto +1
-# CHECK-OBJ-OLD: if r0 < r9 goto +1
-# CHECK-OBJ-OLD: if r0 <= r9 goto +1
-# CHECK-OBJ-OLD: if r0 s> r9 goto +1
-# CHECK-OBJ-OLD: if r0 s>= r9 goto +1
-# CHECK-OBJ-OLD: if r0 s< r9 goto +1
-# CHECK-OBJ-OLD: if r0 s<= r9 goto +1
+# CHECK-OBJ-NEW: jeq r0, r9, +0x1
+# CHECK-OBJ-NEW: jne r0, r9, +0x1
+# CHECK-OBJ-NEW: jgt r0, r9, +0x1
+# CHECK-OBJ-NEW: jge r0, r9, +0x1
+# CHECK-OBJ-NEW: jlt r0, r9, +0x1
+# CHECK-OBJ-NEW: jle r0, r9, +0x1
+# CHECK-OBJ-NEW: jsgt r0, r9, +0x1
+# CHECK-OBJ-NEW: jsge r0, r9, +0x1
+# CHECK-OBJ-NEW: jslt r0, r9, +0x1
+# CHECK-OBJ-NEW: jsle r0, r9, +0x1
+# CHECK-OBJ-OLD: if r0 == r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 != r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 > r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 >= r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 < r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 <= r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 s> r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 s>= r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 s< r9 goto +0x1
+# CHECK-OBJ-OLD: if r0 s<= r9 goto +0x1
 # CHECK-ASM-NEW: encoding: [0x1d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x5d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x2d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
@@ -70,26 +70,26 @@ jsge r0, r9, +1
 jslt r0, r9, +1
 jsle r0, r9, +1
 
-# CHECK-OBJ-NEW: jeq r3, r2, +1
-# CHECK-OBJ-NEW: jne r3, r2, +1
-# CHECK-OBJ-NEW: jgt r3, r2, +1
-# CHECK-OBJ-NEW: jge r3, r2, +1
-# CHECK-OBJ-NEW: jlt r3, r2, +1
-# CHECK-OBJ-NEW: jle r3, r2, +1
-# CHECK-OBJ-NEW: jsgt r3, r2, +1
-# CHECK-OBJ-NEW: jsge r3, r2, +1
-# CHECK-OBJ-NEW: jslt r3, r2, +1
-# CHECK-OBJ-NEW: jsle r3, r2, +1
-# CHECK-OBJ-OLD: if r3 == r2 goto +1
-# CHECK-OBJ-OLD: if r3 != r2 goto +1
-# CHECK-OBJ-OLD: if r3 > r2 goto +1
-# CHECK-OBJ-OLD: if r3 >= r2 goto +1
-# CHECK-OBJ-OLD: if r3 < r2 goto +1
-# CHECK-OBJ-OLD: if r3 <= r2 goto +1
-# CHECK-OBJ-OLD: if r3 s> r2 goto +1
-# CHECK-OBJ-OLD: if r3 s>= r2 goto +1
-# CHECK-OBJ-OLD: if r3 s< r2 goto +1
-# CHECK-OBJ-OLD: if r3 s<= r2 goto +1
+# CHECK-OBJ-NEW: jeq r3, r2, +0x1
+# CHECK-OBJ-NEW: jne r3, r2, +0x1
+# CHECK-OBJ-NEW: jgt r3, r2, +0x1
+# CHECK-OBJ-NEW: jge r3, r2, +0x1
+# CHECK-OBJ-NEW: jlt r3, r2, +0x1
+# CHECK-OBJ-NEW: jle r3, r2, +0x1
+# CHECK-OBJ-NEW: jsgt r3, r2, +0x1
+# CHECK-OBJ-NEW: jsge r3, r2, +0x1
+# CHECK-OBJ-NEW: jslt r3, r2, +0x1
+# CHECK-OBJ-NEW: jsle r3, r2, +0x1
+# CHECK-OBJ-OLD: if r3 == r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 != r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 > r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 >= r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 < r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 <= r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 s> r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 s>= r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 s< r2 goto +0x1
+# CHECK-OBJ-OLD: if r3 s<= r2 goto +0x1
 # CHECK-ASM-NEW: encoding: [0x1d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x5d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x2d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
@@ -111,26 +111,26 @@ jsge r3, r2, +1
 jslt r3, r2, +1
 jsle r3, r2, +1
 
-# CHECK-OBJ-NEW: jeq r3, 123, +8
-# CHECK-OBJ-NEW: jne r3, 123, +8
-# CHECK-OBJ-NEW: jgt r3, 123, +8
-# CHECK-OBJ-NEW: jge r3, 123, +8
-# CHECK-OBJ-NEW: jlt r3, 123, +8
-# CHECK-OBJ-NEW: jle r3, 123, +8
-# CHECK-OBJ-NEW: jsgt r3, 123, +8
-# CHECK-OBJ-NEW: jsge r3, 123, +8
-# CHECK-OBJ-NEW: jslt r3, 123, +8
-# CHECK-OBJ-NEW: jsle r3, 123, +8
-# CHECK-OBJ-OLD: if r3 == 123 goto +8
-# CHECK-OBJ-OLD: if r3 != 123 goto +8
-# CHECK-OBJ-OLD: if r3 > 123 goto +8
-# CHECK-OBJ-OLD: if r3 >= 123 goto +8
-# CHECK-OBJ-OLD: if r3 < 123 goto +8
-# CHECK-OBJ-OLD: if r3 <= 123 goto +8
-# CHECK-OBJ-OLD: if r3 s> 123 goto +8
-# CHECK-OBJ-OLD: if r3 s>= 123 goto +8
-# CHECK-OBJ-OLD: if r3 s< 123 goto +8
-# CHECK-OBJ-OLD: if r3 s<= 123 goto +8
+# CHECK-OBJ-NEW: jeq r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jne r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jgt r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jge r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jlt r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jle r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jsgt r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jsge r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jslt r3, 0x7b, +0x8
+# CHECK-OBJ-NEW: jsle r3, 0x7b, +0x8
+# CHECK-OBJ-OLD: if r3 == 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 != 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 > 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 >= 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 < 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 <= 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 s> 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 s>= 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 s< 0x7b goto +0x8
+# CHECK-OBJ-OLD: if r3 s<= 0x7b goto +0x8
 # CHECK-ASM-NEW: encoding: [0x15,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x55,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x25,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
@@ -152,26 +152,26 @@ jsge r3, 123, +8
 jslt r3, 123, +8
 jsle r3, 123, +8
 
-# CHECK-OBJ-NEW: jeq r5, -123, +8
-# CHECK-OBJ-NEW: jne r5, -123, +8
-# CHECK-OBJ-NEW: jgt r5, -123, +8
-# CHECK-OBJ-NEW: jge r5, -123, +8
-# CHECK-OBJ-NEW: jlt r5, -123, +8
-# CHECK-OBJ-NEW: jle r5, -123, +8
-# CHECK-OBJ-NEW: jsgt r5, -123, +8
-# CHECK-OBJ-NEW: jsge r5, -123, +8
-# CHECK-OBJ-NEW: jslt r5, -123, +8
-# CHECK-OBJ-NEW: jsle r5, -123, +8
-# CHECK-OBJ-OLD: if r5 == -123 goto +8
-# CHECK-OBJ-OLD: if r5 != -123 goto +8
-# CHECK-OBJ-OLD: if r5 > -123 goto +8
-# CHECK-OBJ-OLD: if r5 >= -123 goto +8
-# CHECK-OBJ-OLD: if r5 < -123 goto +8
-# CHECK-OBJ-OLD: if r5 <= -123 goto +8
-# CHECK-OBJ-OLD: if r5 s> -123 goto +8
-# CHECK-OBJ-OLD: if r5 s>= -123 goto +8
-# CHECK-OBJ-OLD: if r5 s< -123 goto +8
-# CHECK-OBJ-OLD: if r5 s<= -123 goto +8
+# CHECK-OBJ-NEW: jeq r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jne r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jgt r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jge r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jlt r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jle r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jsgt r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jsge r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jslt r5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jsle r5, -0x7b, +0x8
+# CHECK-OBJ-OLD: if r5 == -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 != -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 > -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 >= -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 < -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 <= -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 s> -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 s>= -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 s< -0x7b goto +0x8
+# CHECK-OBJ-OLD: if r5 s<= -0x7b goto +0x8
 # CHECK-ASM-NEW: encoding: [0x15,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x55,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x25,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
@@ -193,26 +193,26 @@ jsge r5, -123, +8
 jslt r5, -123, +8
 jsle r5, -123, +8
 
-# CHECK-OBJ-NEW: jeq w6, w2, +8
-# CHECK-OBJ-NEW: jne w6, w2, +8
-# CHECK-OBJ-NEW: jgt w6, w2, +8
-# CHECK-OBJ-NEW: jge w6, w2, +8
-# CHECK-OBJ-NEW: jlt w6, w2, +8
-# CHECK-OBJ-NEW: jle w6, w2, +8
-# CHECK-OBJ-NEW: jsgt w6, w2, +8
-# CHECK-OBJ-NEW: jsge w6, w2, +8
-# CHECK-OBJ-NEW: jslt w6, w2, +8
-# CHECK-OBJ-NEW: jsle w6, w2, +8
-# CHECK-OBJ-OLD: if w6 == w2 goto +8
-# CHECK-OBJ-OLD: if w6 != w2 goto +8
-# CHECK-OBJ-OLD: if w6 > w2 goto +8
-# CHECK-OBJ-OLD: if w6 >= w2 goto +8
-# CHECK-OBJ-OLD: if w6 < w2 goto +8
-# CHECK-OBJ-OLD: if w6 <= w2 goto +8
-# CHECK-OBJ-OLD: if w6 s> w2 goto +8
-# CHECK-OBJ-OLD: if w6 s>= w2 goto +8
-# CHECK-OBJ-OLD: if w6 s< w2 goto +8
-# CHECK-OBJ-OLD: if w6 s<= w2 goto +8
+# CHECK-OBJ-NEW: jeq w6, w2, +0x8
+# CHECK-OBJ-NEW: jne w6, w2, +0x8
+# CHECK-OBJ-NEW: jgt w6, w2, +0x8
+# CHECK-OBJ-NEW: jge w6, w2, +0x8
+# CHECK-OBJ-NEW: jlt w6, w2, +0x8
+# CHECK-OBJ-NEW: jle w6, w2, +0x8
+# CHECK-OBJ-NEW: jsgt w6, w2, +0x8
+# CHECK-OBJ-NEW: jsge w6, w2, +0x8
+# CHECK-OBJ-NEW: jslt w6, w2, +0x8
+# CHECK-OBJ-NEW: jsle w6, w2, +0x8
+# CHECK-OBJ-OLD: if w6 == w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 != w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 > w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 >= w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 < w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 <= w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 s> w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 s>= w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 s< w2 goto +0x8
+# CHECK-OBJ-OLD: if w6 s<= w2 goto +0x8
 # CHECK-ASM-NEW: encoding: [0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
@@ -234,22 +234,22 @@ jsge w6, w2, +8
 jslt w6, w2, +8
 jsle w6, w2, +8
 
-# CHECK-OBJ-NEW: jeq w5, -123, +8
-# CHECK-OBJ-NEW: jne w5, -123, +8
-# CHECK-OBJ-NEW: jgt w5, -123, +8
-# CHECK-OBJ-NEW: jge w5, -123, +8
-# CHECK-OBJ-NEW: jlt w5, -123, +8
-# CHECK-OBJ-NEW: jle w5, -123, +8
-# CHECK-OBJ-NEW: jsgt w5, -123, +8
-# CHECK-OBJ-NEW: jsge w5, -123, +8
-# CHECK-OBJ-NEW: jslt w5, -123, +8
-# CHECK-OBJ-NEW: jsle w5, -123, +8
-# CHECK-OBJ-OLD: if w5 == -123 goto +8
-# CHECK-OBJ-OLD: if w5 != -123 goto +8
-# CHECK-OBJ-OLD: if w5 s> -123 goto +8
-# CHECK-OBJ-OLD: if w5 s>= -123 goto +8
-# CHECK-OBJ-OLD: if w5 s< -123 goto +8
-# CHECK-OBJ-OLD: if w5 s<= -123 goto +8
+# CHECK-OBJ-NEW: jeq w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jne w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jgt w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jge w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jlt w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jle w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jsgt w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jsge w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jslt w5, -0x7b, +0x8
+# CHECK-OBJ-NEW: jsle w5, -0x7b, +0x8
+# CHECK-OBJ-OLD: if w5 == -0x7b goto +0x8
+# CHECK-OBJ-OLD: if w5 != -0x7b goto +0x8
+# CHECK-OBJ-OLD: if w5 s> -0x7b goto +0x8
+# CHECK-OBJ-OLD: if w5 s>= -0x7b goto +0x8
+# CHECK-OBJ-OLD: if w5 s< -0x7b goto +0x8
+# CHECK-OBJ-OLD: if w5 s<= -0x7b goto +0x8
 # CHECK-ASM-NEW: encoding: [0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
@@ -272,8 +272,8 @@ jslt w5, -123, +8
 jsle w5, -123, +8
 
 
-# CHECK-OBJ-NEW: call 8
-# CHECK-OBJ-OLD: call 8
+# CHECK-OBJ-NEW: call 0x8
+# CHECK-OBJ-OLD: call 0x8
 # CHECK-ASM-NEW: encoding: [0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00]
 call 8
 
diff --git a/llvm/test/MC/SBF/sbf-ldst.s b/llvm/test/MC/SBF/sbf-ldst.s
index 63990f8649012..92fb8f39320fb 100644
--- a/llvm/test/MC/SBF/sbf-ldst.s
+++ b/llvm/test/MC/SBF/sbf-ldst.s
@@ -18,15 +18,15 @@
 
 # TODO: Test immediate field ranges and some hex immediates.
 
-# CHECK-OBJ-NEW: lddw r7, 32768
-# CHECK-OBJ-NEW: lddw r0, 9151314442816847872
-# CHECK-OBJ-NEW: lddw r1, -1
+# CHECK-OBJ-NEW: lddw r7, 0x8000
+# CHECK-OBJ-NEW: lddw r0, 0x7f00000000000000
+# CHECK-OBJ-NEW: lddw r1, -0x1
 # CHECK-OBJ-NEW: lddw r3, 0
 # CHECK-OBJ-NEW: 0000000000000030:  R_SBF_64_64        the_symbol
-# CHECK-OBJ-OLD: r7 = 32768 ll
-# CHECK-OBJ-OLD: r0 = 9151314442816847872 ll
-# CHECK-OBJ-OLD: r1 = -1 ll
-# CHECK-OBJ-OLD: r3 = 0 ll
+# CHECK-OBJ-OLD: r7 = 0x8000 ll
+# CHECK-OBJ-OLD: r0 = 0x7f00000000000000 ll
+# CHECK-OBJ-OLD: r1 = -0x1 ll
+# CHECK-OBJ-OLD: r3 = 0x0 ll
 # CHECK-OBJ-OLD: 0000000000000030:  R_SBF_64_64        the_symbol
 # CHECK-ASM-NEW: encoding: [0x18,0x07,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f]
@@ -40,16 +40,16 @@ lddw r3, the_symbol
 
 
 
-# CHECK-OBJ-NEW: ldxb r6, [r1 + 17]
-# CHECK-OBJ-NEW: ldxb r1, [r10 - 3]
-# CHECK-OBJ-NEW: ldxh r8, [r2 + 32]
-# CHECK-OBJ-NEW: ldxw r4, [r3 + 64]
-# CHECK-OBJ-NEW: ldxdw r0, [r4 + 128]
-# CHECK-OBJ-OLD: r6 = *(u8 *)(r1 + 17)
-# CHECK-OBJ-OLD: r1 = *(u8 *)(r10 - 3)
-# CHECK-OBJ-OLD: r8 = *(u16 *)(r2 + 32)
-# CHECK-OBJ-OLD: r4 = *(u32 *)(r3 + 64)
-# CHECK-OBJ-OLD: r0 = *(u64 *)(r4 + 128)
+# CHECK-OBJ-NEW: ldxb r6, [r1 + 0x11]
+# CHECK-OBJ-NEW: ldxb r1, [r10 - 0x3]
+# CHECK-OBJ-NEW: ldxh r8, [r2 + 0x20]
+# CHECK-OBJ-NEW: ldxw r4, [r3 + 0x40]
+# CHECK-OBJ-NEW: ldxdw r0, [r4 + 0x80]
+# CHECK-OBJ-OLD: r6 = *(u8 *)(r1 + 0x11)
+# CHECK-OBJ-OLD: r1 = *(u8 *)(r10 - 0x3)
+# CHECK-OBJ-OLD: r8 = *(u16 *)(r2 + 0x20)
+# CHECK-OBJ-OLD: r4 = *(u32 *)(r3 + 0x40)
+# CHECK-OBJ-OLD: r0 = *(u64 *)(r4 + 0x80)
 # CHECK-ASM-NEW: encoding: [0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -63,14 +63,14 @@ ldxdw r0, [r4 + 128]
 
 
 
-# CHECK32-OBJ-NEW: ldxb w6, [r1 + 17]
-# CHECK32-OBJ-NEW: ldxb w1, [r10 - 3]
-# CHECK32-OBJ-NEW: ldxh w8, [r2 + 32]
-# CHECK32-OBJ-NEW: ldxw w4, [r3 + 64]
-# CHECK32-OBJ-OLD: w6 = *(u8 *)(r1 + 17)
-# CHECK32-OBJ-OLD: w1 = *(u8 *)(r10 - 3)
-# CHECK32-OBJ-OLD: w8 = *(u16 *)(r2 + 32)
-# CHECK32-OBJ-OLD: w4 = *(u32 *)(r3 + 64)
+# CHECK32-OBJ-NEW: ldxb w6, [r1 + 0x11]
+# CHECK32-OBJ-NEW: ldxb w1, [r10 - 0x3]
+# CHECK32-OBJ-NEW: ldxh w8, [r2 + 0x20]
+# CHECK32-OBJ-NEW: ldxw w4, [r3 + 0x40]
+# CHECK32-OBJ-OLD: w6 = *(u8 *)(r1 + 0x11)
+# CHECK32-OBJ-OLD: w1 = *(u8 *)(r10 - 0x3)
+# CHECK32-OBJ-OLD: w8 = *(u16 *)(r2 + 0x20)
+# CHECK32-OBJ-OLD: w4 = *(u32 *)(r3 + 0x40)
 # CHECK32-ASM-NEW: encoding: [0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -82,16 +82,16 @@ ldxw w4, [r3 + 64]
 
 
 
-# CHECK-OBJ-NEW: stxb [r1 + 17], r6
-# CHECK-OBJ-NEW: stxb [r10 - 3], r1
-# CHECK-OBJ-NEW: stxh [r2 + 32], r8
-# CHECK-OBJ-NEW: stxw [r3 + 64], r4
-# CHECK-OBJ-NEW: stxdw [r4 + 128], r0
-# CHECK-OBJ-OLD: *(u8 *)(r1 + 17) = r6
-# CHECK-OBJ-OLD: *(u8 *)(r10 - 3) = r1
-# CHECK-OBJ-OLD: *(u16 *)(r2 + 32) = r8
-# CHECK-OBJ-OLD: *(u32 *)(r3 + 64) = r4
-# CHECK-OBJ-OLD: *(u64 *)(r4 + 128) = r0
+# CHECK-OBJ-NEW: stxb [r1 + 0x11], r6
+# CHECK-OBJ-NEW: stxb [r10 - 0x3], r1
+# CHECK-OBJ-NEW: stxh [r2 + 0x20], r8
+# CHECK-OBJ-NEW: stxw [r3 + 0x40], r4
+# CHECK-OBJ-NEW: stxdw [r4 + 0x80], r0
+# CHECK-OBJ-OLD: *(u8 *)(r1 + 0x11) = r6
+# CHECK-OBJ-OLD: *(u8 *)(r10 - 0x3) = r1
+# CHECK-OBJ-OLD: *(u16 *)(r2 + 0x20) = r8
+# CHECK-OBJ-OLD: *(u32 *)(r3 + 0x40) = r4
+# CHECK-OBJ-OLD: *(u64 *)(r4 + 0x80) = r0
 # CHECK-ASM-NEW: encoding: [0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -105,14 +105,14 @@ stxdw [r4 + 128], r0
 
 
 
-# CHECK32-OBJ-NEW: stxb [r1 + 17], w6
-# CHECK32-OBJ-NEW: stxb [r10 - 3], w1
-# CHECK32-OBJ-NEW: stxh [r2 + 32], w8
-# CHECK32-OBJ-NEW: stxw [r3 + 64], w4
-# CHECK32-OBJ-OLD: *(u8 *)(r1 + 17) = w6
-# CHECK32-OBJ-OLD: *(u8 *)(r10 - 3) = w1
-# CHECK32-OBJ-OLD: *(u16 *)(r2 + 32) = w8
-# CHECK32-OBJ-OLD: *(u32 *)(r3 + 64) = w4
+# CHECK32-OBJ-NEW: stxb [r1 + 0x11], w6
+# CHECK32-OBJ-NEW: stxb [r10 - 0x3], w1
+# CHECK32-OBJ-NEW: stxh [r2 + 0x20], w8
+# CHECK32-OBJ-NEW: stxw [r3 + 0x40], w4
+# CHECK32-OBJ-OLD: *(u8 *)(r1 + 0x11) = w6
+# CHECK32-OBJ-OLD: *(u8 *)(r10 - 0x3) = w1
+# CHECK32-OBJ-OLD: *(u16 *)(r2 + 0x20) = w8
+# CHECK32-OBJ-OLD: *(u32 *)(r3 + 0x40) = w4
 # CHECK32-ASM-NEW: encoding: [0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -124,22 +124,22 @@ stxw [r3 + 64], w4
 
 
 # XADDW (NoALU32).
-# CHECK-OBJ-NEW: stxxaddw [r8 + 4], r2
-# CHECK-OBJ-OLD: lock *(u32 *)(r8 + 4) += r2
+# CHECK-OBJ-NEW: stxxaddw [r8 + 0x4], r2
+# CHECK-OBJ-OLD: lock *(u32 *)(r8 + 0x4) += r2
 # CHECK-ASM-NEW: encoding: [0xc3,0x28,0x04,0x00,0x00,0x00,0x00,0x00]
 stxxaddw [r8 + 4], r2
 
 
 
 # XADDD, XANDD, XORD, XXORD (NoALU32).
-# CHECK-OBJ-NEW: stxxadddw [r8 - 16], r0
-# CHECK-OBJ-NEW: stxxanddw [r8 - 32], r1
-# CHECK-OBJ-NEW: stxxordw [r8 - 64], r2
-# CHECK-OBJ-NEW: stxxxordw [r8 - 128], r3
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 16) += r0
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 32) &= r1
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 64) |= r2
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 128) ^= r3
+# CHECK-OBJ-NEW: stxxadddw [r8 - 0x10], r0
+# CHECK-OBJ-NEW: stxxanddw [r8 - 0x20], r1
+# CHECK-OBJ-NEW: stxxordw [r8 - 0x40], r2
+# CHECK-OBJ-NEW: stxxxordw [r8 - 0x80], r3
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x10) += r0
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x20) &= r1
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x40) |= r2
+# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x80) ^= r3
 # CHECK-ASM-NEW: encoding: [0xdb,0x08,0xf0,0xff,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x18,0xe0,0xff,0x50,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x28,0xc0,0xff,0x40,0x00,0x00,0x00]
@@ -152,14 +152,14 @@ stxxxordw [r8 - 128], r3
 
 
 # XADDW32, XANDW32, XORW32, XXORW32 (ALU32).
-# CHECK32-OBJ-NEW: stxxaddw [r8 - 16], w4
-# CHECK32-OBJ-NEW: stxxandw [r8 - 32], w5
-# CHECK32-OBJ-NEW: stxxorw [r8 - 64], w6
-# CHECK32-OBJ-NEW: stxxxorw [r8 - 128], w7
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 16) += w4
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 32) &= w5
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 64) |= w6
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 128) ^= w7
+# CHECK32-OBJ-NEW: stxxaddw [r8 - 0x10], w4
+# CHECK32-OBJ-NEW: stxxandw [r8 - 0x20], w5
+# CHECK32-OBJ-NEW: stxxorw [r8 - 0x40], w6
+# CHECK32-OBJ-NEW: stxxxorw [r8 - 0x80], w7
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x10) += w4
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x20) &= w5
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x40) |= w6
+# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x80) ^= w7
 # CHECK32-ASM-NEW: encoding: [0xc3,0x48,0xf0,0xff,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x58,0xe0,0xff,0x50,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x68,0xc0,0xff,0x40,0x00,0x00,0x00]
@@ -172,14 +172,14 @@ stxxxorw [r8 - 128], w7
 
 
 # XFADDD, XFANDD, XFORD, XFXORD (NoALU32).
-# CHECK-OBJ-NEW: stxxfadddw [r8 - 16], r0
-# CHECK-OBJ-NEW: stxxfanddw [r8 - 32], r1
-# CHECK-OBJ-NEW: stxxfordw [r8 - 64], r2
-# CHECK-OBJ-NEW: stxxfxordw [r8 - 128], r3
-# CHECK-OBJ-OLD: r0 = atomic_fetch_add((u64 *)(r8 - 16), r0)
-# CHECK-OBJ-OLD: r1 = atomic_fetch_and((u64 *)(r8 - 32), r1)
-# CHECK-OBJ-OLD: r2 = atomic_fetch_or((u64 *)(r8 - 64), r2)
-# CHECK-OBJ-OLD: r3 = atomic_fetch_xor((u64 *)(r8 - 128), r3)
+# CHECK-OBJ-NEW: stxxfadddw [r8 - 0x10], r0
+# CHECK-OBJ-NEW: stxxfanddw [r8 - 0x20], r1
+# CHECK-OBJ-NEW: stxxfordw [r8 - 0x40], r2
+# CHECK-OBJ-NEW: stxxfxordw [r8 - 0x80], r3
+# CHECK-OBJ-OLD: r0 = atomic_fetch_add((u64 *)(r8 - 0x10), r0)
+# CHECK-OBJ-OLD: r1 = atomic_fetch_and((u64 *)(r8 - 0x20), r1)
+# CHECK-OBJ-OLD: r2 = atomic_fetch_or((u64 *)(r8 - 0x40), r2)
+# CHECK-OBJ-OLD: r3 = atomic_fetch_xor((u64 *)(r8 - 0x80), r3)
 # CHECK-ASM-NEW: encoding: [0xdb,0x08,0xf0,0xff,0x01,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x18,0xe0,0xff,0x51,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x28,0xc0,0xff,0x41,0x00,0x00,0x00]
@@ -192,14 +192,14 @@ stxxfxordw [r8 - 128], r3
 
 
 # XFADDW32, XFANDW32, XFORW32, XFXORW32 (ALU32).
-# CHECK32-OBJ-NEW: stxxfaddw [r8 - 16], w0
-# CHECK32-OBJ-NEW: stxxfandw [r8 - 32], w1
-# CHECK32-OBJ-NEW: stxxforw [r8 - 64], w2
-# CHECK32-OBJ-NEW: stxxfxorw [r8 - 128], w3
-# CHECK32-OBJ-OLD: w0 = atomic_fetch_add((u32 *)(r8 - 16), w0)
-# CHECK32-OBJ-OLD: w1 = atomic_fetch_and((u32 *)(r8 - 32), w1)
-# CHECK32-OBJ-OLD: w2 = atomic_fetch_or((u32 *)(r8 - 64), w2)
-# CHECK32-OBJ-OLD: w3 = atomic_fetch_xor((u32 *)(r8 - 128), w3)
+# CHECK32-OBJ-NEW: stxxfaddw [r8 - 0x10], w0
+# CHECK32-OBJ-NEW: stxxfandw [r8 - 0x20], w1
+# CHECK32-OBJ-NEW: stxxforw [r8 - 0x40], w2
+# CHECK32-OBJ-NEW: stxxfxorw [r8 - 0x80], w3
+# CHECK32-OBJ-OLD: w0 = atomic_fetch_add((u32 *)(r8 - 0x10), w0)
+# CHECK32-OBJ-OLD: w1 = atomic_fetch_and((u32 *)(r8 - 0x20), w1)
+# CHECK32-OBJ-OLD: w2 = atomic_fetch_or((u32 *)(r8 - 0x40), w2)
+# CHECK32-OBJ-OLD: w3 = atomic_fetch_xor((u32 *)(r8 - 0x80), w3)
 # CHECK32-ASM-NEW: encoding: [0xc3,0x08,0xf0,0xff,0x01,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x18,0xe0,0xff,0x51,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x28,0xc0,0xff,0x41,0x00,0x00,0x00]
@@ -212,10 +212,10 @@ stxxfxorw [r8 - 128], w3
 
 
 # XCHGD, XCHGW32
-# CHECK-OBJ-NEW: stxxchgdw [r8 - 16], r7
-# CHECK-OBJ-OLD: r7 = xchg_64(r8 - 16, r7)
-# CHECK32-OBJ-NEW: stxxchgw [r8 - 16], w0
-# CHECK32-OBJ-OLD: w0 = xchg32_32(r8 - 16, w0)
+# CHECK-OBJ-NEW: stxxchgdw [r8 - 0x10], r7
+# CHECK-OBJ-OLD: r7 = xchg_64(r8 - 0x10, r7)
+# CHECK32-OBJ-NEW: stxxchgw [r8 - 0x10], w0
+# CHECK32-OBJ-OLD: w0 = xchg32_32(r8 - 0x10, w0)
 # CHECK-ASM-NEW: encoding: [0xdb,0x78,0xf0,0xff,0xe1,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x08,0xf0,0xff,0xe1,0x00,0x00,0x00]
 stxxchgdw [r8 - 16], r7
@@ -224,10 +224,10 @@ stxxchgw [r8 - 16], w0
 
 
 # CMPXCHGD, CMPXCHGW32
-# CHECK-OBJ-NEW: stxcmpxchgdw [r8 - 16], r5
-# CHECK-OBJ-OLD: r0 = cmpxchg_64(r8 - 16, r0, r5)
-# CHECK32-OBJ-NEW: stxcmpxchgw [r8 - 16], w5
-# CHECK32-OBJ-OLD: w0 = cmpxchg32_32(r8 - 16, w0, w5)
+# CHECK-OBJ-NEW: stxcmpxchgdw [r8 - 0x10], r5
+# CHECK-OBJ-OLD: r0 = cmpxchg_64(r8 - 0x10, r0, r5)
+# CHECK32-OBJ-NEW: stxcmpxchgw [r8 - 0x10], w5
+# CHECK32-OBJ-OLD: w0 = cmpxchg32_32(r8 - 0x10, w0, w5)
 # CHECK-ASM-NEW: encoding: [0xdb,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
 stxcmpxchgdw [r8 - 16], r5
@@ -236,15 +236,15 @@ stxcmpxchgw [r8 - 16], w5
 
 
 # Obsolete ldabs/ldind for completeness.
-# CHECK-OBJ-NEW: ldabsb 64
-# CHECK-OBJ-NEW: ldabsh 128
+# CHECK-OBJ-NEW: ldabsb 0x40
+# CHECK-OBJ-NEW: ldabsh 0x80
 # CHECK-OBJ-NEW: ldabsw 0
 # CHECK-OBJ-NEW: ldindb r5
 # CHECK-OBJ-NEW: ldindh r9
 # CHECK-OBJ-NEW: ldindw r7
-# CHECK-OBJ-OLD: r0 = *(u8 *)skb[64]
-# CHECK-OBJ-OLD: r0 = *(u16 *)skb[128]
-# CHECK-OBJ-OLD: r0 = *(u32 *)skb[0]
+# CHECK-OBJ-OLD: r0 = *(u8 *)skb[0x40]
+# CHECK-OBJ-OLD: r0 = *(u16 *)skb[0x80]
+# CHECK-OBJ-OLD: r0 = *(u32 *)skb[0x0]
 # CHECK-OBJ-OLD: r0 = *(u8 *)skb[r5]
 # CHECK-OBJ-OLD: r0 = *(u16 *)skb[r9]
 # CHECK-OBJ-OLD: r0 = *(u32 *)skb[r7]
diff --git a/llvm/test/MC/SBF/sbf-sdiv.s b/llvm/test/MC/SBF/sbf-sdiv.s
index b1a767c71f3a0..524417554e3cd 100644
--- a/llvm/test/MC/SBF/sbf-sdiv.s
+++ b/llvm/test/MC/SBF/sbf-sdiv.s
@@ -7,11 +7,11 @@ w1 s/= w2   // BPF_SDIV | BPF_X
 // CHECK: ec 21 00 00 00 00 00 00      w1 s/= w2
 
 w3 s/= 6    // BPF_SDIV | BPF_K
-// CHECK: e4 03 00 00 06 00 00 00      w3 s/= 6
+// CHECK: e4 03 00 00 06 00 00 00      w3 s/= 0x6
 
 
 r4 s/= r5   // BPF_SDIV | BPF_X
 // CHECK: ef 54 00 00 00 00 00 00 	r4 s/= r5
 
 r5 s/= 6    // BPF_SDIV | BPF_K
-// CHECK: e7 05 00 00 06 00 00 00 	r5 s/= 6
+// CHECK: e7 05 00 00 06 00 00 00 	r5 s/= 0x6

From 590832034c5d699598695969b614c57094ee6423 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Sat, 9 Dec 2023 21:30:01 -0600
Subject: [PATCH 019/114] [SOL] Temporarily disable opt-viewer tests for MacOS.
 (#71)

These tests currently fail on some Macs for some versions of Python,
causing our CI to fail.

See, e.g., https://github.com/llvm/llvm-project/issues/62403 and references
therein.
---
 lld/test/MachO/compact-unwind-generated.test | 1 +
 llvm/test/tools/opt-viewer/lit.local.cfg     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/lld/test/MachO/compact-unwind-generated.test b/lld/test/MachO/compact-unwind-generated.test
index b81236b198c3b..34a4e9d820762 100644
--- a/lld/test/MachO/compact-unwind-generated.test
+++ b/lld/test/MachO/compact-unwind-generated.test
@@ -1,4 +1,5 @@
 # REQUIRES: x86
+# XFAIL: system-darwin
 
 # FIXME(gkm): This test is fast on a Release tree, and slow (~10s) on
 # a Debug tree mostly because of llvm-mc. Is there a way to prefer the
diff --git a/llvm/test/tools/opt-viewer/lit.local.cfg b/llvm/test/tools/opt-viewer/lit.local.cfg
index d181a93eb8464..9272581371eac 100644
--- a/llvm/test/tools/opt-viewer/lit.local.cfg
+++ b/llvm/test/tools/opt-viewer/lit.local.cfg
@@ -8,3 +8,6 @@ if "have_opt_viewer_modules" not in config.available_features:
 # can be resolved.
 if sys.platform == "win32":
     config.unsupported = True
+
+if sys.platform == 'darwin':
+    config.unsupported = True

From 55e7a956e79945cea373dedb948a6f9344387a33 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 11 Dec 2023 21:15:53 -0300
Subject: [PATCH 020/114] [SOL] Use ADD for subtracting stack pointer (#70)

This PR replaces sub r11, imm by add r11, -imm and is the equivalent of solana-labs/rbpf#488 for the SBF target in LLVM.

This is the first task in solana-labs/solana#34250
---
 llvm/lib/Target/SBF/SBFFrameLowering.cpp      | 12 +++----
 .../SBF/dynamic_stack_frame_add_not_sub.ll    | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll

diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.cpp b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
index f893e7f073e18..c29af66e9281f 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
@@ -16,24 +16,22 @@
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
 
 using namespace llvm;
 
 namespace {
 
 void adjustStackPointer(MachineFunction &MF, MachineBasicBlock &MBB,
-                        MachineBasicBlock::iterator &MBBI,
-                        unsigned int Opcode) {
+                        MachineBasicBlock::iterator &MBBI, bool IsSubtract) {
   MachineFrameInfo &MFI = MF.getFrameInfo();
   int NumBytes = (int)MFI.getStackSize();
   if (NumBytes) {
     DebugLoc Dl;
     const SBFInstrInfo &TII =
         *static_cast<const SBFInstrInfo *>(MF.getSubtarget().getInstrInfo());
-    BuildMI(MBB, MBBI, Dl, TII.get(Opcode), SBF::R11)
+    BuildMI(MBB, MBBI, Dl, TII.get(SBF::ADD_ri), SBF::R11)
         .addReg(SBF::R11)
-        .addImm(NumBytes);
+        .addImm(IsSubtract ? -NumBytes : NumBytes);
   }
 }
 
@@ -47,7 +45,7 @@ void SBFFrameLowering::emitPrologue(MachineFunction &MF,
     return;
   }
   MachineBasicBlock::iterator MBBI = MBB.begin();
-  adjustStackPointer(MF, MBB, MBBI, SBF::SUB_ri);
+  adjustStackPointer(MF, MBB, MBBI, true);
 }
 
 void SBFFrameLowering::emitEpilogue(MachineFunction &MF,
@@ -56,7 +54,7 @@ void SBFFrameLowering::emitEpilogue(MachineFunction &MF,
     return;
   }
   MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr();
-  adjustStackPointer(MF, MBB, MBBI, SBF::ADD_ri);
+  adjustStackPointer(MF, MBB, MBBI, false);
 }
 
 void SBFFrameLowering::determineCalleeSaves(MachineFunction &MF,
diff --git a/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll b/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
new file mode 100644
index 0000000000000..307c50d058300
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
@@ -0,0 +1,31 @@
+; RUN: llc < %s -march=sbf --mattr=+dynamic-frames | FileCheck %s
+;
+; Source:
+; int test_func(int * vec, int idx) {
+;      vec[idx] = idx-1;
+;      return idx;
+;  }
+; Compilation flag:
+; clang -S -emit-llvm test.c
+
+
+; Function Attrs: noinline nounwind optnone ssp uwtable(sync)
+define i32 @test_func(ptr noundef %vec, i32 noundef %idx) #0 {
+; CHECK-LABEL: test_func:
+; CHECK: add64 r11, -16
+; CHECK: add64 r11, 16
+entry:
+  %vec.addr = alloca ptr, align 8
+  %idx.addr = alloca i32, align 4
+  store ptr %vec, ptr %vec.addr, align 8
+  store i32 %idx, ptr %idx.addr, align 4
+  %0 = load i32, ptr %idx.addr, align 4
+  %sub = sub nsw i32 %0, 1
+  %1 = load ptr, ptr %vec.addr, align 8
+  %2 = load i32, ptr %idx.addr, align 4
+  %idxprom = sext i32 %2 to i64
+  %arrayidx = getelementptr inbounds i32, ptr %1, i64 %idxprom
+  store i32 %sub, ptr %arrayidx, align 4
+  %3 = load i32, ptr %idx.addr, align 4
+  ret i32 %3
+}
\ No newline at end of file

From 2f91d8d827fcf9a04c72f8470eef69acf7b84653 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jason.eckhardt@solana.com>
Date: Tue, 12 Dec 2023 01:22:19 -0600
Subject: [PATCH 021/114] [SOL] Remove now obsolete old syntax bits. (#72)

Patch https://github.com/solana-labs/llvm-project/pull/54 originally
reworked the SBF textual assembly syntax to match the rbpf-style syntax.

In order to allow some soak-time, the above patch temporarily supported
both the old and new syntax (selectable on the command line or via bespoke
assembler directives). A little over a year has passed since then,
and all is well with the new syntax, testing, and so forth.

The current patch now removes all existing remnants of the old syntax--
including some of the target-independent changes made in the original
patch to support both (e.g., a minor TableGen change for variants, some
additional command line selector flags, etc).

All related unit tests have been updated accordingly.
---
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp | 192 +----------
 llvm/lib/Target/SBF/CMakeLists.txt            |   1 -
 .../SBF/MCTargetDesc/SBFInstPrinter.cpp       |   1 -
 .../Target/SBF/MCTargetDesc/SBFInstPrinter.h  |  20 --
 .../Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp  |   6 +-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |   2 -
 llvm/lib/Target/SBF/SBF.td                    |  21 +-
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |   5 -
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 308 ++++++++----------
 llvm/test/CodeGen/SBF/inline_asm.ll           |  53 ---
 llvm/test/CodeGen/SBF/inlineasm-wreg.ll       |  10 +-
 llvm/test/MC/Disassembler/SBF/sbf-alu.txt     |  82 -----
 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt     |  61 ----
 llvm/test/MC/Disassembler/SBF/sbf-ldst.txt    |  52 ---
 llvm/test/MC/SBF/insn-unit-32.s               | 182 +++++------
 llvm/test/MC/SBF/insn-unit.s                  | 297 ++++++++---------
 llvm/test/MC/SBF/load-store-32.s              |  48 ++-
 llvm/test/MC/SBF/sbf-alu.s                    |  83 -----
 llvm/test/MC/SBF/sbf-jmp.s                    |  65 ----
 llvm/test/MC/SBF/sbf-ldst.s                   |  56 ----
 llvm/test/MC/SBF/sbf-sdiv.s                   |  20 +-
 llvm/tools/llvm-objdump/ObjdumpOpts.td        |   4 -
 llvm/tools/llvm-objdump/llvm-objdump.cpp      |   6 -
 .../TableGen/Common/CodeGenInstruction.cpp    |  12 +-
 24 files changed, 407 insertions(+), 1180 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SBF/inline_asm.ll

diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index 6166da9171bec..fcc56073520aa 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -33,12 +33,6 @@ class SBFAsmParser : public MCTargetAsmParser {
 
   SMLoc getLoc() const { return getParser().getTok().getLoc(); }
 
-  bool isNewSyntax() {
-    return getParser().getAssemblerDialect() == 0;
-  }
-
-  bool PreMatchCheck(OperandVector &Operands);
-
   bool MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
                                OperandVector &Operands, MCStreamer &Out,
                                uint64_t &ErrorInfo,
@@ -52,25 +46,14 @@ class SBFAsmParser : public MCTargetAsmParser {
   bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                         SMLoc NameLoc, OperandVector &Operands) override;
 
-  bool parseOldInstruction(ParseInstructionInfo &Info, StringRef Name,
-                           SMLoc NameLoc, OperandVector &Operands);
-
   bool ParseDirective(AsmToken DirectiveID) override;
 
-  // "=" is used as assignment operator for assembly statement, so can't be used
-  // for symbol assignment (old syntax only).
-  bool equalIsAsmAssignment() override { return isNewSyntax(); }
-  // "*" is used for dereferencing memory that it will be the start of
-  // statement (old syntax only).
-  bool starIsStartOfStatement() override { return !isNewSyntax(); }
-
 #define GET_ASSEMBLER_HEADER
 #include "SBFGenAsmMatcher.inc"
 
   bool parseOperand(OperandVector &Operands, StringRef Mnemonic);
   OperandMatchResultTy parseImmediate(OperandVector &Operands);
   OperandMatchResultTy parseRegister(OperandVector &Operands);
-  OperandMatchResultTy parseOperandAsOperator(OperandVector &Operands);
   OperandMatchResultTy parseMemOperand(OperandVector &Operands);
 
 public:
@@ -280,32 +263,6 @@ struct SBFOperand : public MCParsedAsmOperand {
 #define GET_MATCHER_IMPLEMENTATION
 #include "SBFGenAsmMatcher.inc"
 
-bool SBFAsmParser::PreMatchCheck(OperandVector &Operands) {
-
-  // These checks not needed for the new syntax.
-  if (isNewSyntax())
-    return false;
-
-  if (Operands.size() == 4) {
-    // check "reg1 = -reg2" and "reg1 = be16/be32/be64/le16/le32/le64 reg2",
-    // reg1 must be the same as reg2
-    SBFOperand &Op0 = (SBFOperand &)*Operands[0];
-    SBFOperand &Op1 = (SBFOperand &)*Operands[1];
-    SBFOperand &Op2 = (SBFOperand &)*Operands[2];
-    SBFOperand &Op3 = (SBFOperand &)*Operands[3];
-    if (Op0.isReg() && Op1.isToken() && Op2.isToken() && Op3.isReg()
-        && Op1.getToken() == "="
-        && (Op2.getToken() == "-" || Op2.getToken() == "be16"
-            || Op2.getToken() == "be32" || Op2.getToken() == "be64"
-            || Op2.getToken() == "le16" || Op2.getToken() == "le32"
-            || Op2.getToken() == "le64")
-        && Op0.getReg() != Op3.getReg())
-      return true;
-  }
-
-  return false;
-}
-
 bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
                                            OperandVector &Operands,
                                            MCStreamer &Out, uint64_t &ErrorInfo,
@@ -313,12 +270,7 @@ bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
   MCInst Inst;
   SMLoc ErrorLoc;
 
-  if (PreMatchCheck(Operands))
-    return Error(IDLoc, "additional inst constraint not met");
-
-  unsigned Dialect = getParser().getAssemblerDialect();
-  switch (MatchInstructionImpl(Operands, Inst, ErrorInfo, MatchingInlineAsm,
-                               Dialect)) {
+  switch (MatchInstructionImpl(Operands, Inst, ErrorInfo, MatchingInlineAsm)) {
   default:
     break;
   case Match_Success:
@@ -372,75 +324,6 @@ OperandMatchResultTy SBFAsmParser::tryParseRegister(MCRegister &Reg,
   return MatchOperand_NoMatch;
 }
 
-OperandMatchResultTy
-SBFAsmParser::parseOperandAsOperator(OperandVector &Operands) {
-  if (isNewSyntax())
-    llvm_unreachable("parseOperandAsOperator called for new syntax");
-
-  SMLoc S = getLoc();
-
-  if (getLexer().getKind() == AsmToken::Identifier) {
-    StringRef Name = getLexer().getTok().getIdentifier();
-
-    if (SBFOperand::isValidIdInMiddle(Name)) {
-      getLexer().Lex();
-      Operands.push_back(SBFOperand::createToken(Name, S));
-      return MatchOperand_Success;
-    }
-
-    return MatchOperand_NoMatch;
-  }
-
-  switch (getLexer().getKind()) {
-  case AsmToken::Minus:
-  case AsmToken::Plus: {
-    if (getLexer().peekTok().is(AsmToken::Integer))
-      return MatchOperand_NoMatch;
-    [[fallthrough]];
-  }
-
-  case AsmToken::Equal:
-  case AsmToken::Greater:
-  case AsmToken::Less:
-  case AsmToken::Pipe:
-  case AsmToken::Star:
-  case AsmToken::LParen:
-  case AsmToken::RParen:
-  case AsmToken::LBrac:
-  case AsmToken::RBrac:
-  case AsmToken::Slash:
-  case AsmToken::Amp:
-  case AsmToken::Percent:
-  case AsmToken::Caret: {
-    StringRef Name = getLexer().getTok().getString();
-    getLexer().Lex();
-    Operands.push_back(SBFOperand::createToken(Name, S));
-
-    return MatchOperand_Success;
-  }
-
-  case AsmToken::EqualEqual:
-  case AsmToken::ExclaimEqual:
-  case AsmToken::GreaterEqual:
-  case AsmToken::GreaterGreater:
-  case AsmToken::LessEqual:
-  case AsmToken::LessLess: {
-    Operands.push_back(SBFOperand::createToken(
-        getLexer().getTok().getString().substr(0, 1), S));
-    Operands.push_back(SBFOperand::createToken(
-        getLexer().getTok().getString().substr(1, 1), S));
-    getLexer().Lex();
-
-    return MatchOperand_Success;
-  }
-
-  default:
-    break;
-  }
-
-  return MatchOperand_NoMatch;
-}
-
 OperandMatchResultTy SBFAsmParser::parseRegister(OperandVector &Operands) {
   SMLoc S = getLoc();
   SMLoc E = SMLoc::getFromPointer(S.getPointer() - 1);
@@ -519,9 +402,6 @@ OperandMatchResultTy SBFAsmParser::parseMemOperand(OperandVector &Operands) {
 /// information, adding to Operands. If operand was parsed, returns false, else
 /// true.
 bool SBFAsmParser::parseOperand(OperandVector &Operands, StringRef Mnemonic) {
-  if (!isNewSyntax())
-    llvm_unreachable("parseOperand called for old syntax");
-
   // Attempt to parse token as a register.
   if (parseRegister(Operands) == MatchOperand_Success)
     return false;
@@ -544,10 +424,6 @@ bool SBFAsmParser::parseOperand(OperandVector &Operands, StringRef Mnemonic) {
 /// Parse an SBF instruction.
 bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                                     SMLoc NameLoc, OperandVector &Operands) {
-  if (!isNewSyntax()) {
-    return parseOldInstruction(Info, Name, NameLoc, Operands);
-  }
-
   // First operand is token for instruction mnemonic.
   Operands.push_back(SBFOperand::createToken(Name, NameLoc));
 
@@ -581,71 +457,7 @@ bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
   return false;
 }
 
-/// Parse an SBF instruction which is in SBF verifier format (old syntax).
-bool SBFAsmParser::parseOldInstruction(ParseInstructionInfo &Info,
-                                       StringRef Name, SMLoc NameLoc,
-                                       OperandVector &Operands) {
-  if (isNewSyntax())
-    llvm_unreachable("parseOldInstruction called for new syntax");
-
-  // The first operand could be either register or actually an operator.
-  unsigned RegNo = MatchRegisterName(Name);
-
-  if (RegNo != 0) {
-    SMLoc E = SMLoc::getFromPointer(NameLoc.getPointer() - 1);
-    Operands.push_back(SBFOperand::createReg(RegNo, NameLoc, E));
-  } else if (SBFOperand::isValidIdAtStart (Name))
-    Operands.push_back(SBFOperand::createToken(Name, NameLoc));
-  else
-    return Error(NameLoc, "invalid register/token name");
-
-  while (!getLexer().is(AsmToken::EndOfStatement)) {
-    // Attempt to parse token as operator
-    if (parseOperandAsOperator(Operands) == MatchOperand_Success)
-      continue;
-
-    // Attempt to parse token as register
-    if (parseRegister(Operands) == MatchOperand_Success)
-      continue;
-
-    // Attempt to parse token as an immediate
-    if (parseImmediate(Operands) != MatchOperand_Success) {
-      SMLoc Loc = getLexer().getLoc();
-      return Error(Loc, "unexpected token");
-    }
-  }
-
-  if (getLexer().isNot(AsmToken::EndOfStatement)) {
-    SMLoc Loc = getLexer().getLoc();
-
-    getParser().eatToEndOfStatement();
-
-    return Error(Loc, "unexpected token");
-  }
-
-  // Consume the EndOfStatement.
-  getParser().Lex();
-  return false;
-}
-
-bool SBFAsmParser::ParseDirective(AsmToken DirectiveID) {
-  // This returns false if this function recognizes the directive
-  // regardless of whether it is successfully handles or reports an
-  // error. Otherwise it returns true to give the generic parser a
-  // chance at recognizing it.
-  StringRef IDVal = DirectiveID.getString();
-
-  if (IDVal == ".syntax_old") {
-    getParser().setAssemblerDialect(1);
-    return false;
-  }
-  if (IDVal == ".syntax_new") {
-    getParser().setAssemblerDialect(0);
-    return false;
-  }
-
-  return true;
-}
+bool SBFAsmParser::ParseDirective(AsmToken DirectiveID) { return true; }
 
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFAsmParser() {
   RegisterMCAsmParser<SBFAsmParser> XX(getTheSBFXTarget());
diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index d4f2818f473f7..40f071e00e737 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -4,7 +4,6 @@ set(LLVM_TARGET_DEFINITIONS SBF.td)
 
 tablegen(LLVM SBFGenAsmMatcher.inc -gen-asm-matcher)
 tablegen(LLVM SBFGenAsmWriter.inc -gen-asm-writer)
-tablegen(LLVM SBFGenAsmWriter1.inc -gen-asm-writer -asmwriternum=1)
 tablegen(LLVM SBFGenCallingConv.inc -gen-callingconv)
 tablegen(LLVM SBFGenDAGISel.inc -gen-dag-isel)
 tablegen(LLVM SBFGenDisassemblerTables.inc -gen-disassembler)
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
index c2dac7911231b..d3d9ec4cd55fc 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.cpp
@@ -25,7 +25,6 @@ using namespace llvm;
 
 // Include the auto-generated portion of the assembly writer.
 #include "SBFGenAsmWriter.inc"
-#include "SBFGenAsmWriter1.inc"
 
 void SBFInstPrinter::printInst(const MCInst *MI, uint64_t Address,
                                StringRef Annot, const MCSubtargetInfo &STI,
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
index 8ba00f3e67699..b056d89392b11 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
@@ -36,26 +36,6 @@ class SBFInstPrinter : public MCInstPrinter {
   void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
   static const char *getRegisterName(MCRegister Reg);
 };
-class MachineInstr;
-
-class SBFLegacyInstPrinter : public SBFInstPrinter {
-public:
-  SBFLegacyInstPrinter(const MCAsmInfo &MAI, const MCInstrInfo &MII,
-                       const MCRegisterInfo &MRI)
-      : SBFInstPrinter(MAI, MII, MRI) {}
-
-  void printInst(const MCInst *MI, uint64_t Address, StringRef Annot,
-                 const MCSubtargetInfo &STI, raw_ostream &O) override {
-    printInstruction(MI, Address, O);
-    printAnnotation(O, Annot);
-  }
-
-  // Autogenerated by tblgen.
-  std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
-  void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
-  static const char *getRegisterName(MCRegister Reg);
-};
-
 }
 
 #endif
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
index 9c80fc301fc0d..5bf43703ef46d 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.cpp
@@ -17,12 +17,8 @@
 
 using namespace llvm;
 
-cl::opt<unsigned> SBFAsmWriterVariant(
-    "sbf-output-asm-variant", cl::Hidden, cl::init(0),
-    cl::desc("Choose output assembly variant (0 = sbf[default], 1 = legacy)"));
-
 SBFMCAsmInfo::SBFMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) {
-  AssemblerDialect = SBFAsmWriterVariant;
+  assert(AssemblerDialect == 0);
 
   PrivateGlobalPrefix = ".L";
   WeakRefDirective = "\t.weak\t";
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 3b02cad05554d..e4ef970115274 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -80,8 +80,6 @@ static MCInstPrinter *createSBFMCInstPrinter(const Triple &T,
                                              const MCRegisterInfo &MRI) {
   if (SyntaxVariant == 0)
     return new SBFInstPrinter(MAI, MII, MRI);
-  if (SyntaxVariant == 1)
-    return new SBFLegacyInstPrinter(MAI, MII, MRI);
 
   return nullptr;
 }
diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
index ca4d689609e60..30520e99cad7d 100644
--- a/llvm/lib/Target/SBF/SBF.td
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -58,19 +58,11 @@ def SBFAsmWriter : AsmWriter {
   bit isMCAsmWriter = 1;
 }
 
-def LegacyAsmWriter : AsmWriter {
-  let AsmWriterClassName = "LegacyInstPrinter";
-  int Variant = 1;
-  int isMCAsmWriter = 1;
-}
-
 //===----------------------------------------------------------------------===//
 // Assembly parser
 //===----------------------------------------------------------------------===//
 
-def SBFAsmParser : AsmParser {
-  bit HasMnemonicFirst = 0;
-}
+def SBFAsmParser : AsmParser;
 
 def SBFAsmParserVariant : AsmParserVariant {
   int Variant = 0;
@@ -78,20 +70,13 @@ def SBFAsmParserVariant : AsmParserVariant {
   string BreakCharacters = ".";
 }
 
-def LegacyAsmParserVariant : AsmParserVariant {
-  int Variant = 1;
-  string Name = "legacy";
-  string BreakCharacters = ".";
-  string TokenizingCharacters = "#()[]=:.<>!+*/";
-}
-
 //===----------------------------------------------------------------------===//
 // Target Declaration
 //===----------------------------------------------------------------------===//
 
 def SBF : Target {
   let InstructionSet = SBFInstrInfo;
-  let AssemblyWriters = [SBFAsmWriter, LegacyAsmWriter];
+  let AssemblyWriters = [SBFAsmWriter];
   let AssemblyParsers = [SBFAsmParser];
-  let AssemblyParserVariants = [SBFAsmParserVariant, LegacyAsmParserVariant];
+  let AssemblyParserVariants = [SBFAsmParserVariant];
 }
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index 5f0dfd5346dd4..55a33e741029b 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -34,7 +34,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "asm-printer"
 
-extern cl::opt<unsigned> SBFAsmWriterVariant;
 static cl::opt<bool> SBFEnableBTFEmission(
     "sbf-enable-btf-emission", cl::Hidden, cl::init(false),
     cl::desc("Enable BTF debuginfo sections to be emitted"));
@@ -138,15 +137,11 @@ bool SBFAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
   if (ExtraCode)
     return true; // Unknown modifier.
 
-  if (SBFAsmWriterVariant == 1)
-    O << "(";
   O << SBFInstPrinter::getRegisterName(BaseMO.getReg());
   if (Offset < 0)
     O << " - " << -Offset;
   else
     O << " + " << Offset;
-  if (SBFAsmWriterVariant == 1)
-    O << ")";
 
   return false;
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index dccadd934a909..41a66c375408a 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -155,12 +155,11 @@ class TYPE_LD_ST<bits<3> mode, bits<2> size,
 }
 
 // jump instructions
-class JMP_RR<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
+class JMP_RR<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
                    (outs),
                    (ins GPR:$dst, GPR:$src, brtarget:$BrDst),
-                   "{" # Mnemonic # " $dst, $src, $BrDst"
-                   "|if $dst " # OpcodeStr # " $src goto $BrDst}",
+                   Mnemonic # " $dst, $src, $BrDst",
                    [(SBFbrcc i64:$dst, i64:$src, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<4> src;
@@ -172,12 +171,11 @@ class JMP_RR<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP;
 }
 
-class JMP_RI<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
+class JMP_RI<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
                    (outs),
                    (ins GPR:$dst, i64imm:$imm, brtarget:$BrDst),
-                   "{" # Mnemonic # " $dst, $imm, $BrDst"
-                   "|if $dst " # OpcodeStr # " $imm goto $BrDst}",
+                   Mnemonic # " $dst, $imm, $BrDst",
                    [(SBFbrcc i64:$dst, i64immSExt32:$imm, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<16> BrDst;
@@ -189,12 +187,11 @@ class JMP_RI<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP;
 }
 
-class JMP_RR_32<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
+class JMP_RR_32<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
                    (outs),
                    (ins GPR32:$dst, GPR32:$src, brtarget:$BrDst),
-                   "{" # Mnemonic # " $dst, $src, $BrDst"
-                   "|if $dst " # OpcodeStr # " $src goto $BrDst}",
+                   Mnemonic # " $dst, $src, $BrDst",
                    [(SBFbrcc i32:$dst, i32:$src, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<4> src;
@@ -206,12 +203,11 @@ class JMP_RR_32<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP32;
 }
 
-class JMP_RI_32<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
+class JMP_RI_32<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
                    (outs),
                    (ins GPR32:$dst, i32imm:$imm, brtarget:$BrDst),
-                   "{" # Mnemonic # " $dst, $imm, $BrDst"
-                   "|if $dst " # OpcodeStr # " $imm goto $BrDst}",
+                   Mnemonic # " $dst, $imm, $BrDst",
                    [(SBFbrcc i32:$dst, i32immSExt32:$imm, Cond, bb:$BrDst)]> {
   bits<4> dst;
   bits<16> BrDst;
@@ -223,26 +219,25 @@ class JMP_RI_32<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond>
   let SBFClass = SBF_JMP32;
 }
 
-multiclass J<SBFJumpOp Opc, string Mnemonic, string OpcodeStr, PatLeaf Cond,
-             PatLeaf Cond32> {
-  def _rr : JMP_RR<Opc, Mnemonic, OpcodeStr, Cond>;
-  def _ri : JMP_RI<Opc, Mnemonic, OpcodeStr, Cond>;
-  def _rr_32 : JMP_RR_32<Opc, Mnemonic, OpcodeStr, Cond32>;
-  def _ri_32 : JMP_RI_32<Opc, Mnemonic, OpcodeStr, Cond32>;
+multiclass J<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond, PatLeaf Cond32> {
+  def _rr : JMP_RR<Opc, Mnemonic, Cond>;
+  def _ri : JMP_RI<Opc, Mnemonic, Cond>;
+  def _rr_32 : JMP_RR_32<Opc, Mnemonic, Cond32>;
+  def _ri_32 : JMP_RI_32<Opc, Mnemonic, Cond32>;
 }
 
 let isBranch = 1, isTerminator = 1, hasDelaySlot=0 in {
 // cmp+goto instructions
-defm JEQ  : J<SBF_JEQ, "jeq", "==",  SBF_CC_EQ, SBF_CC_EQ_32>;
-defm JUGT : J<SBF_JGT, "jgt", ">", SBF_CC_GTU, SBF_CC_GTU_32>;
-defm JUGE : J<SBF_JGE, "jge", ">=", SBF_CC_GEU, SBF_CC_GEU_32>;
-defm JNE  : J<SBF_JNE, "jne", "!=",  SBF_CC_NE, SBF_CC_NE_32>;
-defm JSGT : J<SBF_JSGT, "jsgt",  "s>", SBF_CC_GT, SBF_CC_GT_32>;
-defm JSGE : J<SBF_JSGE, "jsge",  "s>=", SBF_CC_GE, SBF_CC_GE_32>;
-defm JULT : J<SBF_JLT, "jlt", "<", SBF_CC_LTU, SBF_CC_LTU_32>;
-defm JULE : J<SBF_JLE, "jle", "<=", SBF_CC_LEU, SBF_CC_LEU_32>;
-defm JSLT : J<SBF_JSLT, "jslt", "s<", SBF_CC_LT, SBF_CC_LT_32>;
-defm JSLE : J<SBF_JSLE, "jsle", "s<=", SBF_CC_LE, SBF_CC_LE_32>;
+defm JEQ  : J<SBF_JEQ, "jeq", SBF_CC_EQ, SBF_CC_EQ_32>;
+defm JUGT : J<SBF_JGT, "jgt", SBF_CC_GTU, SBF_CC_GTU_32>;
+defm JUGE : J<SBF_JGE, "jge", SBF_CC_GEU, SBF_CC_GEU_32>;
+defm JNE  : J<SBF_JNE, "jne", SBF_CC_NE, SBF_CC_NE_32>;
+defm JSGT : J<SBF_JSGT, "jsgt", SBF_CC_GT, SBF_CC_GT_32>;
+defm JSGE : J<SBF_JSGE, "jsge", SBF_CC_GE, SBF_CC_GE_32>;
+defm JULT : J<SBF_JLT, "jlt", SBF_CC_LTU, SBF_CC_LTU_32>;
+defm JULE : J<SBF_JLE, "jle", SBF_CC_LEU, SBF_CC_LEU_32>;
+defm JSLT : J<SBF_JSLT, "jslt", SBF_CC_LT, SBF_CC_LT_32>;
+defm JSLE : J<SBF_JSLE, "jsle", SBF_CC_LE, SBF_CC_LE_32>;
 }
 
 // ALU instructions
@@ -268,51 +263,46 @@ class ALU_RR<SBFOpClass Class, SBFArithOp Opc,
   let SBFClass = Class;
 }
 
-multiclass ALU<SBFArithOp Opc, string Mnemonic, string OpcodeStr,
-               SDNode OpNode> {
+multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode> {
   def _rr : ALU_RR<SBF_ALU64, Opc,
                    (outs GPR:$dst),
                    (ins GPR:$src2, GPR:$src),
-                   "{?!?" # Mnemonic # "64 $dst, $src" #
-                   "!$dst " # OpcodeStr # " $src}",
+                   Mnemonic # "64 $dst, $src",
                    [(set GPR:$dst, (OpNode i64:$src2, i64:$src))]>;
   def _ri : ALU_RI<SBF_ALU64, Opc,
                    (outs GPR:$dst),
                    (ins GPR:$src2, i64imm:$imm),
-                   "{?!?" # Mnemonic # "64 $dst, $imm" #
-                   "!$dst " # OpcodeStr #" $imm}",
+                   Mnemonic # "64 $dst, $imm",
                    [(set GPR:$dst, (OpNode GPR:$src2, i64immSExt32:$imm))]>;
   def _rr_32 : ALU_RR<SBF_ALU, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, GPR32:$src),
-                   "{?!?" # Mnemonic # "32 $dst, $src" #
-                   "!$dst " # OpcodeStr # " $src}",
+                   Mnemonic # "32 $dst, $src",
                    [(set GPR32:$dst, (OpNode i32:$src2, i32:$src))]>;
   def _ri_32 : ALU_RI<SBF_ALU, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, i32imm:$imm),
-                   "{?!?" # Mnemonic # "32 $dst, $imm" #
-                   "!$dst " # OpcodeStr # " $imm}",
+                   Mnemonic # "32 $dst, $imm",
                    [(set GPR32:$dst, (OpNode GPR32:$src2, i32immSExt32:$imm))]>;
 }
 
 let Constraints = "$dst = $src2" in {
     let isAsCheapAsAMove = 1 in {
-        defm ADD : ALU<SBF_ADD, "add", "+=", add>;
-        defm SUB : ALU<SBF_SUB, "sub", "-=", sub>;
-        defm OR  : ALU<SBF_OR, "or", "|=", or>;
-        defm AND : ALU<SBF_AND, "and", "&=", and>;
-        defm SLL : ALU<SBF_LSH, "lsh", "<<=", shl>;
-        defm SRL : ALU<SBF_RSH, "rsh", ">>=", srl>;
-        defm XOR : ALU<SBF_XOR, "xor", "^=", xor>;
-        defm SRA : ALU<SBF_ARSH, "arsh", "s>>=", sra>;
+        defm ADD : ALU<SBF_ADD, "add", add>;
+        defm SUB : ALU<SBF_SUB, "sub", sub>;
+        defm OR  : ALU<SBF_OR, "or", or>;
+        defm AND : ALU<SBF_AND, "and", and>;
+        defm SLL : ALU<SBF_LSH, "lsh", shl>;
+        defm SRL : ALU<SBF_RSH, "rsh", srl>;
+        defm XOR : ALU<SBF_XOR, "xor", xor>;
+        defm SRA : ALU<SBF_ARSH, "arsh", sra>;
     }
 
-    defm MUL : ALU<SBF_MUL, "mul", "*=", mul>;
-    defm DIV : ALU<SBF_DIV, "div", "/=", udiv>;
+    defm MUL : ALU<SBF_MUL, "mul", mul>;
+    defm DIV : ALU<SBF_DIV, "div", udiv>;
 
     let Predicates = [SBFSubtargetSolana] in {
-        defm SDIV : ALU<SBF_SDIV, "sdiv", "s/=", sdiv>;
+        defm SDIV : ALU<SBF_SDIV, "sdiv", sdiv>;
     }
 }
 
@@ -327,19 +317,18 @@ class NEG_RR<SBFOpClass Class, SBFArithOp Opc,
 
 let Constraints = "$dst = $src", isAsCheapAsAMove = 1 in {
   def NEG_64: NEG_RR<SBF_ALU64, SBF_NEG, (outs GPR:$dst), (ins GPR:$src),
-                     "{neg64 $dst|$dst = -$src}",
+                     "neg64 $dst",
                      [(set GPR:$dst, (ineg i64:$src))]>;
   def NEG_32: NEG_RR<SBF_ALU, SBF_NEG, (outs GPR32:$dst), (ins GPR32:$src),
-                     "{neg32 $dst|$dst = -$src}",
+                     "neg32 $dst",
                      [(set GPR32:$dst, (ineg i32:$src))]>;
 }
 
-class LD_IMM64<bits<4> Pseudo, string Mnemonic, string OpcodeStr>
+class LD_IMM64<bits<4> Pseudo, string Mnemonic>
     : TYPE_LD_ST<SBF_IMM.Value, SBF_DW.Value,
                  (outs GPR:$dst),
                  (ins u64imm:$imm),
-                 "{" # Mnemonic # " $dst, $imm" #
-                 "|$dst " # OpcodeStr # " $imm ll}",
+                 Mnemonic # " $dst, $imm",
                  [(set GPR:$dst, (i64 imm:$imm))]> {
 
   bits<4> dst;
@@ -353,26 +342,26 @@ class LD_IMM64<bits<4> Pseudo, string Mnemonic, string OpcodeStr>
 }
 
 let isReMaterializable = 1, isAsCheapAsAMove = 1 in {
-def LD_imm64 : LD_IMM64<0, "lddw", "=">;
+def LD_imm64 : LD_IMM64<0, "lddw">;
 def MOV_rr : ALU_RR<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins GPR:$src),
-                    "{mov64 $dst, $src|$dst = $src}",
+                    "mov64 $dst, $src",
                     []>;
 def MOV_ri : ALU_RI<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins i64imm:$imm),
-                    "{mov64 $dst, $imm|$dst = $imm}",
+                    "mov64 $dst, $imm",
                     [(set GPR:$dst, (i64 i64immSExt32:$imm))]>;
 def MOV_rr_32 : ALU_RR<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins GPR32:$src),
-                    "{mov32 $dst, $src|$dst = $src}",
+                    "mov32 $dst, $src",
                     []>;
 def MOV_ri_32 : ALU_RI<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins i32imm:$imm),
-                    "{mov32 $dst, $imm|$dst = $imm}",
+                    "mov32 $dst, $imm",
                     [(set GPR32:$dst, (i32 i32immSExt32:$imm))]>;
 }
 
@@ -411,13 +400,11 @@ def LD_pseudo
 }
 
 // STORE instructions
-class STORE<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-            list<dag> Pattern>
+class STORE<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$src, MEMri:$addr),
-                 "{" # Mnemonic # " [$addr], $src" #
-                 "|*(" # OpcodeStr # " *)($addr) = $src}",
+                 Mnemonic # " [$addr], $src",
                  Pattern> {
   bits<4> src;
   bits<20> addr;
@@ -428,25 +415,22 @@ class STORE<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
   let SBFClass = SBF_STX;
 }
 
-class STOREi64<SBFWidthModifer Opc, string Mnemonic, string OpcodeStr,
-               PatFrag OpNode>
-    : STORE<Opc, Mnemonic, OpcodeStr, [(OpNode i64:$src, ADDRri:$addr)]>;
+class STOREi64<SBFWidthModifer Opc, string Mnemonic, PatFrag OpNode>
+    : STORE<Opc, Mnemonic, [(OpNode i64:$src, ADDRri:$addr)]>;
 
 let Predicates = [SBFNoALU32] in {
-  def STW : STOREi64<SBF_W, "stxw", "u32", truncstorei32>;
-  def STH : STOREi64<SBF_H, "stxh", "u16", truncstorei16>;
-  def STB : STOREi64<SBF_B, "stxb", "u8", truncstorei8>;
+  def STW : STOREi64<SBF_W, "stxw", truncstorei32>;
+  def STH : STOREi64<SBF_H, "stxh", truncstorei16>;
+  def STB : STOREi64<SBF_B, "stxb", truncstorei8>;
 }
-def STD : STOREi64<SBF_DW, "stxdw", "u64", store>;
+def STD : STOREi64<SBF_DW, "stxdw", store>;
 
 // LOAD instructions
-class LOAD<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-           list<dag> Pattern>
+class LOAD<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr),
-                 "{" # Mnemonic # " $dst, [$addr]" #
-                 "|$dst = *(" # OpcodeStr # " *)($addr)}",
+                 Mnemonic # " $dst, [$addr]",
                  Pattern> {
   bits<4> dst;
   bits<20> addr;
@@ -457,9 +441,8 @@ class LOAD<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
   let SBFClass = SBF_LDX;
 }
 
-class LOADi64<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-              PatFrag OpNode>
-    : LOAD<SizeOp, Mnemonic, OpcodeStr, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
+class LOADi64<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
+    : LOAD<SizeOp, Mnemonic, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
 
 let isCodeGenOnly = 1 in {
   def CORE_MEM : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
@@ -482,20 +465,18 @@ let isCodeGenOnly = 1 in {
 }
 
 let Predicates = [SBFNoALU32] in {
-  def LDW : LOADi64<SBF_W, "ldxw", "u32", zextloadi32>;
-  def LDH : LOADi64<SBF_H, "ldxh", "u16", zextloadi16>;
-  def LDB : LOADi64<SBF_B, "ldxb", "u8", zextloadi8>;
+  def LDW : LOADi64<SBF_W, "ldxw", zextloadi32>;
+  def LDH : LOADi64<SBF_H, "ldxh", zextloadi16>;
+  def LDB : LOADi64<SBF_B, "ldxb", zextloadi8>;
 }
 
-def LDD : LOADi64<SBF_DW, "ldxdw", "u64", load>;
+def LDD : LOADi64<SBF_DW, "ldxdw", load>;
 
-class BRANCH<SBFJumpOp Opc, string Mnemonic, string OpcodeStr,
-             list<dag> Pattern>
+class BRANCH<SBFJumpOp Opc, string Mnemonic, list<dag> Pattern>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
                    (outs),
                    (ins brtarget:$BrDst),
-                   "{" # Mnemonic # " $BrDst" #
-                   "|" # OpcodeStr # " $BrDst}",
+                   Mnemonic # " $BrDst",
                    Pattern> {
   bits<16> BrDst;
 
@@ -529,7 +510,7 @@ class CALLX<string OpcodeStr>
 
 // Jump always
 let isBranch = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1 in {
-  def JMP : BRANCH<SBF_JA, "ja", "goto", [(br bb:$BrDst)]>;
+  def JMP : BRANCH<SBF_JA, "ja", [(br bb:$BrDst)]>;
 }
 
 // Jump and link
@@ -644,13 +625,11 @@ let Predicates = [SBFNoALU32] in {
 }
 
 // Atomic XADD for SBFNoALU32
-class XADD<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-           PatFrag OpNode>
+class XADD<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "{" # Mnemonic # " [$addr], $val" #
-                 "|lock *(" # OpcodeStr # " *)($addr) += $val}",
+                 Mnemonic # " [$addr], $val",
                  [(set GPR:$dst, (OpNode ADDRri:$addr, GPR:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -664,17 +643,16 @@ class XADD<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFNoALU32] in {
-    def XADDW : XADD<SBF_W, "stxxaddw", "u32", atomic_load_add_32>;
+    def XADDW : XADD<SBF_W, "stxxaddw", atomic_load_add_32>;
   }
 }
 
 // Atomic add, and, or, xor
-class ATOMIC_NOFETCH<SBFArithOp Opc, string Mnemonic, string Opstr>
+class ATOMIC_NOFETCH<SBFArithOp Opc, string Mnemonic>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SBF_DW.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "{?!?stxx" # Mnemonic # "dw [$addr], $val" #
-                 "!lock *(u64 *)($addr) " # Opstr # "= $val}",
+                 "stxx" # Mnemonic # "dw [$addr], $val",
                  []> {
   bits<4> dst;
   bits<20> addr;
@@ -686,12 +664,11 @@ class ATOMIC_NOFETCH<SBFArithOp Opc, string Mnemonic, string Opstr>
   let SBFClass = SBF_STX;
 }
 
-class ATOMIC32_NOFETCH<SBFArithOp Opc, string Mnemonic, string Opstr>
+class ATOMIC32_NOFETCH<SBFArithOp Opc, string Mnemonic>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SBF_W.Value,
                  (outs GPR32:$dst),
                  (ins MEMri:$addr, GPR32:$val),
-                 "{?!?stxx" # Mnemonic # "w [$addr], $val" #
-                 "!lock *(u32 *)($addr) " # Opstr # "= $val}",
+                 "stxx" # Mnemonic # "w [$addr], $val",
                  []> {
   bits<4> dst;
   bits<20> addr;
@@ -705,26 +682,25 @@ class ATOMIC32_NOFETCH<SBFArithOp Opc, string Mnemonic, string Opstr>
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-    def XADDW32 : ATOMIC32_NOFETCH<SBF_ADD, "add", "+">;
-    def XANDW32 : ATOMIC32_NOFETCH<SBF_AND, "and", "&">;
-    def XORW32  : ATOMIC32_NOFETCH<SBF_OR, "or", "|">;
-    def XXORW32 : ATOMIC32_NOFETCH<SBF_XOR, "xor", "^">;
+    def XADDW32 : ATOMIC32_NOFETCH<SBF_ADD, "add">;
+    def XANDW32 : ATOMIC32_NOFETCH<SBF_AND, "and">;
+    def XORW32  : ATOMIC32_NOFETCH<SBF_OR, "or">;
+    def XXORW32 : ATOMIC32_NOFETCH<SBF_XOR, "xor">;
   }
 
-  def XADDD  : ATOMIC_NOFETCH<SBF_ADD, "add", "+">;
-  def XANDD  : ATOMIC_NOFETCH<SBF_AND, "and", "&">;
-  def XORD   : ATOMIC_NOFETCH<SBF_OR, "or", "|">;
-  def XXORD  : ATOMIC_NOFETCH<SBF_XOR,"xor",  "^">;
+  def XADDD  : ATOMIC_NOFETCH<SBF_ADD, "add">;
+  def XANDD  : ATOMIC_NOFETCH<SBF_AND, "and">;
+  def XORD   : ATOMIC_NOFETCH<SBF_OR, "or">;
+  def XXORD  : ATOMIC_NOFETCH<SBF_XOR,"xor">;
 }
 
 // Atomic Fetch-and-<add, and, or, xor> operations
-class XFALU64<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
-              string OpcStr, PatFrag OpNode>
+class XFALU64<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcStr,
+              PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "{stxxf" # OpcStr # "dw [$addr], $val" #
-                 "|$dst = atomic_fetch_" # OpcStr # "((" # OpcodeStr # " *)($addr), $val)}",
+                 "stxxf" # OpcStr # "dw [$addr], $val",
                  [(set GPR:$dst, (OpNode ADDRri:$addr, GPR:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -737,13 +713,12 @@ class XFALU64<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
   let SBFClass = SBF_STX;
 }
 
-class XFALU32<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
-              string OpcStr, PatFrag OpNode>
+class XFALU32<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcStr,
+              PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR32:$dst),
                  (ins MEMri:$addr, GPR32:$val),
-                 "{stxxf" # OpcStr  # "w [$addr], $val" #
-                 "|$dst = atomic_fetch_" # OpcStr # "((" # OpcodeStr # " *)($addr), $val)}",
+                 "stxxf" # OpcStr  # "w [$addr], $val",
                  [(set GPR32:$dst, (OpNode ADDRri:$addr, GPR32:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -758,16 +733,16 @@ class XFALU32<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcodeStr,
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-    def XFADDW32 : XFALU32<SBF_W, SBF_ADD, "u32", "add", atomic_load_add_32>;
-    def XFANDW32 : XFALU32<SBF_W, SBF_AND, "u32", "and", atomic_load_and_32>;
-    def XFORW32  : XFALU32<SBF_W, SBF_OR,  "u32", "or",  atomic_load_or_32>;
-    def XFXORW32 : XFALU32<SBF_W, SBF_XOR, "u32", "xor", atomic_load_xor_32>;
+    def XFADDW32 : XFALU32<SBF_W, SBF_ADD, "add", atomic_load_add_32>;
+    def XFANDW32 : XFALU32<SBF_W, SBF_AND, "and", atomic_load_and_32>;
+    def XFORW32  : XFALU32<SBF_W, SBF_OR,  "or",  atomic_load_or_32>;
+    def XFXORW32 : XFALU32<SBF_W, SBF_XOR, "xor", atomic_load_xor_32>;
   }
 
-  def XFADDD : XFALU64<SBF_DW, SBF_ADD, "u64", "add", atomic_load_add_64>;
-  def XFANDD : XFALU64<SBF_DW, SBF_AND, "u64", "and", atomic_load_and_64>;
-  def XFORD  : XFALU64<SBF_DW, SBF_OR,  "u64", "or",  atomic_load_or_64>;
-  def XFXORD : XFALU64<SBF_DW, SBF_XOR, "u64", "xor", atomic_load_xor_64>;
+  def XFADDD : XFALU64<SBF_DW, SBF_ADD, "add", atomic_load_add_64>;
+  def XFANDD : XFALU64<SBF_DW, SBF_AND, "and", atomic_load_and_64>;
+  def XFORD  : XFALU64<SBF_DW, SBF_OR,  "or",  atomic_load_or_64>;
+  def XFXORD : XFALU64<SBF_DW, SBF_XOR, "xor", atomic_load_xor_64>;
 }
 
 // atomic_load_sub can be represented as a neg followed
@@ -786,12 +761,11 @@ let Predicates = [SBFSubtargetSolana], usesCustomInserter = 1, isCodeGenOnly = 1
 }
 
 // Atomic Exchange
-class XCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+class XCHG<SBFWidthModifer SizeOp, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr, GPR:$val),
-                 "{stxxchgdw [$addr], $val" #
-                 "|$dst = xchg_" # OpcodeStr # "($addr, $val)}",
+                 "stxxchgdw [$addr], $val",
                  [(set GPR:$dst, (OpNode ADDRri:$addr,GPR:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -804,12 +778,11 @@ class XCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
   let SBFClass = SBF_STX;
 }
 
-class XCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+class XCHG32<SBFWidthModifer SizeOp, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs GPR32:$dst),
                  (ins MEMri:$addr, GPR32:$val),
-                 "{stxxchgw [$addr], $val" #
-                 "|$dst = xchg32_" # OpcodeStr # "($addr, $val)}",
+                 "stxxchgw [$addr], $val",
                  [(set GPR32:$dst, (OpNode ADDRri:$addr,GPR32:$val))]> {
   bits<4> dst;
   bits<20> addr;
@@ -824,19 +797,18 @@ class XCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-    def XCHGW32 : XCHG32<SBF_W, "32", atomic_swap_32>;
+    def XCHGW32 : XCHG32<SBF_W, atomic_swap_32>;
   }
 
-  def XCHGD : XCHG<SBF_DW, "64", atomic_swap_64>;
+  def XCHGD : XCHG<SBF_DW, atomic_swap_64>;
 }
 
 // Compare-And-Exchange
-class CMPXCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+class CMPXCHG<SBFWidthModifer SizeOp, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs),
                  (ins MEMri:$addr, GPR:$new),
-                 "{stxcmpxchgdw [$addr], $new" #
-                 "|r0 = cmpxchg_" # OpcodeStr # "($addr, r0, $new)}",
+                 "stxcmpxchgdw [$addr], $new",
                  [(set R0, (OpNode ADDRri:$addr, R0, GPR:$new))]> {
   bits<4> new;
   bits<20> addr;
@@ -849,12 +821,11 @@ class CMPXCHG<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
   let SBFClass = SBF_STX;
 }
 
-class CMPXCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
+class CMPXCHG32<SBFWidthModifer SizeOp, PatFrag OpNode>
     : TYPE_LD_ST<SBF_ATOMIC.Value, SizeOp.Value,
                  (outs),
                  (ins MEMri:$addr, GPR32:$new),
-                 "{stxcmpxchgw [$addr], $new" #
-                 "|w0 = cmpxchg32_" # OpcodeStr # "($addr, w0, $new)}",
+                 "stxcmpxchgw [$addr], $new",
                  [(set W0, (OpNode ADDRri:$addr, W0, GPR32:$new))]> {
   bits<4> new;
   bits<20> addr;
@@ -869,11 +840,11 @@ class CMPXCHG32<SBFWidthModifer SizeOp, string OpcodeStr, PatFrag OpNode>
 
 let Predicates = [SBFHasALU32], Defs = [W0], Uses = [W0],
     DecoderNamespace = "SBFALU32" in {
-  def CMPXCHGW32 : CMPXCHG32<SBF_W, "32", atomic_cmp_swap_32>;
+  def CMPXCHGW32 : CMPXCHG32<SBF_W, atomic_cmp_swap_32>;
 }
 
 let Defs = [R0], Uses = [R0] in {
-  def CMPXCHGD : CMPXCHG<SBF_DW, "64", atomic_cmp_swap_64>;
+  def CMPXCHGD : CMPXCHG<SBF_DW, atomic_cmp_swap_64>;
 }
 
 // bswap16, bswap32, bswap64
@@ -881,8 +852,7 @@ class BSWAP<bits<32> SizeOp, string OpcodeStr, SBFSrcType SrcType, list<dag> Pat
     : TYPE_ALU_JMP<SBF_END.Value, SrcType.Value,
                    (outs GPR:$dst),
                    (ins GPR:$src),
-                   "{" # OpcodeStr # " $src" #
-                   "|$dst = " # OpcodeStr # " $src}",
+                   OpcodeStr # " $src",
                    Pattern> {
   bits<4> dst;
 
@@ -907,13 +877,11 @@ let Constraints = "$dst = $src" in {
 
 let Defs = [R0, R1, R2, R3, R4, R5], Uses = [R6], hasSideEffects = 1,
     hasExtraDefRegAllocReq = 1, hasExtraSrcRegAllocReq = 1, mayLoad = 1 in {
-class LOAD_ABS<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-               Intrinsic OpNode>
+class LOAD_ABS<SBFWidthModifer SizeOp, string Mnemonic, Intrinsic OpNode>
     : TYPE_LD_ST<SBF_ABS.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$skb, i64imm:$imm),
-                 "{" # Mnemonic # " $imm" #
-                 "|r0 = *(" # OpcodeStr # " *)skb[$imm]}",
+                 Mnemonic # " $imm",
                  [(set R0, (OpNode GPR:$skb, i64immSExt32:$imm))]> {
   bits<32> imm;
 
@@ -921,13 +889,11 @@ class LOAD_ABS<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
   let SBFClass = SBF_LD;
 }
 
-class LOAD_IND<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-               Intrinsic OpNode>
+class LOAD_IND<SBFWidthModifer SizeOp, string Mnemonic, Intrinsic OpNode>
     : TYPE_LD_ST<SBF_IND.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$skb, GPR:$val),
-                 "{" # Mnemonic # " $val" #
-                 "|r0 = *(" # OpcodeStr # " *)skb[$val]}",
+                 Mnemonic # " $val",
                  [(set R0, (OpNode GPR:$skb, GPR:$val))]> {
   bits<4> val;
 
@@ -936,18 +902,18 @@ class LOAD_IND<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
 }
 }
 
-def LD_ABS_B : LOAD_ABS<SBF_B, "ldabsb", "u8", int_bpf_load_byte>;
-def LD_ABS_H : LOAD_ABS<SBF_H, "ldabsh", "u16", int_bpf_load_half>;
-def LD_ABS_W : LOAD_ABS<SBF_W, "ldabsw", "u32", int_bpf_load_word>;
+def LD_ABS_B : LOAD_ABS<SBF_B, "ldabsb", int_bpf_load_byte>;
+def LD_ABS_H : LOAD_ABS<SBF_H, "ldabsh", int_bpf_load_half>;
+def LD_ABS_W : LOAD_ABS<SBF_W, "ldabsw", int_bpf_load_word>;
 
-def LD_IND_B : LOAD_IND<SBF_B, "ldindb", "u8", int_bpf_load_byte>;
-def LD_IND_H : LOAD_IND<SBF_H, "ldindh", "u16", int_bpf_load_half>;
-def LD_IND_W : LOAD_IND<SBF_W, "ldindw", "u32", int_bpf_load_word>;
+def LD_IND_B : LOAD_IND<SBF_B, "ldindb", int_bpf_load_byte>;
+def LD_IND_H : LOAD_IND<SBF_H, "ldindh", int_bpf_load_half>;
+def LD_IND_W : LOAD_IND<SBF_W, "ldindw", int_bpf_load_word>;
 
 let isCodeGenOnly = 1 in {
   def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
-                         "{mov32 $dst, $src|$dst = $src}", []>;
+                         "mov32 $dst, $src", []>;
 }
 
 def : Pat<(i64 (sext GPR32:$src)),
@@ -963,13 +929,11 @@ def : Pat<(i32 (trunc GPR:$src)),
 def : Pat<(i64 (anyext GPR32:$src)),
           (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>;
 
-class STORE32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-              list<dag> Pattern>
+class STORE32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins GPR32:$src, MEMri:$addr),
-                 "{" # Mnemonic # " [$addr], $src" #
-                 "|*("#OpcodeStr#" *)($addr) = $src}",
+                 Mnemonic # " [$addr], $src",
                  Pattern> {
   bits<4> src;
   bits<20> addr;
@@ -980,23 +944,20 @@ class STORE32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
   let SBFClass = SBF_STX;
 }
 
-class STOREi32<SBFWidthModifer Opc, string Mnemonic, string OpcodeStr,
-               PatFrag OpNode>
-    : STORE32<Opc, Mnemonic, OpcodeStr, [(OpNode i32:$src, ADDRri:$addr)]>;
+class STOREi32<SBFWidthModifer Opc, string Mnemonic, PatFrag OpNode>
+    : STORE32<Opc, Mnemonic, [(OpNode i32:$src, ADDRri:$addr)]>;
 
 let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-  def STW32 : STOREi32<SBF_W, "stxw", "u32", store>;
-  def STH32 : STOREi32<SBF_H, "stxh", "u16", truncstorei16>;
-  def STB32 : STOREi32<SBF_B, "stxb", "u8", truncstorei8>;
+  def STW32 : STOREi32<SBF_W, "stxw", store>;
+  def STH32 : STOREi32<SBF_H, "stxh", truncstorei16>;
+  def STB32 : STOREi32<SBF_B, "stxb", truncstorei8>;
 }
 
-class LOAD32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-             list<dag> Pattern>
+class LOAD32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                 (outs GPR32:$dst),
                 (ins MEMri:$addr),
-                 "{" # Mnemonic # " $dst, [$addr]" #
-                "|$dst = *("#OpcodeStr#" *)($addr)}",
+                Mnemonic # " $dst, [$addr]",
                 Pattern> {
   bits<4> dst;
   bits<20> addr;
@@ -1007,14 +968,13 @@ class LOAD32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
   let SBFClass = SBF_LDX;
 }
 
-class LOADi32<SBFWidthModifer SizeOp, string Mnemonic, string OpcodeStr,
-              PatFrag OpNode>
-    : LOAD32<SizeOp, Mnemonic, OpcodeStr, [(set i32:$dst, (OpNode ADDRri:$addr))]>;
+class LOADi32<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
+    : LOAD32<SizeOp, Mnemonic, [(set i32:$dst, (OpNode ADDRri:$addr))]>;
 
 let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-  def LDW32 : LOADi32<SBF_W, "ldxw", "u32", load>;
-  def LDH32 : LOADi32<SBF_H, "ldxh", "u16", zextloadi16>;
-  def LDB32 : LOADi32<SBF_B, "ldxb", "u8", zextloadi8>;
+  def LDW32 : LOADi32<SBF_W, "ldxw", load>;
+  def LDH32 : LOADi32<SBF_H, "ldxh", zextloadi16>;
+  def LDB32 : LOADi32<SBF_B, "ldxb", zextloadi8>;
 }
 
 let Predicates = [SBFHasALU32] in {
diff --git a/llvm/test/CodeGen/SBF/inline_asm.ll b/llvm/test/CodeGen/SBF/inline_asm.ll
deleted file mode 100644
index 7a82c58a32599..0000000000000
--- a/llvm/test/CodeGen/SBF/inline_asm.ll
+++ /dev/null
@@ -1,53 +0,0 @@
-; RUN: llc < %s -march=sbf -verify-machineinstrs --sbf-output-asm-variant=1 | FileCheck %s
-
-; Source code:
-; int g[2];
-;
-; int test(void *ctx) {
-;   int a = 4, b;
-;   unsigned long long c = 333333333333ULL;
-;   asm volatile("r0 = *(u16 *)skb[%0]" : : "i"(2));
-;   asm volatile("r0 = *(u16 *)skb[%0]" : : "r"(a));
-;   asm volatile("%0 = %1" : "=r"(b) : "i"(4));
-;   asm volatile("%0 = %1 ll" : "=r"(b) : "i"(c));
-;   asm volatile("%0 = *(u16 *) %1" : "=r"(b) : "m"(a));
-;   asm volatile("%0 = *(u32 *) %1" : "=r"(b) : "m"(g[1]));
-;   return b;
-; }
-;
-
-@g = common global [2 x i32] zeroinitializer, align 4
-
-; Function Attrs: nounwind
-define i32 @test(i8* nocapture readnone %ctx) local_unnamed_addr #0 {
-entry:
-  %a = alloca i32, align 4
-  %0 = bitcast i32* %a to i8*
-  call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %0) #2
-  store i32 4, i32* %a, align 4
-  tail call void asm sideeffect ".syntax_old r0 = *(u16 *)skb[$0]", "i"(i32 2) #2
-; CHECK: r0 = *(u16 *)skb[2]
-  tail call void asm sideeffect ".syntax_old r0 = *(u16 *)skb[$0]", "r"(i32 4) #2
-; CHECK: r0 = *(u16 *)skb[r1]
-  %1 = tail call i32 asm sideeffect ".syntax_old $0 = $1", "=r,i"(i32 4) #2
-; CHECK: r1 = 4
-  %2 = tail call i32 asm sideeffect ".syntax_old $0 = $1 ll", "=r,i"(i64 333333333333) #2
-; CHECK: r1 = 333333333333 ll
-  %3 = call i32 asm sideeffect ".syntax_old $0 = *(u16 *) $1", "=r,*m"(i32* elementtype(i32) nonnull %a) #2
-; CHECK: r1 = *(u16 *)(r10 - 4)
-  %4 = call i32 asm sideeffect ".syntax_old $0 = *(u32 *) $1", "=r,*m"(i32* elementtype(i32) getelementptr inbounds ([2 x i32], [2 x i32]* @g, i64 0, i64 1)) #2
-; CHECK: r1 = g ll
-; CHECK: r0 = *(u32 *)(r1 + 4)
-  call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %0) #2
-  ret i32 %4
-}
-
-; Function Attrs: argmemonly nounwind
-declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) #1
-
-; Function Attrs: argmemonly nounwind
-declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
-
-attributes #0 = { nounwind }
-attributes #1 = { argmemonly nounwind }
-attributes #2 = { nounwind }
diff --git a/llvm/test/CodeGen/SBF/inlineasm-wreg.ll b/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
index 09782f47dcb1d..6a3840a68f3d4 100644
--- a/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
+++ b/llvm/test/CodeGen/SBF/inlineasm-wreg.ll
@@ -1,17 +1,17 @@
-; RUN: llc < %s -march=sbf -mattr=+alu32 --sbf-output-asm-variant=1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
 
 ; Test that %w works as input constraint
 ; CHECK-LABEL: test_inlineasm_w_input_constraint
 define dso_local i32 @test_inlineasm_w_input_constraint() {
-  tail call void asm sideeffect ".syntax_old w0 = $0", "w"(i32 42)
-; CHECK: w0 = w1
+  tail call void asm sideeffect "mov32 w0, $0", "w"(i32 42)
+; CHECK: mov32 w0, w1
   ret i32 42
 }
 
 ; Test that %w works as output constraint
 ; CHECK-LABEL: test_inlineasm_w_output_constraint
 define dso_local i32 @test_inlineasm_w_output_constraint() {
-  %1 = tail call i32 asm sideeffect ".syntax_old $0 = $1", "=w,i"(i32 42)
-; CHECK: w0 = 42
+  %1 = tail call i32 asm sideeffect "mov32 $0, $1", "=w,i"(i32 42)
+; CHECK: mov32 w0, 42
   ret i32 %1
 }
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
index b70c389be29a8..148512dda5727 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
@@ -1,329 +1,253 @@
 # RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
 # RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
-# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
-# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK-OLD
 
 # TODO: Test immediate field ranges and some hex immediates.
 
 # CHECK-NEW: add64 r0, r9
-# CHECK-OLD: r0 += r9
 0x0f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: add64 r3, r2
-# CHECK-OLD: r3 += r2
 0x0f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: add64 r3, 123 
-# CHECK-OLD: r3 += 123 
 0x07,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: add64 r5, -123 
-# CHECK-OLD: r5 += -123 
 0x07,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: add32 w6, w2
-# CHECK-OLD: w6 += w2
 0x0c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: add32 w5, -123 
-# CHECK-OLD: w5 += -123 
 0x04,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: sub64 r0, r9
-# CHECK-OLD: r0 -= r9
 0x1f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: sub64 r3, r2
-# CHECK-OLD: r3 -= r2
 0x1f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: sub64 r3, 123 
-# CHECK-OLD: r3 -= 123 
 0x17,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: sub64 r5, -123 
-# CHECK-OLD: r5 -= -123 
 0x17,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: sub32 w6, w2
-# CHECK-OLD: w6 -= w2
 0x1c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: sub32 w5, -123 
-# CHECK-OLD: w5 -= -123 
 0x14,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: mul64 r0, r9
-# CHECK-OLD: r0 *= r9
 0x2f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: mul64 r3, r2
-# CHECK-OLD: r3 *= r2
 0x2f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: mul64 r3, 123 
-# CHECK-OLD: r3 *= 123 
 0x27,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: mul64 r5, -123 
-# CHECK-OLD: r5 *= -123 
 0x27,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: mul32 w6, w2
-# CHECK-OLD: w6 *= w2
 0x2c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: mul32 w5, -123 
-# CHECK-OLD: w5 *= -123 
 0x24,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: div64 r0, r9
-# CHECK-OLD: r0 /= r9
 0x3f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: div64 r3, r2
-# CHECK-OLD: r3 /= r2
 0x3f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: div64 r3, 123 
-# CHECK-OLD: r3 /= 123 
 0x37,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: div64 r5, -123 
-# CHECK-OLD: r5 /= -123 
 0x37,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: div32 w6, w2
-# CHECK-OLD: w6 /= w2
 0x3c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: div32 w5, -123 
-# CHECK-OLD: w5 /= -123 
 0x34,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: sdiv64 r0, r9
-# CHECK-OLD: r0 s/= r9
 0xef,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: sdiv64 r3, r2
-# CHECK-OLD: r3 s/= r2
 0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: sdiv64 r3, 123 
-# CHECK-OLD: r3 s/= 123 
 0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: sdiv64 r5, -123 
-# CHECK-OLD: r5 s/= -123 
 0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: sdiv32 w6, w2
-# CHECK-OLD: w6 s/= w2
 0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: sdiv32 w5, -123 
-# CHECK-OLD: w5 s/= -123 
 0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: or64 r0, r9
-# CHECK-OLD: r0 |= r9
 0x4f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: or64 r3, r2
-# CHECK-OLD: r3 |= r2
 0x4f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: or64 r3, 123 
-# CHECK-OLD: r3 |= 123 
 0x47,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: or64 r5, -123 
-# CHECK-OLD: r5 |= -123 
 0x47,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: or32 w6, w2
-# CHECK-OLD: w6 |= w2
 0x4c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: or32 w5, -123 
-# CHECK-OLD: w5 |= -123 
 0x44,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: and64 r0, r9
-# CHECK-OLD: r0 &= r9
 0x5f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: and64 r3, r2
-# CHECK-OLD: r3 &= r2
 0x5f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: and64 r3, 123 
-# CHECK-OLD: r3 &= 123 
 0x57,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: and64 r5, -123 
-# CHECK-OLD: r5 &= -123 
 0x57,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: and32 w6, w2
-# CHECK-OLD: w6 &= w2
 0x5c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: and32 w5, -123 
-# CHECK-OLD: w5 &= -123 
 0x54,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: xor64 r0, r9
-# CHECK-OLD: r0 ^= r9
 0xaf,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: xor64 r3, r2
-# CHECK-OLD: r3 ^= r2
 0xaf,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: xor64 r3, 123 
-# CHECK-OLD: r3 ^= 123 
 0xa7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: xor64 r5, -123 
-# CHECK-OLD: r5 ^= -123 
 0xa7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: xor32 w6, w2
-# CHECK-OLD: w6 ^= w2
 0xac,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: xor32 w5, -123 
-# CHECK-OLD: w5 ^= -123 
 0xa4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: lsh64 r0, r9
-# CHECK-OLD: r0 <<= r9
 0x6f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: lsh64 r3, r2
-# CHECK-OLD: r3 <<= r2
 0x6f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: lsh64 r3, 123 
-# CHECK-OLD: r3 <<= 123 
 0x67,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: lsh64 r5, -123 
-# CHECK-OLD: r5 <<= -123 
 0x67,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: lsh32 w6, w2
-# CHECK-OLD: w6 <<= w2
 0x6c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: lsh32 w5, -123 
-# CHECK-OLD: w5 <<= -123 
 0x64,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: rsh64 r0, r9
-# CHECK-OLD: r0 >>= r9
 0x7f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: rsh64 r3, r2
-# CHECK-OLD: r3 >>= r2
 0x7f,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: rsh64 r3, 123 
-# CHECK-OLD: r3 >>= 123 
 0x77,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: rsh64 r5, -123 
-# CHECK-OLD: r5 >>= -123 
 0x77,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: rsh32 w6, w2
-# CHECK-OLD: w6 >>= w2
 0x7c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: rsh32 w5, -123 
-# CHECK-OLD: w5 >>= -123 
 0x74,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 
 # CHECK-NEW: arsh64 r0, r9
-# CHECK-OLD: r0 s>>= r9
 0xcf,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: arsh64 r3, r2
-# CHECK-OLD: r3 s>>= r2
 0xcf,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: arsh64 r3, 123 
-# CHECK-OLD: r3 s>>= 123 
 0xc7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: arsh64 r5, -123 
-# CHECK-OLD: r5 s>>= -123 
 0xc7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: arsh32 w6, w2
-# CHECK-OLD: w6 s>>= w2
 0xcc,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: arsh32 w5, -123 
-# CHECK-OLD: w5 s>>= -123 
 0xc4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
 
 # CHECK-NEW: neg64 r9
-# CHECK-OLD: r9 = -r9
 0x87,0x09,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: neg32 w6
-# CHECK-OLD: w6 = -w6
 0x84,0x06,0x00,0x00,0x00,0x00,0x00,0x00
 
 
 
 # CHECK-NEW: mov64 r0, r9
-# CHECK-OLD: r0 = r9
 0xbf,0x90,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: mov64 r3, r2
-# CHECK-OLD: r3 = r2
 0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: mov64 r3, 123 
-# CHECK-OLD: r3 = 123 
 0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
 
 # CHECK-NEW: mov64 r5, -123 
-# CHECK-OLD: r5 = -123 
 0xb7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 # CHECK-NEW: mov32 w6, w2
-# CHECK-OLD: w6 = w2
 0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK-NEW: mov32 w5, -123 
-# CHECK-OLD: w5 = -123 
 0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
@@ -334,12 +258,6 @@
 # CHECK-NEW: be16 r0
 # CHECK-NEW: be32 r1
 # CHECK-NEW: be64 r2
-# CHECK-OLD: r3 = le16 r3
-# CHECK-OLD: r4 = le32 r4
-# CHECK-OLD: r5 = le64 r5
-# CHECK-OLD: r0 = be16 r0
-# CHECK-OLD: r1 = be32 r1
-# CHECK-OLD: r2 = be64 r2
 0xd4,0x03,0x00,0x00,0x10,0x00,0x00,0x00
 0xd4,0x04,0x00,0x00,0x20,0x00,0x00,0x00
 0xd4,0x05,0x00,0x00,0x40,0x00,0x00,0x00
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
index 95ebdc74a8580..c3852b1ddef07 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
@@ -1,7 +1,5 @@
 # RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
 # RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
-# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
-# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK-OLD
 
 # TODO: Test immediate field ranges.
 
@@ -24,16 +22,6 @@
 # CHECK-NEW: jsge r0, r9, +1
 # CHECK-NEW: jslt r0, r9, +1
 # CHECK-NEW: jsle r0, r9, +1
-# CHECK-OLD: if r0 == r9 goto +1
-# CHECK-OLD: if r0 != r9 goto +1
-# CHECK-OLD: if r0 > r9 goto +1
-# CHECK-OLD: if r0 >= r9 goto +1
-# CHECK-OLD: if r0 < r9 goto +1
-# CHECK-OLD: if r0 <= r9 goto +1
-# CHECK-OLD: if r0 s> r9 goto +1
-# CHECK-OLD: if r0 s>= r9 goto +1
-# CHECK-OLD: if r0 s< r9 goto +1
-# CHECK-OLD: if r0 s<= r9 goto +1
 0x1d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
 0x5d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
 0x2d,0x90,0x01,0x00,0x00,0x00,0x00,0x00
@@ -55,16 +43,6 @@
 # CHECK-NEW: jsge r3, r2, +1
 # CHECK-NEW: jslt r3, r2, +1
 # CHECK-NEW: jsle r3, r2, +1
-# CHECK-OLD: if r3 == r2 goto +1
-# CHECK-OLD: if r3 != r2 goto +1
-# CHECK-OLD: if r3 > r2 goto +1
-# CHECK-OLD: if r3 >= r2 goto +1
-# CHECK-OLD: if r3 < r2 goto +1
-# CHECK-OLD: if r3 <= r2 goto +1
-# CHECK-OLD: if r3 s> r2 goto +1
-# CHECK-OLD: if r3 s>= r2 goto +1
-# CHECK-OLD: if r3 s< r2 goto +1
-# CHECK-OLD: if r3 s<= r2 goto +1
 0x1d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
 0x5d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
 0x2d,0x23,0x01,0x00,0x00,0x00,0x00,0x00
@@ -86,16 +64,6 @@
 # CHECK-NEW: jsge r3, 123, +8
 # CHECK-NEW: jslt r3, 123, +8
 # CHECK-NEW: jsle r3, 123, +8
-# CHECK-OLD: if r3 == 123 goto +8
-# CHECK-OLD: if r3 != 123 goto +8
-# CHECK-OLD: if r3 > 123 goto +8
-# CHECK-OLD: if r3 >= 123 goto +8
-# CHECK-OLD: if r3 < 123 goto +8
-# CHECK-OLD: if r3 <= 123 goto +8
-# CHECK-OLD: if r3 s> 123 goto +8
-# CHECK-OLD: if r3 s>= 123 goto +8
-# CHECK-OLD: if r3 s< 123 goto +8
-# CHECK-OLD: if r3 s<= 123 goto +8
 0x15,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
 0x55,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
 0x25,0x03,0x08,0x00,0x7b,0x00,0x00,0x00
@@ -117,16 +85,6 @@
 # CHECK-NEW: jsge r5, -123, +8 
 # CHECK-NEW: jslt r5, -123, +8 
 # CHECK-NEW: jsle r5, -123, +8 
-# CHECK-OLD: if r5 == -123 goto +8
-# CHECK-OLD: if r5 != -123 goto +8
-# CHECK-OLD: if r5 > -123 goto +8
-# CHECK-OLD: if r5 >= -123 goto +8
-# CHECK-OLD: if r5 < -123 goto +8
-# CHECK-OLD: if r5 <= -123 goto +8
-# CHECK-OLD: if r5 s> -123 goto +8
-# CHECK-OLD: if r5 s>= -123 goto +8
-# CHECK-OLD: if r5 s< -123 goto +8
-# CHECK-OLD: if r5 s<= -123 goto +8
 0x15,0x05,0x08,0x00,0x85,0xff,0xff,0xff
 0x55,0x05,0x08,0x00,0x85,0xff,0xff,0xff
 0x25,0x05,0x08,0x00,0x85,0xff,0xff,0xff
@@ -148,16 +106,6 @@
 # CHECK-NEW: jsge w6, w2, +8
 # CHECK-NEW: jslt w6, w2, +8
 # CHECK-NEW: jsle w6, w2, +8
-# CHECK-OLD: if w6 == w2 goto +8
-# CHECK-OLD: if w6 != w2 goto +8
-# CHECK-OLD: if w6 > w2 goto +8
-# CHECK-OLD: if w6 >= w2 goto +8
-# CHECK-OLD: if w6 < w2 goto +8
-# CHECK-OLD: if w6 <= w2 goto +8
-# CHECK-OLD: if w6 s> w2 goto +8
-# CHECK-OLD: if w6 s>= w2 goto +8
-# CHECK-OLD: if w6 s< w2 goto +8
-# CHECK-OLD: if w6 s<= w2 goto +8
 0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
 0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
 0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
@@ -179,12 +127,6 @@
 # CHECK-NEW: jsge w5, -123, +8
 # CHECK-NEW: jslt w5, -123, +8
 # CHECK-NEW: jsle w5, -123, +8
-# CHECK-OLD: if w5 == -123 goto +8
-# CHECK-OLD: if w5 != -123 goto +8
-# CHECK-OLD: if w5 s> -123 goto +8
-# CHECK-OLD: if w5 s>= -123 goto +8
-# CHECK-OLD: if w5 s< -123 goto +8
-# CHECK-OLD: if w5 s<= -123 goto +8
 0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff
 0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff
 0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff
@@ -198,13 +140,10 @@
 
 
 # CHECK-NEW: call 8
-# CHECK-OLD: call 8
 0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00
 
 # CHECK-NEW: callx r4
-# CHECK-OLD: callx r4
 0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00
 
 # CHECK-NEW: exit
-# CHECK-OLD: exit
 0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
index 3257416ce0061..ddf5818119076 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
@@ -1,20 +1,13 @@
 # RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
 # RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
-# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
-# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK-OLD
 # RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+alu32 \
 # RUN:                          | FileCheck %s --check-prefix=CHECK32-NEW
-# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+alu32 \
-# RUN:   --output-asm-variant=1 | FileCheck %s --check-prefix=CHECK32-OLD
 
 # TODO: Test immediate field ranges and some hex immediates.
 
 # CHECK-NEW: lddw r7, 32768
 # CHECK-NEW: lddw r0, 9151314442816847872
 # CHECK-NEW: lddw r1, -1
-# CHECK-OLD: r7 = 32768 ll
-# CHECK-OLD: r0 = 9151314442816847872 ll
-# CHECK-OLD: r1 = -1 ll
 0x18,0x07,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f
 0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff
@@ -26,11 +19,6 @@
 # CHECK-NEW: ldxh r8, [r2 + 32]
 # CHECK-NEW: ldxw r4, [r3 + 64]
 # CHECK-NEW: ldxdw r0, [r4 + 128]
-# CHECK-OLD: r6 = *(u8 *)(r1 + 17)
-# CHECK-OLD: r1 = *(u8 *)(r10 - 3)
-# CHECK-OLD: r8 = *(u16 *)(r2 + 32)
-# CHECK-OLD: r4 = *(u32 *)(r3 + 64)
-# CHECK-OLD: r0 = *(u64 *)(r4 + 128)
 0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00
 0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00
 0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00
@@ -43,10 +31,6 @@
 # CHECK32-NEW: ldxb w1, [r10 - 3]
 # CHECK32-NEW: ldxh w8, [r2 + 32]
 # CHECK32-NEW: ldxw w4, [r3 + 64]
-# CHECK32-OLD: w6 = *(u8 *)(r1 + 17)
-# CHECK32-OLD: w1 = *(u8 *)(r10 - 3)
-# CHECK32-OLD: w8 = *(u16 *)(r2 + 32)
-# CHECK32-OLD: w4 = *(u32 *)(r3 + 64)
 0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00
 0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00
 0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00
@@ -59,11 +43,6 @@
 # CHECK-NEW: stxh [r2 + 32], r8
 # CHECK-NEW: stxw [r3 + 64], r4
 # CHECK-NEW: stxdw [r4 + 128], r0
-# CHECK-OLD: *(u8 *)(r1 + 17) = r6
-# CHECK-OLD: *(u8 *)(r10 - 3) = r1
-# CHECK-OLD: *(u16 *)(r2 + 32) = r8
-# CHECK-OLD: *(u32 *)(r3 + 64) = r4
-# CHECK-OLD: *(u64 *)(r4 + 128) = r0
 0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00
 0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00
 0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00
@@ -76,10 +55,6 @@
 # CHECK32-NEW: stxb [r10 - 3], w1
 # CHECK32-NEW: stxh [r2 + 32], w8
 # CHECK32-NEW: stxw [r3 + 64], w4
-# CHECK32-OLD: *(u8 *)(r1 + 17) = w6
-# CHECK32-OLD: *(u8 *)(r10 - 3) = w1
-# CHECK32-OLD: *(u16 *)(r2 + 32) = w8
-# CHECK32-OLD: *(u32 *)(r3 + 64) = w4
 0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00
 0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00
 0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00
@@ -88,7 +63,6 @@
 
 # XADDW (NoALU32).
 # CHECK-NEW: stxxaddw [r8 + 4], r2 
-# CHECK-OLD: lock *(u32 *)(r8 + 4) += r2
 0xc3,0x28,0x04,0x00,0x00,0x00,0x00,0x00
 
 
@@ -98,10 +72,6 @@
 # CHECK-NEW: stxxanddw [r8 - 32], r1
 # CHECK-NEW: stxxordw [r8 - 64], r2
 # CHECK-NEW: stxxxordw [r8 - 128], r3
-# CHECK-OLD: lock *(u64 *)(r8 - 16) += r0
-# CHECK-OLD: lock *(u64 *)(r8 - 32) &= r1
-# CHECK-OLD: lock *(u64 *)(r8 - 64) |= r2
-# CHECK-OLD: lock *(u64 *)(r8 - 128) ^= r3
 0xdb,0x08,0xf0,0xff,0x00,0x00,0x00,0x00
 0xdb,0x18,0xe0,0xff,0x50,0x00,0x00,0x00
 0xdb,0x28,0xc0,0xff,0x40,0x00,0x00,0x00
@@ -114,10 +84,6 @@
 # CHECK32-NEW: stxxandw [r8 - 32], w5
 # CHECK32-NEW: stxxorw [r8 - 64], w6
 # CHECK32-NEW: stxxxorw [r8 - 128], w7
-# CHECK32-OLD: lock *(u32 *)(r8 - 16) += w4
-# CHECK32-OLD: lock *(u32 *)(r8 - 32) &= w5
-# CHECK32-OLD: lock *(u32 *)(r8 - 64) |= w6
-# CHECK32-OLD: lock *(u32 *)(r8 - 128) ^= w7
 0xc3,0x48,0xf0,0xff,0x00,0x00,0x00,0x00
 0xc3,0x58,0xe0,0xff,0x50,0x00,0x00,0x00
 0xc3,0x68,0xc0,0xff,0x40,0x00,0x00,0x00
@@ -130,10 +96,6 @@
 # CHECK-NEW: stxxfanddw [r8 - 32], r1
 # CHECK-NEW: stxxfordw [r8 - 64], r2
 # CHECK-NEW: stxxfxordw [r8 - 128], r3
-# CHECK-OLD: r0 = atomic_fetch_add((u64 *)(r8 - 16), r0)
-# CHECK-OLD: r1 = atomic_fetch_and((u64 *)(r8 - 32), r1)
-# CHECK-OLD: r2 = atomic_fetch_or((u64 *)(r8 - 64), r2)
-# CHECK-OLD: r3 = atomic_fetch_xor((u64 *)(r8 - 128), r3)
 0xdb,0x08,0xf0,0xff,0x01,0x00,0x00,0x00
 0xdb,0x18,0xe0,0xff,0x51,0x00,0x00,0x00
 0xdb,0x28,0xc0,0xff,0x41,0x00,0x00,0x00
@@ -146,10 +108,6 @@
 # CHECK32-NEW: stxxfandw [r8 - 32], w1
 # CHECK32-NEW: stxxforw [r8 - 64], w2
 # CHECK32-NEW: stxxfxorw [r8 - 128], w3
-# CHECK32-OLD: w0 = atomic_fetch_add((u32 *)(r8 - 16), w0)
-# CHECK32-OLD: w1 = atomic_fetch_and((u32 *)(r8 - 32), w1)
-# CHECK32-OLD: w2 = atomic_fetch_or((u32 *)(r8 - 64), w2)
-# CHECK32-OLD: w3 = atomic_fetch_xor((u32 *)(r8 - 128), w3)
 0xc3,0x08,0xf0,0xff,0x01,0x00,0x00,0x00
 0xc3,0x18,0xe0,0xff,0x51,0x00,0x00,0x00
 0xc3,0x28,0xc0,0xff,0x41,0x00,0x00,0x00
@@ -159,9 +117,7 @@
 
 # XCHGD, XCHGW32
 # CHECK-NEW: stxxchgdw [r8 - 16], r7
-# CHECK-OLD: r7 = xchg_64(r8 - 16, r7)
 # CHECK32-NEW: stxxchgw [r8 - 16], w0
-# CHECK32-OLD: w0 = xchg32_32(r8 - 16, w0)
 0xdb,0x78,0xf0,0xff,0xe1,0x00,0x00,0x00
 0xc3,0x08,0xf0,0xff,0xe1,0x00,0x00,0x00
 
@@ -169,9 +125,7 @@
 
 # CMPXCHGD, CMPXCHGW32
 # CHECK-NEW: stxcmpxchgdw [r8 - 16], r5
-# CHECK-OLD: r0 = cmpxchg_64(r8 - 16, r0, r5) 
 # CHECK32-NEW: stxcmpxchgw [r8 - 16], w5
-# CHECK32-OLD: w0 = cmpxchg32_32(r8 - 16, w0, w5)
 0xdb,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00
 0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00
 
@@ -184,12 +138,6 @@
 # CHECK-NEW: ldindb r5
 # CHECK-NEW: ldindh r9
 # CHECK-NEW: ldindw r7
-# CHECK-OLD: r0 = *(u8 *)skb[64]
-# CHECK-OLD: r0 = *(u16 *)skb[128]
-# CHECK-OLD: r0 = *(u32 *)skb[0]
-# CHECK-OLD: r0 = *(u8 *)skb[r5]
-# CHECK-OLD: r0 = *(u16 *)skb[r9]
-# CHECK-OLD: r0 = *(u32 *)skb[r7]
 0x30,0x00,0x00,0x00,0x40,0x00,0x00,0x00
 0x28,0x00,0x00,0x00,0x80,0x00,0x00,0x00
 0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index 12b7555c053d3..198b4dcae7955 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -1,105 +1,103 @@
 # RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
-# RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck %s
-
-.syntax_old
+# RUN: llvm-objdump  -d -r %t | FileCheck %s
+# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck %s
 
 // ======== BPF_ALU Class ========
-  w1 = -w1    // BPF_NEG
-  w0 += w1    // BPF_ADD  | BPF_X
-  w1 -= w2    // BPF_SUB  | BPF_X
-  w2 *= w3    // BPF_MUL  | BPF_X
-  w3 /= w4    // BPF_DIV  | BPF_X
-// CHECK: 84 01 00 00 00 00 00 00      w1 = -w1
-// CHECK: 0c 10 00 00 00 00 00 00      w0 += w1
-// CHECK: 1c 21 00 00 00 00 00 00      w1 -= w2
-// CHECK: 2c 32 00 00 00 00 00 00      w2 *= w3
-// CHECK: 3c 43 00 00 00 00 00 00      w3 /= w4
+  neg32 w1    // BPF_NEG
+  add32 w0, w1    // BPF_ADD  | BPF_X
+  sub32 w1, w2    // BPF_SUB  | BPF_X
+  mul32 w2, w3    // BPF_MUL  | BPF_X
+  div32 w3, w4    // BPF_DIV  | BPF_X
+// CHECK: 84 01 00 00 00 00 00 00      neg32 w1
+// CHECK: 0c 10 00 00 00 00 00 00      add32 w0, w1
+// CHECK: 1c 21 00 00 00 00 00 00      sub32 w1, w2
+// CHECK: 2c 32 00 00 00 00 00 00      mul32 w2, w3
+// CHECK: 3c 43 00 00 00 00 00 00      div32 w3, w4
 
-  w4 |= w5    // BPF_OR   | BPF_X
-  w5 &= w6    // BPF_AND  | BPF_X
-  w6 <<= w7   // BPF_LSH  | BPF_X
-  w7 >>= w8   // BPF_RSH  | BPF_X
-  w8 ^= w9    // BPF_XOR  | BPF_X
-  w9 = w10    // BPF_MOV  | BPF_X
-  w10 s>>= w0 // BPF_ARSH | BPF_X
-// CHECK: 4c 54 00 00 00 00 00 00      w4 |= w5
-// CHECK: 5c 65 00 00 00 00 00 00      w5 &= w6
-// CHECK: 6c 76 00 00 00 00 00 00      w6 <<= w7
-// CHECK: 7c 87 00 00 00 00 00 00      w7 >>= w8
-// CHECK: ac 98 00 00 00 00 00 00      w8 ^= w9
-// CHECK: bc a9 00 00 00 00 00 00      w9 = w10
-// CHECK: cc 0a 00 00 00 00 00 00      w10 s>>= w0
+  or32 w4, w5     // BPF_OR   | BPF_X
+  and32 w5, w6    // BPF_AND  | BPF_X
+  lsh32 w6, w7    // BPF_LSH  | BPF_X
+  rsh32 w7, w8    // BPF_RSH  | BPF_X
+  xor32 w8, w9    // BPF_XOR  | BPF_X
+  mov32 w9, w10   // BPF_MOV  | BPF_X
+  arsh32 w10, w0  // BPF_ARSH | BPF_X
+// CHECK: 4c 54 00 00 00 00 00 00      or32 w4, w5
+// CHECK: 5c 65 00 00 00 00 00 00      and32 w5, w6
+// CHECK: 6c 76 00 00 00 00 00 00      lsh32 w6, w7
+// CHECK: 7c 87 00 00 00 00 00 00      rsh32 w7, w8
+// CHECK: ac 98 00 00 00 00 00 00      xor32 w8, w9
+// CHECK: bc a9 00 00 00 00 00 00      mov32 w9, w10
+// CHECK: cc 0a 00 00 00 00 00 00      arsh32 w10, w0
 
-  w0 += 1           // BPF_ADD  | BPF_K
-  w1 -= 0x1         // BPF_SUB  | BPF_K
-  w2 *= -4          // BPF_MUL  | BPF_K
-  w3 /= 5           // BPF_DIV  | BPF_K
-// CHECK: 04 00 00 00 01 00 00 00      w0 += 0x1
-// CHECK: 14 01 00 00 01 00 00 00      w1 -= 0x1
-// CHECK: 24 02 00 00 fc ff ff ff      w2 *= -0x4
-// CHECK: 34 03 00 00 05 00 00 00      w3 /= 0x5
+  add32 w0, 1           // BPF_ADD  | BPF_K
+  sub32 w1, 0x1         // BPF_SUB  | BPF_K
+  mul32 w2, -4          // BPF_MUL  | BPF_K
+  div32 w3, 5           // BPF_DIV  | BPF_K
+// CHECK: 04 00 00 00 01 00 00 00      add32 w0, 0x1
+// CHECK: 14 01 00 00 01 00 00 00      sub32 w1, 0x1
+// CHECK: 24 02 00 00 fc ff ff ff      mul32 w2, -0x4
+// CHECK: 34 03 00 00 05 00 00 00      div32 w3, 0x5
 
-  w4 |= 0xff        // BPF_OR   | BPF_K
-  w5 &= 0xFF        // BPF_AND  | BPF_K
-  w6 <<= 63         // BPF_LSH  | BPF_K
-  w7 >>= 32         // BPF_RSH  | BPF_K
-  w8 ^= 0           // BPF_XOR  | BPF_K
-  w9 = 1            // BPF_MOV  | BPF_K
-  w9 = 0xffffffff   // BPF_MOV  | BPF_K
-  w10 s>>= 64       // BPF_ARSH | BPF_K
-// CHECK: 44 04 00 00 ff 00 00 00      w4 |= 0xff
-// CHECK: 54 05 00 00 ff 00 00 00      w5 &= 0xff
-// CHECK: 64 06 00 00 3f 00 00 00      w6 <<= 0x3f
-// CHECK: 74 07 00 00 20 00 00 00      w7 >>= 0x20
-// CHECK: a4 08 00 00 00 00 00 00      w8 ^= 0x0
-// CHECK: b4 09 00 00 01 00 00 00      w9 = 0x1
-// CHECK: b4 09 00 00 ff ff ff ff      w9 = -0x1
-// CHECK: c4 0a 00 00 40 00 00 00      w10 s>>= 0x40
+  or32 w4, 0xff         // BPF_OR   | BPF_K
+  and32 w5, 0xFF        // BPF_AND  | BPF_K
+  lsh32 w6, 63          // BPF_LSH  | BPF_K
+  rsh32 w7, 32          // BPF_RSH  | BPF_K
+  xor32 w8, 0           // BPF_XOR  | BPF_K
+  mov32 w9, 1           // BPF_MOV  | BPF_K
+  mov32 w9, 0xffffffff  // BPF_MOV  | BPF_K
+  arsh32 w10, 64        // BPF_ARSH | BPF_K
+// CHECK: 44 04 00 00 ff 00 00 00      or32 w4, 0xff
+// CHECK: 54 05 00 00 ff 00 00 00      and32 w5, 0xff
+// CHECK: 64 06 00 00 3f 00 00 00      lsh32 w6, 0x3f
+// CHECK: 74 07 00 00 20 00 00 00      rsh32 w7, 0x20
+// CHECK: a4 08 00 00 00 00 00 00      xor32 w8, 0x0
+// CHECK: b4 09 00 00 01 00 00 00      mov32 w9, 0x1
+// CHECK: b4 09 00 00 ff ff ff ff      mov32 w9, -0x1
+// CHECK: c4 0a 00 00 40 00 00 00      arsh32 w10, 0x40
 
-  if w0 == w1 goto Llabel0   // BPF_JEQ  | BPF_X
-  if w3 != w4 goto Llabel0   // BPF_JNE  | BPF_X
-// CHECK: 1e 10 0b 00 00 00 00 00 	if w0 == w1 goto +0xb
-// CHECK: 5e 43 0a 00 00 00 00 00 	if w3 != w4 goto +0xa
+  jeq w0, w1, Llabel0   // BPF_JEQ  | BPF_X
+  jne w3, w4, Llabel0   // BPF_JNE  | BPF_X
+// CHECK: 1e 10 0b 00 00 00 00 00 	jeq w0, w1, +0xb
+// CHECK: 5e 43 0a 00 00 00 00 00 	jne w3, w4, +0xa
 
-  if w1 > w2 goto Llabel0    // BPF_JGT  | BPF_X
-  if w2 >= w3 goto Llabel0   // BPF_JGE  | BPF_X
-  if w4 s> w5 goto Llabel0   // BPF_JSGT | BPF_X
-  if w5 s>= w6 goto Llabel0  // BPF_JSGE | BPF_X
-// CHECK: 2e 21 09 00 00 00 00 00 	if w1 > w2 goto +0x9
-// CHECK: 3e 32 08 00 00 00 00 00 	if w2 >= w3 goto +0x8
-// CHECK: 6e 54 07 00 00 00 00 00 	if w4 s> w5 goto +0x7
-// CHECK: 7e 65 06 00 00 00 00 00 	if w5 s>= w6 goto +0x6
+  jgt w1, w2, Llabel0    // BPF_JGT  | BPF_X
+  jge w2, w3, Llabel0   // BPF_JGE  | BPF_X
+  jsgt w4, w5, Llabel0   // BPF_JSGT | BPF_X
+  jsge w5, w6, Llabel0  // BPF_JSGE | BPF_X
+// CHECK: 2e 21 09 00 00 00 00 00 	jgt w1, w2, +0x9
+// CHECK: 3e 32 08 00 00 00 00 00 	jge w2, w3, +0x8
+// CHECK: 6e 54 07 00 00 00 00 00 	jsgt w4, w5, +0x7
+// CHECK: 7e 65 06 00 00 00 00 00 	jsge w5, w6, +0x6
 
-  if w6 < w7 goto Llabel0    // BPF_JLT  | BPF_X
-  if w7 <= w8 goto Llabel0   // BPF_JLE  | BPF_X
-  if w8 s< w9 goto Llabel0   // BPF_JSLT | BPF_X
-  if w9 s<= w10 goto Llabel0 // BPF_JSLE | BPF_X
-// CHECK: ae 76 05 00 00 00 00 00 	if w6 < w7 goto +0x5
-// CHECK: be 87 04 00 00 00 00 00 	if w7 <= w8 goto +0x4
-// CHECK: ce 98 03 00 00 00 00 00 	if w8 s< w9 goto +0x3
-// CHECK: de a9 02 00 00 00 00 00 	if w9 s<= w10 goto +0x2
+  jlt w6, w7, Llabel0    // BPF_JLT  | BPF_X
+  jle w7, w8, Llabel0   // BPF_JLE  | BPF_X
+  jslt w8, w9, Llabel0   // BPF_JSLT | BPF_X
+  jsle w9, w10, Llabel0 // BPF_JSLE | BPF_X
+// CHECK: ae 76 05 00 00 00 00 00 	jlt w6, w7, +0x5
+// CHECK: be 87 04 00 00 00 00 00 	jle w7, w8, +0x4
+// CHECK: ce 98 03 00 00 00 00 00 	jslt w8, w9, +0x3
+// CHECK: de a9 02 00 00 00 00 00 	jsle w9, w10, +0x2
 
-  if w0 == 0 goto Llabel0           // BPF_JEQ  | BPF_K
-  if w3 != -1 goto Llabel0          // BPF_JNE  | BPF_K
-// CHECK: 16 00 01 00 00 00 00 00 	if w0 == 0x0 goto +0x1
-// CHECK: 56 03 00 00 ff ff ff ff 	if w3 != -0x1 goto +0x0
+  jeq w0, 0, Llabel0           // BPF_JEQ  | BPF_K
+  jne w3, -1, Llabel0          // BPF_JNE  | BPF_K
+// CHECK: 16 00 01 00 00 00 00 00 	jeq w0, 0x0, +0x1
+// CHECK: 56 03 00 00 ff ff ff ff 	jne w3, -0x1, +0x0
 
 Llabel0 :
-  if w1 > 64 goto Llabel0           // BPF_JGT  | BPF_K
-  if w2 >= 0xffffffff goto Llabel0  // BPF_JGE  | BPF_K
-  if w4 s> 0xffffffff goto Llabel0  // BPF_JSGT | BPF_K
-  if w5 s>= 0x7fffffff goto Llabel0 // BPF_JSGE | BPF_K
-// CHECK: 26 01 ff ff 40 00 00 00 	if w1 > 0x40 goto -0x1
-// CHECK: 36 02 fe ff ff ff ff ff 	if w2 >= -0x1 goto -0x2
-// CHECK: 66 04 fd ff ff ff ff ff 	if w4 s> -0x1 goto -0x3
-// CHECK: 76 05 fc ff ff ff ff 7f 	if w5 s>= 0x7fffffff goto -0x4
+  jgt w1, 64, Llabel0           // BPF_JGT  | BPF_K
+  jge w2, 0xffffffff, Llabel0  // BPF_JGE  | BPF_K
+  jsgt w4, 0xffffffff, Llabel0  // BPF_JSGT | BPF_K
+  jsge w5, 0x7fffffff, Llabel0 // BPF_JSGE | BPF_K
+// CHECK: 26 01 ff ff 40 00 00 00 	jgt w1, 0x40, -0x1
+// CHECK: 36 02 fe ff ff ff ff ff 	jge w2, -0x1, -0x2
+// CHECK: 66 04 fd ff ff ff ff ff 	jsgt w4, -0x1, -0x3
+// CHECK: 76 05 fc ff ff ff ff 7f 	jsge w5, 0x7fffffff, -0x4
 
-  if w6 < 0xff goto Llabel0         // BPF_JLT  | BPF_K
-  if w7 <= 0xffff goto Llabel0      // BPF_JLE  | BPF_K
-  if w8 s< 0 goto Llabel0           // BPF_JSLT | BPF_K
-  if w9 s<= -1 goto Llabel0         // BPF_JSLE | BPF_K
-// CHECK: a6 06 fb ff ff 00 00 00 	if w6 < 0xff goto -0x5
-// CHECK: b6 07 fa ff ff ff 00 00 	if w7 <= 0xffff goto -0x6
-// CHECK: c6 08 f9 ff 00 00 00 00 	if w8 s< 0x0 goto -0x7
-// CHECK: d6 09 f8 ff ff ff ff ff 	if w9 s<= -0x1 goto -0x8
+  jlt w6, 0xff, Llabel0         // BPF_JLT  | BPF_K
+  jle w7, 0xffff, Llabel0      // BPF_JLE  | BPF_K
+  jslt w8, 0, Llabel0           // BPF_JSLT | BPF_K
+  jsle w9, -1, Llabel0         // BPF_JSLE | BPF_K
+// CHECK: a6 06 fb ff ff 00 00 00 	jlt w6, 0xff, -0x5
+// CHECK: b6 07 fa ff ff ff 00 00 	jle w7, 0xffff, -0x6
+// CHECK: c6 08 f9 ff 00 00 00 00 	jslt w8, 0x0, -0x7
+// CHECK: d6 09 f8 ff ff ff ff ff 	jsle w9, -0x1, -0x8
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
index 96b9b6004be1a..3d85a9c9394e4 100644
--- a/llvm/test/MC/SBF/insn-unit.s
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -1,180 +1,159 @@
 # RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-64 %s
-# RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-32 %s
-
-.syntax_old
+# RUN: llvm-objdump  -d -r %t | FileCheck --check-prefixes CHECK,CHECK-64 %s
+# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck --check-prefixes CHECK,CHECK-32 %s
 
 // ======== BPF_LD Class ========
 // Some extra whitespaces are deliberately added to test the parser.
 
-  r0 = * (u8 *)skb[0]    // BPF_LD | BPF_ABS | BPF_B
-  r0 = *(u16 *)skb[2]    // BPF_LD | BPF_ABS | BPF_H
-  r0 = * (u32*)skb[4]    // BPF_LD | BPF_ABS | BPF_W
-// CHECK: 30 00 00 00 00 00 00 00 	r0 = *(u8 *)skb[0x0]
-// CHECK: 28 00 00 00 02 00 00 00 	r0 = *(u16 *)skb[0x2]
-// CHECK: 20 00 00 00 04 00 00 00 	r0 = *(u32 *)skb[0x4]
-
-  r0 = * (u8 *)skb[r0]   // BPF_LD | BPF_IND | BPF_B
-  r0 = *  (u16 *)skb[r1] // BPF_LD | BPF_IND | BPF_H
-  r0 = *(u32 *)skb[r2]   // BPF_LD | BPF_IND | BPF_W
-// CHECK: 50 00 00 00 00 00 00 00 	r0 = *(u8 *)skb[r0]
-// CHECK: 48 10 00 00 00 00 00 00 	r0 = *(u16 *)skb[r1]
-// CHECK: 40 20 00 00 00 00 00 00 	r0 = *(u32 *)skb[r2]
-
-  r9 = 0xffffffff ll     // BPF_LD | BPF_DW | BPF_IMM
-  r9 = 8589934591 ll     // BPF_LD | BPF_DW | BPF_IMM
-  r9 = 0x1ffffffff ll    // BPF_LD | BPF_DW | BPF_IMM
-  r9 = dummy_map  ll     // BPF_LD | BPF_DW | BPF_IMM
-// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 00 00 00 00 	r9 = 0xffffffff ll
-// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 0x1ffffffff ll
-// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	r9 = 0x1ffffffff ll
-// CHECK: 18 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 	r9 = 0x0 ll
-// CHECK: 0000000000000060:  R_SBF_64_64	dummy_map
+
+  lddw r9, 0xffffffff    // BPF_LD | BPF_DW | BPF_IMM
+  lddw r9, 8589934591    // BPF_LD | BPF_DW | BPF_IMM
+  lddw r9, 0x1ffffffff   // BPF_LD | BPF_DW | BPF_IMM
+  lddw r9, dummy_map     // BPF_LD | BPF_DW | BPF_IMM
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 00 00 00 00 	lddw r9, 0xffffffff
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	lddw r9, 0x1ffffffff
+// CHECK: 18 09 00 00 ff ff ff ff 00 00 00 00 01 00 00 00 	lddw r9, 0x1ffffffff
+// CHECK: 18 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 	lddw r9, 0x0
+// CHECK: 0000000000000030:  R_SBF_64_64	dummy_map
 
 // ======== BPF_LDX Class ========
-  r5 = *(u8 *)(r0 + 0)   // BPF_LDX | BPF_B
-  r6 = *(u16 *)(r1 + 8)  // BPF_LDX | BPF_H
-  r7 = *(u32 *)(r2 + 16) // BPF_LDX | BPF_W
-  r8 = *(u64 *)(r3 - 30) // BPF_LDX | BPF_DW
-// CHECK-64: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0x0)
-// CHECK-64: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 0x8)
-// CHECK-64: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 0x10)
-// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0x0)
-// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 0x8)
-// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 0x10)
-// CHECK: 79 38 e2 ff 00 00 00 00 	r8 = *(u64 *)(r3 - 0x1e)
+  ldxb r5, [r0 + 0]   // BPF_LDX | BPF_B
+  ldxh r6, [r1 + 8]  // BPF_LDX | BPF_H
+  ldxw r7, [r2 + 16] // BPF_LDX | BPF_W
+  ldxdw r8, [r3 - 30] // BPF_LDX | BPF_DW
+// CHECK-64: 71 05 00 00 00 00 00 00 	ldxb r5, [r0 + 0x0]
+// CHECK-64: 69 16 08 00 00 00 00 00 	ldxh r6, [r1 + 0x8]
+// CHECK-64: 61 27 10 00 00 00 00 00 	ldxw r7, [r2 + 0x10]
+// CHECK-32: 71 05 00 00 00 00 00 00 	ldxb w5, [r0 + 0x0]
+// CHECK-32: 69 16 08 00 00 00 00 00 	ldxh w6, [r1 + 0x8]
+// CHECK-32: 61 27 10 00 00 00 00 00 	ldxw w7, [r2 + 0x10]
+// CHECK: 79 38 e2 ff 00 00 00 00 	ldxdw r8, [r3 - 0x1e]
 
 // ======== BPF_STX Class ========
-  *(u8 *)(r0 + 0) = r7    // BPF_STX | BPF_B
-  *(u16 *)(r1 + 8) = r8   // BPF_STX | BPF_H
-  *(u32 *)(r2 + 16) = r9  // BPF_STX | BPF_W
-  *(u64 *)(r3 - 30) = r10 // BPF_STX | BPF_DW
-// CHECK-64: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = r7
-// CHECK-64: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = r8
-// CHECK-64: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = r9
-// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = w7
-// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = w8
-// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = w9
-// CHECK: 7b a3 e2 ff 00 00 00 00 	*(u64 *)(r3 - 0x1e) = r10
-
-  lock *(u32 *)(r2 + 16) += r9  // BPF_STX | BPF_W | BPF_XADD
-  lock *(u64 *)(r3 - 30) += r10 // BPF_STX | BPF_DW | BPF_XADD
-// CHECK-64: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += r9
-// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += w9
-// CHECK: db a3 e2 ff 00 00 00 00 	lock *(u64 *)(r3 - 0x1e) += r10
+  stxb [r0 + 0], r7    // BPF_STX | BPF_B
+  stxh [r1 + 8], r8   // BPF_STX | BPF_H
+  stxw [r2 + 16], r9  // BPF_STX | BPF_W
+  stxdw [r3 - 30], r10 // BPF_STX | BPF_DW
+// CHECK-64: 73 70 00 00 00 00 00 00 	stxb [r0 + 0x0], r7
+// CHECK-64: 6b 81 08 00 00 00 00 00 	stxh [r1 + 0x8], r8
+// CHECK-64: 63 92 10 00 00 00 00 00 	stxw [r2 + 0x10], r9
+// CHECK-32: 73 70 00 00 00 00 00 00 	stxb [r0 + 0x0], w7
+// CHECK-32: 6b 81 08 00 00 00 00 00 	stxh [r1 + 0x8], w8
+// CHECK-32: 63 92 10 00 00 00 00 00 	stxw [r2 + 0x10], w9
+// CHECK: 7b a3 e2 ff 00 00 00 00 	stxdw [r3 - 0x1e], r10
 
 // ======== BPF_JMP Class ========
-  goto Llabel0               // BPF_JA
+  ja Llabel0               // BPF_JA
   call 1                     // BPF_CALL
   exit                       // BPF_EXIT
-// CHECK: 05 00 1a 00 00 00 00 00 	goto +0x1a
+// CHECK: 05 00 1a 00 00 00 00 00 	ja +0x1a
 // CHECK: 85 00 00 00 01 00 00 00 	call 0x1
 // CHECK: 95 00 00 00 00 00 00 00 	exit
 
-  if r0 == r1 goto Llabel0   // BPF_JEQ  | BPF_X
-  if r3 != r4 goto Llabel0   // BPF_JNE  | BPF_X
-// CHECK: 1d 10 17 00 00 00 00 00 	if r0 == r1 goto +0x17
-// CHECK: 5d 43 16 00 00 00 00 00 	if r3 != r4 goto +0x16
-
-  if r1 > r2 goto Llabel0    // BPF_JGT  | BPF_X
-  if r2 >= r3 goto Llabel0   // BPF_JGE  | BPF_X
-  if r4 s> r5 goto Llabel0   // BPF_JSGT | BPF_X
-  if r5 s>= r6 goto Llabel0  // BPF_JSGE | BPF_X
-// CHECK: 2d 21 15 00 00 00 00 00 	if r1 > r2 goto +0x15
-// CHECK: 3d 32 14 00 00 00 00 00 	if r2 >= r3 goto +0x14
-// CHECK: 6d 54 13 00 00 00 00 00 	if r4 s> r5 goto +0x13
-// CHECK: 7d 65 12 00 00 00 00 00 	if r5 s>= r6 goto +0x12
-
-  if r6 < r7 goto Llabel0    // BPF_JLT  | BPF_X
-  if r7 <= r8 goto Llabel0   // BPF_JLE  | BPF_X
-  if r8 s< r9 goto Llabel0   // BPF_JSLT | BPF_X
-  if r9 s<= r10 goto Llabel0 // BPF_JSLE | BPF_X
-// CHECK: ad 76 11 00 00 00 00 00 	if r6 < r7 goto +0x11
-// CHECK: bd 87 10 00 00 00 00 00 	if r7 <= r8 goto +0x10
-// CHECK: cd 98 0f 00 00 00 00 00 	if r8 s< r9 goto +0xf
-// CHECK: dd a9 0e 00 00 00 00 00 	if r9 s<= r10 goto +0xe
-
-  if r0 == 0 goto Llabel0           // BPF_JEQ  | BPF_K
-  if r3 != -1 goto Llabel0          // BPF_JNE  | BPF_K
-// CHECK: 15 00 0d 00 00 00 00 00 	if r0 == 0x0 goto +0xd
-// CHECK: 55 03 0c 00 ff ff ff ff 	if r3 != -0x1 goto +0xc
-
-  if r1 > 64 goto Llabel0           // BPF_JGT  | BPF_K
-  if r2 >= 0xffffffff goto Llabel0  // BPF_JGE  | BPF_K
-  if r4 s> 0xffffffff goto Llabel0  // BPF_JSGT | BPF_K
-  if r5 s>= 0x7fffffff goto Llabel0 // BPF_JSGE | BPF_K
-// CHECK: 25 01 0b 00 40 00 00 00 	if r1 > 0x40 goto +0xb
-// CHECK: 35 02 0a 00 ff ff ff ff 	if r2 >= -0x1 goto +0xa
-// CHECK: 65 04 09 00 ff ff ff ff 	if r4 s> -0x1 goto +0x9
-// CHECK: 75 05 08 00 ff ff ff 7f 	if r5 s>= 0x7fffffff goto +0x8
-
-  if r6 < 0xff goto Llabel0         // BPF_JLT  | BPF_K
-  if r7 <= 0xffff goto Llabel0      // BPF_JLE  | BPF_K
-  if r8 s< 0 goto Llabel0           // BPF_JSLT | BPF_K
-  if r9 s<= -1 goto Llabel0         // BPF_JSLE | BPF_K
-// CHECK: a5 06 07 00 ff 00 00 00 	if r6 < 0xff goto +0x7
-// CHECK: b5 07 06 00 ff ff 00 00 	if r7 <= 0xffff goto +0x6
-// CHECK: c5 08 05 00 00 00 00 00 	if r8 s< 0x0 goto +0x5
-// CHECK: d5 09 04 00 ff ff ff ff 	if r9 s<= -0x1 goto +0x4
+  jeq r0, r1, Llabel0   // BPF_JEQ  | BPF_X
+  jne r3, r4, Llabel0   // BPF_JNE  | BPF_X
+// CHECK: 1d 10 17 00 00 00 00 00 	jeq r0, r1, +0x17
+// CHECK: 5d 43 16 00 00 00 00 00 	jne r3, r4, +0x16
+
+  jgt r1, r2, Llabel0    // BPF_JGT  | BPF_X
+  jge r2, r3, Llabel0   // BPF_JGE  | BPF_X
+  jsgt r4, r5, Llabel0   // BPF_JSGT | BPF_X
+  jsge r5, r6, Llabel0  // BPF_JSGE | BPF_X
+// CHECK: 2d 21 15 00 00 00 00 00 	jgt r1, r2, +0x15
+// CHECK: 3d 32 14 00 00 00 00 00 	jge r2, r3, +0x14
+// CHECK: 6d 54 13 00 00 00 00 00 	jsgt r4, r5, +0x13
+// CHECK: 7d 65 12 00 00 00 00 00 	jsge r5, r6, +0x12
+
+  jlt r6, r7, Llabel0    // BPF_JLT  | BPF_X
+  jle r7, r8, Llabel0   // BPF_JLE  | BPF_X
+  jslt r8, r9, Llabel0   // BPF_JSLT | BPF_X
+  jsle r9, r10, Llabel0 // BPF_JSLE | BPF_X
+// CHECK: ad 76 11 00 00 00 00 00 	jlt r6, r7, +0x11
+// CHECK: bd 87 10 00 00 00 00 00 	jle r7, r8, +0x10
+// CHECK: cd 98 0f 00 00 00 00 00 	jslt r8, r9, +0xf
+// CHECK: dd a9 0e 00 00 00 00 00 	jsle r9, r10, +0xe
+
+  jeq r0, 0, Llabel0           // BPF_JEQ  | BPF_K
+  jne r3, -1, Llabel0          // BPF_JNE  | BPF_K
+// CHECK: 15 00 0d 00 00 00 00 00 	jeq r0, 0x0, +0xd
+// CHECK: 55 03 0c 00 ff ff ff ff 	jne r3, -0x1, +0xc
+
+  jgt r1, 64, Llabel0           // BPF_JGT  | BPF_K
+  jge r2, 0xffffffff, Llabel0  // BPF_JGE  | BPF_K
+  jsgt r4, 0xffffffff, Llabel0  // BPF_JSGT | BPF_K
+  jsge r5, 0x7fffffff, Llabel0 // BPF_JSGE | BPF_K
+// CHECK: 25 01 0b 00 40 00 00 00 	jgt r1, 0x40, +0xb
+// CHECK: 35 02 0a 00 ff ff ff ff 	jge r2, -0x1, +0xa
+// CHECK: 65 04 09 00 ff ff ff ff 	jsgt r4, -0x1, +0x9
+// CHECK: 75 05 08 00 ff ff ff 7f 	jsge r5, 0x7fffffff, +0x8
+
+  jlt r6, 0xff, Llabel0         // BPF_JLT  | BPF_K
+  jle r7, 0xffff, Llabel0      // BPF_JLE  | BPF_K
+  jslt r8, 0, Llabel0           // BPF_JSLT | BPF_K
+  jsle r9, -1, Llabel0         // BPF_JSLE | BPF_K
+// CHECK: a5 06 07 00 ff 00 00 00 	jlt r6, 0xff, +0x7
+// CHECK: b5 07 06 00 ff ff 00 00 	jle r7, 0xffff, +0x6
+// CHECK: c5 08 05 00 00 00 00 00 	jslt r8, 0x0, +0x5
+// CHECK: d5 09 04 00 ff ff ff ff 	jsle r9, -0x1, +0x4
 
 // ======== BPF_ALU64 Class ========
-  r0 += r1    // BPF_ADD  | BPF_X
-  r1 -= r2    // BPF_SUB  | BPF_X
-  r2 *= r3    // BPF_MUL  | BPF_X
-  r3 /= r4    // BPF_DIV  | BPF_X
-// CHECK: 0f 10 00 00 00 00 00 00 	r0 += r1
-// CHECK: 1f 21 00 00 00 00 00 00 	r1 -= r2
-// CHECK: 2f 32 00 00 00 00 00 00 	r2 *= r3
-// CHECK: 3f 43 00 00 00 00 00 00 	r3 /= r4
+  add64 r0, r1    // BPF_ADD  | BPF_X
+  sub64 r1, r2    // BPF_SUB  | BPF_X
+  mul64 r2, r3    // BPF_MUL  | BPF_X
+  div64 r3, r4    // BPF_DIV  | BPF_X
+// CHECK: 0f 10 00 00 00 00 00 00 	add64 r0, r1
+// CHECK: 1f 21 00 00 00 00 00 00 	sub64 r1, r2
+// CHECK: 2f 32 00 00 00 00 00 00 	mul64 r2, r3
+// CHECK: 3f 43 00 00 00 00 00 00 	div64 r3, r4
 
 Llabel0 :
-  r2 = -r2    // BPF_NEG
-  r4 |= r5    // BPF_OR   | BPF_X
-  r5 &= r6    // BPF_AND  | BPF_X
-  r6 <<= r7   // BPF_LSH  | BPF_X
-  r7 >>= r8   // BPF_RSH  | BPF_X
-  r8 ^= r9    // BPF_XOR  | BPF_X
-  r9 = r10    // BPF_MOV  | BPF_X
-  r10 s>>= r0 // BPF_ARSH | BPF_X
+  neg64 r2    // BPF_NEG
+  or64 r4, r5    // BPF_OR   | BPF_X
+  and64 r5, r6    // BPF_AND  | BPF_X
+  lsh64 r6, r7   // BPF_LSH  | BPF_X
+  rsh64 r7, r8   // BPF_RSH  | BPF_X
+  xor64 r8, r9    // BPF_XOR  | BPF_X
+  mov64 r9, r10    // BPF_MOV  | BPF_X
+  arsh64 r10, r0 // BPF_ARSH | BPF_X
 // CHECK: <Llabel0>:
-// CHECK: 87 02 00 00 00 00 00 00	r2 = -r2
-// CHECK: 4f 54 00 00 00 00 00 00 	r4 |= r5
-// CHECK: 5f 65 00 00 00 00 00 00 	r5 &= r6
-// CHECK: 6f 76 00 00 00 00 00 00 	r6 <<= r7
-// CHECK: 7f 87 00 00 00 00 00 00 	r7 >>= r8
-// CHECK: af 98 00 00 00 00 00 00 	r8 ^= r9
-// CHECK: bf a9 00 00 00 00 00 00 	r9 = r10
-// CHECK: cf 0a 00 00 00 00 00 00 	r10 s>>= r0
-
-  r1 = be16 r1  // BPF_END  | BPF_TO_BE
-  r2 = be32 r2  // BPF_END  | BPF_TO_BE
-  r3 = be64 r3  // BPF_END  | BPF_TO_BE
-// CHECK: dc 01 00 00 10 00 00 00 	r1 = be16 r1
-// CHECK: dc 02 00 00 20 00 00 00 	r2 = be32 r2
-// CHECK: dc 03 00 00 40 00 00 00 	r3 = be64 r3
-
-  r0 += 1           // BPF_ADD  | BPF_K
-  r1 -= 0x1         // BPF_SUB  | BPF_K
-  r2 *= -4          // BPF_MUL  | BPF_K
-  r3 /= 5           // BPF_DIV  | BPF_K
-// CHECK: 07 00 00 00 01 00 00 00 	r0 += 0x1
-// CHECK: 17 01 00 00 01 00 00 00 	r1 -= 0x1
-// CHECK: 27 02 00 00 fc ff ff ff 	r2 *= -0x4
-// CHECK: 37 03 00 00 05 00 00 00 	r3 /= 0x5
-
-  r4 |= 0xff        // BPF_OR   | BPF_K
-  r5 &= 0xFF        // BPF_AND  | BPF_K
-  r6 <<= 63         // BPF_LSH  | BPF_K
-  r7 >>= 32         // BPF_RSH  | BPF_K
-  r8 ^= 0           // BPF_XOR  | BPF_K
-  r9 = 1            // BPF_MOV  | BPF_K
-  r9 = 0xffffffff   // BPF_MOV  | BPF_K
-  r10 s>>= 64       // BPF_ARSH | BPF_K
-// CHECK: 47 04 00 00 ff 00 00 00 	r4 |= 0xff
-// CHECK: 57 05 00 00 ff 00 00 00 	r5 &= 0xff
-// CHECK: 67 06 00 00 3f 00 00 00 	r6 <<= 0x3f
-// CHECK: 77 07 00 00 20 00 00 00 	r7 >>= 0x20
-// CHECK: a7 08 00 00 00 00 00 00 	r8 ^= 0x0
-// CHECK: b7 09 00 00 01 00 00 00 	r9 = 0x1
-// CHECK: b7 09 00 00 ff ff ff ff 	r9 = -0x1
-// CHECK: c7 0a 00 00 40 00 00 00 	r10 s>>= 0x40
+// CHECK: 87 02 00 00 00 00 00 00	neg64 r2
+// CHECK: 4f 54 00 00 00 00 00 00 	or64 r4, r5
+// CHECK: 5f 65 00 00 00 00 00 00 	and64 r5, r6
+// CHECK: 6f 76 00 00 00 00 00 00 	lsh64 r6, r7
+// CHECK: 7f 87 00 00 00 00 00 00 	rsh64 r7, r8
+// CHECK: af 98 00 00 00 00 00 00 	xor64 r8, r9
+// CHECK: bf a9 00 00 00 00 00 00 	mov64 r9, r10
+// CHECK: cf 0a 00 00 00 00 00 00 	arsh64 r10, r0
+
+  be16 r1  // BPF_END  | BPF_TO_BE
+  be32 r2  // BPF_END  | BPF_TO_BE
+  be64 r3  // BPF_END  | BPF_TO_BE
+// CHECK: dc 01 00 00 10 00 00 00 	be16 r1
+// CHECK: dc 02 00 00 20 00 00 00 	be32 r2
+// CHECK: dc 03 00 00 40 00 00 00 	be64 r3
+
+  add64 r0, 1           // BPF_ADD  | BPF_K
+  sub64 r1, 0x1         // BPF_SUB  | BPF_K
+  mul64 r2, -4          // BPF_MUL  | BPF_K
+  div64 r3, 5           // BPF_DIV  | BPF_K
+// CHECK: 07 00 00 00 01 00 00 00 	add64 r0, 0x1
+// CHECK: 17 01 00 00 01 00 00 00 	sub64 r1, 0x1
+// CHECK: 27 02 00 00 fc ff ff ff 	mul64 r2, -0x4
+// CHECK: 37 03 00 00 05 00 00 00 	div64 r3, 0x5
+
+  or64 r4, 0xff        // BPF_OR   | BPF_K
+  and64 r5, 0xFF        // BPF_AND  | BPF_K
+  lsh64 r6, 63         // BPF_LSH  | BPF_K
+  rsh64 r7, 32         // BPF_RSH  | BPF_K
+  xor64 r8, 0           // BPF_XOR  | BPF_K
+  mov64 r9, 1            // BPF_MOV  | BPF_K
+  mov64 r9, 0xffffffff   // BPF_MOV  | BPF_K
+  arsh64 r10, 64       // BPF_ARSH | BPF_K
+// CHECK: 47 04 00 00 ff 00 00 00 	or64 r4, 0xff
+// CHECK: 57 05 00 00 ff 00 00 00 	and64 r5, 0xff
+// CHECK: 67 06 00 00 3f 00 00 00 	lsh64 r6, 0x3f
+// CHECK: 77 07 00 00 20 00 00 00 	rsh64 r7, 0x20
+// CHECK: a7 08 00 00 00 00 00 00 	xor64 r8, 0x0
+// CHECK: b7 09 00 00 01 00 00 00 	mov64 r9, 0x1
+// CHECK: b7 09 00 00 ff ff ff ff 	mov64 r9, -0x1
+// CHECK: c7 0a 00 00 40 00 00 00 	arsh64 r10, 0x40
diff --git a/llvm/test/MC/SBF/load-store-32.s b/llvm/test/MC/SBF/load-store-32.s
index 4f42574a55601..2f2176c60c184 100644
--- a/llvm/test/MC/SBF/load-store-32.s
+++ b/llvm/test/MC/SBF/load-store-32.s
@@ -1,30 +1,28 @@
 # RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump --output-asm-variant=1 --mattr=+alu32 -d -r %t | FileCheck --check-prefix=CHECK-32 %s
-# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
-
-.syntax_old
+# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck --check-prefix=CHECK-32 %s
+# RUN: llvm-objdump  -d -r %t | FileCheck %s
 
 // ======== BPF_LDX Class ========
-  w5 = *(u8 *)(r0 + 0)   // BPF_LDX | BPF_B
-  w6 = *(u16 *)(r1 + 8)  // BPF_LDX | BPF_H
-  w7 = *(u32 *)(r2 + 16) // BPF_LDX | BPF_W
-// CHECK-32: 71 05 00 00 00 00 00 00 	w5 = *(u8 *)(r0 + 0x0)
-// CHECK-32: 69 16 08 00 00 00 00 00 	w6 = *(u16 *)(r1 + 0x8)
-// CHECK-32: 61 27 10 00 00 00 00 00 	w7 = *(u32 *)(r2 + 0x10)
-// CHECK: 71 05 00 00 00 00 00 00 	r5 = *(u8 *)(r0 + 0x0)
-// CHECK: 69 16 08 00 00 00 00 00 	r6 = *(u16 *)(r1 + 0x8)
-// CHECK: 61 27 10 00 00 00 00 00 	r7 = *(u32 *)(r2 + 0x10)
+  ldxb w5, [r0 + 0]   // BPF_LDX | BPF_B
+  ldxh w6, [r1 + 8]  // BPF_LDX | BPF_H
+  ldxw w7, [r2 + 16] // BPF_LDX | BPF_W
+// CHECK-32: 71 05 00 00 00 00 00 00 	ldxb w5, [r0 + 0x0]
+// CHECK-32: 69 16 08 00 00 00 00 00 	ldxh w6, [r1 + 0x8]
+// CHECK-32: 61 27 10 00 00 00 00 00 	ldxw w7, [r2 + 0x10]
+// CHECK: 71 05 00 00 00 00 00 00 	ldxb r5, [r0 + 0x0]
+// CHECK: 69 16 08 00 00 00 00 00 	ldxh r6, [r1 + 0x8]
+// CHECK: 61 27 10 00 00 00 00 00 	ldxw r7, [r2 + 0x10]
 
 // ======== BPF_STX Class ========
-  *(u8 *)(r0 + 0) = w7    // BPF_STX | BPF_B
-  *(u16 *)(r1 + 8) = w8   // BPF_STX | BPF_H
-  *(u32 *)(r2 + 16) = w9  // BPF_STX | BPF_W
-  lock *(u32 *)(r2 + 16) += w9  // BPF_STX | BPF_W | BPF_XADD
-// CHECK-32: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = w7
-// CHECK-32: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = w8
-// CHECK-32: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = w9
-// CHECK-32: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += w9
-// CHECK: 73 70 00 00 00 00 00 00 	*(u8 *)(r0 + 0x0) = r7
-// CHECK: 6b 81 08 00 00 00 00 00 	*(u16 *)(r1 + 0x8) = r8
-// CHECK: 63 92 10 00 00 00 00 00 	*(u32 *)(r2 + 0x10) = r9
-// CHECK: c3 92 10 00 00 00 00 00 	lock *(u32 *)(r2 + 0x10) += r9
+  stxb [r0 + 0], w7    // BPF_STX | BPF_B
+  stxh [r1 + 8], w8   // BPF_STX | BPF_H
+  stxw [r2 + 16], w9  // BPF_STX | BPF_W
+  stxxaddw [r2 + 16], w9  // BPF_STX | BPF_W | BPF_XADD
+// CHECK-32: 73 70 00 00 00 00 00 00 	stxb [r0 + 0x0], w7
+// CHECK-32: 6b 81 08 00 00 00 00 00 	stxh [r1 + 0x8], w8
+// CHECK-32: 63 92 10 00 00 00 00 00 	stxw [r2 + 0x10], w9
+// CHECK-32: c3 92 10 00 00 00 00 00 	stxxaddw [r2 + 0x10], w9
+// CHECK: 73 70 00 00 00 00 00 00 	stxb [r0 + 0x0], r7
+// CHECK: 6b 81 08 00 00 00 00 00 	stxh [r1 + 0x8], r8
+// CHECK: 63 92 10 00 00 00 00 00 	stxw [r2 + 0x10], r9
+// CHECK: c3 92 10 00 00 00 00 00 	stxxaddw [r2 + 0x10], r9
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index f73ae33e5976c..919e323a22e5b 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -3,328 +3,265 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
-# RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
-# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
 
 
 # TODO: Test immediate field ranges and some hex immediates.
 
 # CHECK-OBJ-NEW: add64 r0, r9
-# CHECK-OBJ-OLD: r0 += r9
 # CHECK-ASM-NEW: encoding: [0x0f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 add64 r0, r9
 
 # CHECK-OBJ-NEW: add64 r3, r2
-# CHECK-OBJ-OLD: r3 += r2
 # CHECK-ASM-NEW: encoding: [0x0f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 add64 r3, r2
 
 # CHECK-OBJ-NEW: add64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 += 0x7b
 # CHECK-ASM-NEW: encoding: [0x07,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 add64 r3, 123
 
 # CHECK-OBJ-NEW: add64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 += -0x7b
 # CHECK-ASM-NEW: encoding: [0x07,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 add64 r5, -123
 
 # CHECK-OBJ-NEW: add32 w6, w2
-# CHECK-OBJ-OLD: w6 += w2
 # CHECK-ASM-NEW: encoding: [0x0c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 add32 w6, w2
 
 # CHECK-OBJ-NEW: add32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 += -0x7b
 # CHECK-ASM-NEW: encoding: [0x04,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 add32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: sub64 r0, r9
-# CHECK-OBJ-OLD: r0 -= r9
 # CHECK-ASM-NEW: encoding: [0x1f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 sub64 r0, r9
 
 # CHECK-OBJ-NEW: sub64 r3, r2
-# CHECK-OBJ-OLD: r3 -= r2
 # CHECK-ASM-NEW: encoding: [0x1f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 sub64 r3, r2
 
 # CHECK-OBJ-NEW: sub64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 -= 0x7b
 # CHECK-ASM-NEW: encoding: [0x17,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 sub64 r3, 123
 
 # CHECK-OBJ-NEW: sub64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 -= -0x7b
 # CHECK-ASM-NEW: encoding: [0x17,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sub64 r5, -123
 
 # CHECK-OBJ-NEW: sub32 w6, w2
-# CHECK-OBJ-OLD: w6 -= w2
 # CHECK-ASM-NEW: encoding: [0x1c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 sub32 w6, w2
 
 # CHECK-OBJ-NEW: sub32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 -= -0x7b
 # CHECK-ASM-NEW: encoding: [0x14,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sub32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: mul64 r0, r9
-# CHECK-OBJ-OLD: r0 *= r9
 # CHECK-ASM-NEW: encoding: [0x2f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 mul64 r0, r9
 
 # CHECK-OBJ-NEW: mul64 r3, r2
-# CHECK-OBJ-OLD: r3 *= r2
 # CHECK-ASM-NEW: encoding: [0x2f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mul64 r3, r2
 
 # CHECK-OBJ-NEW: mul64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 *= 0x7b
 # CHECK-ASM-NEW: encoding: [0x27,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 mul64 r3, 123
 
 # CHECK-OBJ-NEW: mul64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 *= -0x7b
 # CHECK-ASM-NEW: encoding: [0x27,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mul64 r5, -123
 
 # CHECK-OBJ-NEW: mul32 w6, w2
-# CHECK-OBJ-OLD: w6 *= w2
 # CHECK-ASM-NEW: encoding: [0x2c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mul32 w6, w2
 
 # CHECK-OBJ-NEW: mul32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 *= -0x7b
 # CHECK-ASM-NEW: encoding: [0x24,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mul32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: div64 r0, r9
-# CHECK-OBJ-OLD: r0 /= r9
 # CHECK-ASM-NEW: encoding: [0x3f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 div64 r0, r9
 
 # CHECK-OBJ-NEW: div64 r3, r2
-# CHECK-OBJ-OLD: r3 /= r2
 # CHECK-ASM-NEW: encoding: [0x3f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 div64 r3, r2
 
 # CHECK-OBJ-NEW: div64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 /= 0x7b
 # CHECK-ASM-NEW: encoding: [0x37,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 div64 r3, 123
 
 # CHECK-OBJ-NEW: div64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 /= -0x7b
 # CHECK-ASM-NEW: encoding: [0x37,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 div64 r5, -123
 
 # CHECK-OBJ-NEW: div32 w6, w2
-# CHECK-OBJ-OLD: w6 /= w2
 # CHECK-ASM-NEW: encoding: [0x3c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 div32 w6, w2
 
 # CHECK-OBJ-NEW: div32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 /= -0x7b
 # CHECK-ASM-NEW: encoding: [0x34,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 div32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: sdiv64 r0, r9
-# CHECK-OBJ-OLD: r0 s/= r9
 # CHECK-ASM-NEW: encoding: [0xef,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv64 r0, r9
 
 # CHECK-OBJ-NEW: sdiv64 r3, r2
-# CHECK-OBJ-OLD: r3 s/= r2
 # CHECK-ASM-NEW: encoding: [0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv64 r3, r2
 
 # CHECK-OBJ-NEW: sdiv64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 s/= 0x7b
 # CHECK-ASM-NEW: encoding: [0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 sdiv64 r3, 123
 
 # CHECK-OBJ-NEW: sdiv64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 s/= -0x7b
 # CHECK-ASM-NEW: encoding: [0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sdiv64 r5, -123
 
 # CHECK-OBJ-NEW: sdiv32 w6, w2
-# CHECK-OBJ-OLD: w6 s/= w2
 # CHECK-ASM-NEW: encoding: [0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 sdiv32 w6, w2
 
 # CHECK-OBJ-NEW: sdiv32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 s/= -0x7b
 # CHECK-ASM-NEW: encoding: [0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sdiv32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: or64 r0, r9
-# CHECK-OBJ-OLD: r0 |= r9
 # CHECK-ASM-NEW: encoding: [0x4f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 or64 r0, r9
 
 # CHECK-OBJ-NEW: or64 r3, r2
-# CHECK-OBJ-OLD: r3 |= r2
 # CHECK-ASM-NEW: encoding: [0x4f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 or64 r3, r2
 
 # CHECK-OBJ-NEW: or64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 |= 0x7b
 # CHECK-ASM-NEW: encoding: [0x47,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 or64 r3, 123
 
 # CHECK-OBJ-NEW: or64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 |= -0x7b
 # CHECK-ASM-NEW: encoding: [0x47,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 or64 r5, -123
 
 # CHECK-OBJ-NEW: or32 w6, w2
-# CHECK-OBJ-OLD: w6 |= w2
 # CHECK-ASM-NEW: encoding: [0x4c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 or32 w6, w2
 
 # CHECK-OBJ-NEW: or32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 |= -0x7b
 # CHECK-ASM-NEW: encoding: [0x44,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 or32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: and64 r0, r9
-# CHECK-OBJ-OLD: r0 &= r9
 # CHECK-ASM-NEW: encoding: [0x5f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 and64 r0, r9
 
 # CHECK-OBJ-NEW: and64 r3, r2
-# CHECK-OBJ-OLD: r3 &= r2
 # CHECK-ASM-NEW: encoding: [0x5f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 and64 r3, r2
 
 # CHECK-OBJ-NEW: and64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 &= 0x7b
 # CHECK-ASM-NEW: encoding: [0x57,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 and64 r3, 123
 
 # CHECK-OBJ-NEW: and64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 &= -0x7b
 # CHECK-ASM-NEW: encoding: [0x57,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 and64 r5, -123
 
 # CHECK-OBJ-NEW: and32 w6, w2
-# CHECK-OBJ-OLD: w6 &= w2
 # CHECK-ASM-NEW: encoding: [0x5c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 and32 w6, w2
 
 # CHECK-OBJ-NEW: and32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 &= -0x7b
 # CHECK-ASM-NEW: encoding: [0x54,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 and32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: xor64 r0, r9
-# CHECK-OBJ-OLD: r0 ^= r9
 # CHECK-ASM-NEW: encoding: [0xaf,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 xor64 r0, r9
 
 # CHECK-OBJ-NEW: xor64 r3, r2
-# CHECK-OBJ-OLD: r3 ^= r2
 # CHECK-ASM-NEW: encoding: [0xaf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 xor64 r3, r2
 
 # CHECK-OBJ-NEW: xor64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 ^= 0x7b
 # CHECK-ASM-NEW: encoding: [0xa7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 xor64 r3, 123
 
 # CHECK-OBJ-NEW: xor64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 ^= -0x7b
 # CHECK-ASM-NEW: encoding: [0xa7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 xor64 r5, -123
 
 # CHECK-OBJ-NEW: xor32 w6, w2
-# CHECK-OBJ-OLD: w6 ^= w2
 # CHECK-ASM-NEW: encoding: [0xac,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 xor32 w6, w2
 
 # CHECK-OBJ-NEW: xor32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 ^= -0x7b
 # CHECK-ASM-NEW: encoding: [0xa4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 xor32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: lsh64 r0, r9
-# CHECK-OBJ-OLD: r0 <<= r9
 # CHECK-ASM-NEW: encoding: [0x6f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh64 r0, r9
 
 # CHECK-OBJ-NEW: lsh64 r3, r2
-# CHECK-OBJ-OLD: r3 <<= r2
 # CHECK-ASM-NEW: encoding: [0x6f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh64 r3, r2
 
 # CHECK-OBJ-NEW: lsh64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 <<= 0x7b
 # CHECK-ASM-NEW: encoding: [0x67,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 lsh64 r3, 123
 
 # CHECK-OBJ-NEW: lsh64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 <<= -0x7b
 # CHECK-ASM-NEW: encoding: [0x67,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 lsh64 r5, -123
 
 # CHECK-OBJ-NEW: lsh32 w6, w2
-# CHECK-OBJ-OLD: w6 <<= w2
 # CHECK-ASM-NEW: encoding: [0x6c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 lsh32 w6, w2
 
 # CHECK-OBJ-NEW: lsh32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 <<= -0x7b
 # CHECK-ASM-NEW: encoding: [0x64,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 lsh32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: rsh64 r0, r9
-# CHECK-OBJ-OLD: r0 >>= r9
 # CHECK-ASM-NEW: encoding: [0x7f,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh64 r0, r9
 
 # CHECK-OBJ-NEW: rsh64 r3, r2
-# CHECK-OBJ-OLD: r3 >>= r2
 # CHECK-ASM-NEW: encoding: [0x7f,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh64 r3, r2
 
 # CHECK-OBJ-NEW: rsh64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 >>= 0x7b
 # CHECK-ASM-NEW: encoding: [0x77,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 rsh64 r3, 123
 
 # CHECK-OBJ-NEW: rsh64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 >>= -0x7b
 # CHECK-ASM-NEW: encoding: [0x77,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 rsh64 r5, -123
 
 # CHECK-OBJ-NEW: rsh32 w6, w2
-# CHECK-OBJ-OLD: w6 >>= w2
 # CHECK-ASM-NEW: encoding: [0x7c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 rsh32 w6, w2
 
 # CHECK-OBJ-NEW: rsh32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 >>= -0x7b
 # CHECK-ASM-NEW: encoding: [0x74,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 rsh32 w5, -123
 
@@ -332,76 +269,62 @@ rsh32 w5, -123
 
 
 # CHECK-OBJ-NEW: arsh64 r0, r9
-# CHECK-OBJ-OLD: r0 s>>= r9
 # CHECK-ASM-NEW: encoding: [0xcf,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh64 r0, r9
 
 # CHECK-OBJ-NEW: arsh64 r3, r2
-# CHECK-OBJ-OLD: r3 s>>= r2
 # CHECK-ASM-NEW: encoding: [0xcf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh64 r3, r2
 
 # CHECK-OBJ-NEW: arsh64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 s>>= 0x7b
 # CHECK-ASM-NEW: encoding: [0xc7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 arsh64 r3, 123
 
 # CHECK-OBJ-NEW: arsh64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 s>>= -0x7b
 # CHECK-ASM-NEW: encoding: [0xc7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 arsh64 r5, -123
 
 # CHECK-OBJ-NEW: arsh32 w6, w2
-# CHECK-OBJ-OLD: w6 s>>= w2
 # CHECK-ASM-NEW: encoding: [0xcc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 arsh32 w6, w2
 
 # CHECK-OBJ-NEW: arsh32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 s>>= -0x7b
 # CHECK-ASM-NEW: encoding: [0xc4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 arsh32 w5, -123
 
 
 
 # CHECK-OBJ-NEW: neg64 r9
-# CHECK-OBJ-OLD: r9 = -r9
 # CHECK-ASM-NEW: encoding: [0x87,0x09,0x00,0x00,0x00,0x00,0x00,0x00]
 neg64 r9
 
 # CHECK-OBJ-NEW: neg32 w6
-# CHECK-OBJ-OLD: w6 = -w6
 # CHECK-ASM-NEW: encoding: [0x84,0x06,0x00,0x00,0x00,0x00,0x00,0x00]
 neg32 w6
 
 
 
 # CHECK-OBJ-NEW: mov64 r0, r9
-# CHECK-OBJ-OLD: r0 = r9
 # CHECK-ASM-NEW: encoding: [0xbf,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
 mov64 r0, r9
 
 # CHECK-OBJ-NEW: mov64 r3, r2
-# CHECK-OBJ-OLD: r3 = r2
 # CHECK-ASM-NEW: encoding: [0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mov64 r3, r2
 
 # CHECK-OBJ-NEW: mov64 r3, 0x7b
-# CHECK-OBJ-OLD: r3 = 0x7b
 # CHECK-ASM-NEW: encoding: [0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 mov64 r3, 123
 
 # CHECK-OBJ-NEW: mov64 r5, -0x7b
-# CHECK-OBJ-OLD: r5 = -0x7b
 # CHECK-ASM-NEW: encoding: [0xb7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mov64 r5, -123
 
 # CHECK-OBJ-NEW: mov32 w6, w2
-# CHECK-OBJ-OLD: w6 = w2
 # CHECK-ASM-NEW: encoding: [0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mov32 w6, w2
 
 # CHECK-OBJ-NEW: mov32 w5, -0x7b
-# CHECK-OBJ-OLD: w5 = -0x7b
 # CHECK-ASM-NEW: encoding: [0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mov32 w5, -123
 
@@ -413,12 +336,6 @@ mov32 w5, -123
 # CHECK-OBJ-NEW: be16 r0
 # CHECK-OBJ-NEW: be32 r1
 # CHECK-OBJ-NEW: be64 r2
-# CHECK-OBJ-OLD: r3 = le16 r3
-# CHECK-OBJ-OLD: r4 = le32 r4
-# CHECK-OBJ-OLD: r5 = le64 r5
-# CHECK-OBJ-OLD: r0 = be16 r0
-# CHECK-OBJ-OLD: r1 = be32 r1
-# CHECK-OBJ-OLD: r2 = be64 r2
 # CHECK-ASM-NEW: encoding: [0xd4,0x03,0x00,0x00,0x10,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xd4,0x04,0x00,0x00,0x20,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xd4,0x05,0x00,0x00,0x40,0x00,0x00,0x00]
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index fe95ea806515a..257df3239de87 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -3,9 +3,6 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
-# RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
-# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
 
 
 
@@ -15,9 +12,6 @@ mylabelback:
 # CHECK-OBJ-NEW: ja +0x8
 # CHECK-OBJ-NEW: ja -0x2 <mylabelback>
 # CHECK-OBJ-NEW: ja +0x0 <mylabelfwd>
-# CHECK-OBJ-OLD: goto +0x8
-# CHECK-OBJ-OLD: goto -0x2
-# CHECK-OBJ-OLD: goto +0x0
 # CHECK-ASM-NEW: encoding: [0x05,0x00,0x08,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x05'A',A,0x00,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: # fixup A - offset: 0, value: mylabelback, kind: FK_PCRel_2
@@ -39,16 +33,6 @@ mylabelfwd:
 # CHECK-OBJ-NEW: jsge r0, r9, +0x1
 # CHECK-OBJ-NEW: jslt r0, r9, +0x1
 # CHECK-OBJ-NEW: jsle r0, r9, +0x1
-# CHECK-OBJ-OLD: if r0 == r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 != r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 > r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 >= r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 < r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 <= r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 s> r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 s>= r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 s< r9 goto +0x1
-# CHECK-OBJ-OLD: if r0 s<= r9 goto +0x1
 # CHECK-ASM-NEW: encoding: [0x1d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x5d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x2d,0x90,0x01,0x00,0x00,0x00,0x00,0x00]
@@ -80,16 +64,6 @@ jsle r0, r9, +1
 # CHECK-OBJ-NEW: jsge r3, r2, +0x1
 # CHECK-OBJ-NEW: jslt r3, r2, +0x1
 # CHECK-OBJ-NEW: jsle r3, r2, +0x1
-# CHECK-OBJ-OLD: if r3 == r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 != r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 > r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 >= r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 < r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 <= r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 s> r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 s>= r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 s< r2 goto +0x1
-# CHECK-OBJ-OLD: if r3 s<= r2 goto +0x1
 # CHECK-ASM-NEW: encoding: [0x1d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x5d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x2d,0x23,0x01,0x00,0x00,0x00,0x00,0x00]
@@ -121,16 +95,6 @@ jsle r3, r2, +1
 # CHECK-OBJ-NEW: jsge r3, 0x7b, +0x8
 # CHECK-OBJ-NEW: jslt r3, 0x7b, +0x8
 # CHECK-OBJ-NEW: jsle r3, 0x7b, +0x8
-# CHECK-OBJ-OLD: if r3 == 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 != 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 > 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 >= 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 < 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 <= 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 s> 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 s>= 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 s< 0x7b goto +0x8
-# CHECK-OBJ-OLD: if r3 s<= 0x7b goto +0x8
 # CHECK-ASM-NEW: encoding: [0x15,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x55,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x25,0x03,0x08,0x00,0x7b,0x00,0x00,0x00]
@@ -162,16 +126,6 @@ jsle r3, 123, +8
 # CHECK-OBJ-NEW: jsge r5, -0x7b, +0x8
 # CHECK-OBJ-NEW: jslt r5, -0x7b, +0x8
 # CHECK-OBJ-NEW: jsle r5, -0x7b, +0x8
-# CHECK-OBJ-OLD: if r5 == -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 != -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 > -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 >= -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 < -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 <= -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 s> -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 s>= -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 s< -0x7b goto +0x8
-# CHECK-OBJ-OLD: if r5 s<= -0x7b goto +0x8
 # CHECK-ASM-NEW: encoding: [0x15,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x55,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x25,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
@@ -203,16 +157,6 @@ jsle r5, -123, +8
 # CHECK-OBJ-NEW: jsge w6, w2, +0x8
 # CHECK-OBJ-NEW: jslt w6, w2, +0x8
 # CHECK-OBJ-NEW: jsle w6, w2, +0x8
-# CHECK-OBJ-OLD: if w6 == w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 != w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 > w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 >= w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 < w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 <= w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 s> w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 s>= w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 s< w2 goto +0x8
-# CHECK-OBJ-OLD: if w6 s<= w2 goto +0x8
 # CHECK-ASM-NEW: encoding: [0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
@@ -244,12 +188,6 @@ jsle w6, w2, +8
 # CHECK-OBJ-NEW: jsge w5, -0x7b, +0x8
 # CHECK-OBJ-NEW: jslt w5, -0x7b, +0x8
 # CHECK-OBJ-NEW: jsle w5, -0x7b, +0x8
-# CHECK-OBJ-OLD: if w5 == -0x7b goto +0x8
-# CHECK-OBJ-OLD: if w5 != -0x7b goto +0x8
-# CHECK-OBJ-OLD: if w5 s> -0x7b goto +0x8
-# CHECK-OBJ-OLD: if w5 s>= -0x7b goto +0x8
-# CHECK-OBJ-OLD: if w5 s< -0x7b goto +0x8
-# CHECK-OBJ-OLD: if w5 s<= -0x7b goto +0x8
 # CHECK-ASM-NEW: encoding: [0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
 # CHECK-ASM-NEW: encoding: [0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
@@ -273,16 +211,13 @@ jsle w5, -123, +8
 
 
 # CHECK-OBJ-NEW: call 0x8
-# CHECK-OBJ-OLD: call 0x8
 # CHECK-ASM-NEW: encoding: [0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00]
 call 8
 
 # CHECK-OBJ-NEW: callx r4
-# CHECK-OBJ-OLD: callx r4
 # CHECK-ASM-NEW: encoding: [0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00]
 callx r4
 
 # CHECK-OBJ-NEW: exit
-# CHECK-OBJ-OLD: exit
 # CHECK-ASM-NEW: encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 exit
diff --git a/llvm/test/MC/SBF/sbf-ldst.s b/llvm/test/MC/SBF/sbf-ldst.s
index 92fb8f39320fb..227f8235d51a3 100644
--- a/llvm/test/MC/SBF/sbf-ldst.s
+++ b/llvm/test/MC/SBF/sbf-ldst.s
@@ -3,17 +3,11 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
-# RUN:     | llvm-objdump --output-asm-variant=1 -d -r - \
-# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK32-ASM-NEW
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump --mattr=+alu32 -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK32-OBJ-NEW %s
-# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
-# RUN:     | llvm-objdump --mattr=+alu32 --output-asm-variant=1 -d -r - \
-# RUN:     | FileCheck --check-prefix=CHECK32-OBJ-OLD %s
 
 
 # TODO: Test immediate field ranges and some hex immediates.
@@ -23,11 +17,6 @@
 # CHECK-OBJ-NEW: lddw r1, -0x1
 # CHECK-OBJ-NEW: lddw r3, 0
 # CHECK-OBJ-NEW: 0000000000000030:  R_SBF_64_64        the_symbol
-# CHECK-OBJ-OLD: r7 = 0x8000 ll
-# CHECK-OBJ-OLD: r0 = 0x7f00000000000000 ll
-# CHECK-OBJ-OLD: r1 = -0x1 ll
-# CHECK-OBJ-OLD: r3 = 0x0 ll
-# CHECK-OBJ-OLD: 0000000000000030:  R_SBF_64_64        the_symbol
 # CHECK-ASM-NEW: encoding: [0x18,0x07,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f]
 # CHECK-ASM-NEW: encoding: [0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff]
@@ -45,11 +34,6 @@ lddw r3, the_symbol
 # CHECK-OBJ-NEW: ldxh r8, [r2 + 0x20]
 # CHECK-OBJ-NEW: ldxw r4, [r3 + 0x40]
 # CHECK-OBJ-NEW: ldxdw r0, [r4 + 0x80]
-# CHECK-OBJ-OLD: r6 = *(u8 *)(r1 + 0x11)
-# CHECK-OBJ-OLD: r1 = *(u8 *)(r10 - 0x3)
-# CHECK-OBJ-OLD: r8 = *(u16 *)(r2 + 0x20)
-# CHECK-OBJ-OLD: r4 = *(u32 *)(r3 + 0x40)
-# CHECK-OBJ-OLD: r0 = *(u64 *)(r4 + 0x80)
 # CHECK-ASM-NEW: encoding: [0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -67,10 +51,6 @@ ldxdw r0, [r4 + 128]
 # CHECK32-OBJ-NEW: ldxb w1, [r10 - 0x3]
 # CHECK32-OBJ-NEW: ldxh w8, [r2 + 0x20]
 # CHECK32-OBJ-NEW: ldxw w4, [r3 + 0x40]
-# CHECK32-OBJ-OLD: w6 = *(u8 *)(r1 + 0x11)
-# CHECK32-OBJ-OLD: w1 = *(u8 *)(r10 - 0x3)
-# CHECK32-OBJ-OLD: w8 = *(u16 *)(r2 + 0x20)
-# CHECK32-OBJ-OLD: w4 = *(u32 *)(r3 + 0x40)
 # CHECK32-ASM-NEW: encoding: [0x71,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x71,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x69,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -87,11 +67,6 @@ ldxw w4, [r3 + 64]
 # CHECK-OBJ-NEW: stxh [r2 + 0x20], r8
 # CHECK-OBJ-NEW: stxw [r3 + 0x40], r4
 # CHECK-OBJ-NEW: stxdw [r4 + 0x80], r0
-# CHECK-OBJ-OLD: *(u8 *)(r1 + 0x11) = r6
-# CHECK-OBJ-OLD: *(u8 *)(r10 - 0x3) = r1
-# CHECK-OBJ-OLD: *(u16 *)(r2 + 0x20) = r8
-# CHECK-OBJ-OLD: *(u32 *)(r3 + 0x40) = r4
-# CHECK-OBJ-OLD: *(u64 *)(r4 + 0x80) = r0
 # CHECK-ASM-NEW: encoding: [0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -109,10 +84,6 @@ stxdw [r4 + 128], r0
 # CHECK32-OBJ-NEW: stxb [r10 - 0x3], w1
 # CHECK32-OBJ-NEW: stxh [r2 + 0x20], w8
 # CHECK32-OBJ-NEW: stxw [r3 + 0x40], w4
-# CHECK32-OBJ-OLD: *(u8 *)(r1 + 0x11) = w6
-# CHECK32-OBJ-OLD: *(u8 *)(r10 - 0x3) = w1
-# CHECK32-OBJ-OLD: *(u16 *)(r2 + 0x20) = w8
-# CHECK32-OBJ-OLD: *(u32 *)(r3 + 0x40) = w4
 # CHECK32-ASM-NEW: encoding: [0x73,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x73,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0x6b,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
@@ -125,7 +96,6 @@ stxw [r3 + 64], w4
 
 # XADDW (NoALU32).
 # CHECK-OBJ-NEW: stxxaddw [r8 + 0x4], r2
-# CHECK-OBJ-OLD: lock *(u32 *)(r8 + 0x4) += r2
 # CHECK-ASM-NEW: encoding: [0xc3,0x28,0x04,0x00,0x00,0x00,0x00,0x00]
 stxxaddw [r8 + 4], r2
 
@@ -136,10 +106,6 @@ stxxaddw [r8 + 4], r2
 # CHECK-OBJ-NEW: stxxanddw [r8 - 0x20], r1
 # CHECK-OBJ-NEW: stxxordw [r8 - 0x40], r2
 # CHECK-OBJ-NEW: stxxxordw [r8 - 0x80], r3
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x10) += r0
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x20) &= r1
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x40) |= r2
-# CHECK-OBJ-OLD: lock *(u64 *)(r8 - 0x80) ^= r3
 # CHECK-ASM-NEW: encoding: [0xdb,0x08,0xf0,0xff,0x00,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x18,0xe0,0xff,0x50,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x28,0xc0,0xff,0x40,0x00,0x00,0x00]
@@ -156,10 +122,6 @@ stxxxordw [r8 - 128], r3
 # CHECK32-OBJ-NEW: stxxandw [r8 - 0x20], w5
 # CHECK32-OBJ-NEW: stxxorw [r8 - 0x40], w6
 # CHECK32-OBJ-NEW: stxxxorw [r8 - 0x80], w7
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x10) += w4
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x20) &= w5
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x40) |= w6
-# CHECK32-OBJ-OLD: lock *(u32 *)(r8 - 0x80) ^= w7
 # CHECK32-ASM-NEW: encoding: [0xc3,0x48,0xf0,0xff,0x00,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x58,0xe0,0xff,0x50,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x68,0xc0,0xff,0x40,0x00,0x00,0x00]
@@ -176,10 +138,6 @@ stxxxorw [r8 - 128], w7
 # CHECK-OBJ-NEW: stxxfanddw [r8 - 0x20], r1
 # CHECK-OBJ-NEW: stxxfordw [r8 - 0x40], r2
 # CHECK-OBJ-NEW: stxxfxordw [r8 - 0x80], r3
-# CHECK-OBJ-OLD: r0 = atomic_fetch_add((u64 *)(r8 - 0x10), r0)
-# CHECK-OBJ-OLD: r1 = atomic_fetch_and((u64 *)(r8 - 0x20), r1)
-# CHECK-OBJ-OLD: r2 = atomic_fetch_or((u64 *)(r8 - 0x40), r2)
-# CHECK-OBJ-OLD: r3 = atomic_fetch_xor((u64 *)(r8 - 0x80), r3)
 # CHECK-ASM-NEW: encoding: [0xdb,0x08,0xf0,0xff,0x01,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x18,0xe0,0xff,0x51,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdb,0x28,0xc0,0xff,0x41,0x00,0x00,0x00]
@@ -196,10 +154,6 @@ stxxfxordw [r8 - 128], r3
 # CHECK32-OBJ-NEW: stxxfandw [r8 - 0x20], w1
 # CHECK32-OBJ-NEW: stxxforw [r8 - 0x40], w2
 # CHECK32-OBJ-NEW: stxxfxorw [r8 - 0x80], w3
-# CHECK32-OBJ-OLD: w0 = atomic_fetch_add((u32 *)(r8 - 0x10), w0)
-# CHECK32-OBJ-OLD: w1 = atomic_fetch_and((u32 *)(r8 - 0x20), w1)
-# CHECK32-OBJ-OLD: w2 = atomic_fetch_or((u32 *)(r8 - 0x40), w2)
-# CHECK32-OBJ-OLD: w3 = atomic_fetch_xor((u32 *)(r8 - 0x80), w3)
 # CHECK32-ASM-NEW: encoding: [0xc3,0x08,0xf0,0xff,0x01,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x18,0xe0,0xff,0x51,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x28,0xc0,0xff,0x41,0x00,0x00,0x00]
@@ -213,9 +167,7 @@ stxxfxorw [r8 - 128], w3
 
 # XCHGD, XCHGW32
 # CHECK-OBJ-NEW: stxxchgdw [r8 - 0x10], r7
-# CHECK-OBJ-OLD: r7 = xchg_64(r8 - 0x10, r7)
 # CHECK32-OBJ-NEW: stxxchgw [r8 - 0x10], w0
-# CHECK32-OBJ-OLD: w0 = xchg32_32(r8 - 0x10, w0)
 # CHECK-ASM-NEW: encoding: [0xdb,0x78,0xf0,0xff,0xe1,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x08,0xf0,0xff,0xe1,0x00,0x00,0x00]
 stxxchgdw [r8 - 16], r7
@@ -225,9 +177,7 @@ stxxchgw [r8 - 16], w0
 
 # CMPXCHGD, CMPXCHGW32
 # CHECK-OBJ-NEW: stxcmpxchgdw [r8 - 0x10], r5
-# CHECK-OBJ-OLD: r0 = cmpxchg_64(r8 - 0x10, r0, r5)
 # CHECK32-OBJ-NEW: stxcmpxchgw [r8 - 0x10], w5
-# CHECK32-OBJ-OLD: w0 = cmpxchg32_32(r8 - 0x10, w0, w5)
 # CHECK-ASM-NEW: encoding: [0xdb,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
 # CHECK32-ASM-NEW: encoding: [0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00]
 stxcmpxchgdw [r8 - 16], r5
@@ -242,12 +192,6 @@ stxcmpxchgw [r8 - 16], w5
 # CHECK-OBJ-NEW: ldindb r5
 # CHECK-OBJ-NEW: ldindh r9
 # CHECK-OBJ-NEW: ldindw r7
-# CHECK-OBJ-OLD: r0 = *(u8 *)skb[0x40]
-# CHECK-OBJ-OLD: r0 = *(u16 *)skb[0x80]
-# CHECK-OBJ-OLD: r0 = *(u32 *)skb[0x0]
-# CHECK-OBJ-OLD: r0 = *(u8 *)skb[r5]
-# CHECK-OBJ-OLD: r0 = *(u16 *)skb[r9]
-# CHECK-OBJ-OLD: r0 = *(u32 *)skb[r7]
 # CHECK-ASM-NEW: encoding: [0x30,0x00,0x00,0x00,0x40,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x28,0x00,0x00,0x00,0x80,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
diff --git a/llvm/test/MC/SBF/sbf-sdiv.s b/llvm/test/MC/SBF/sbf-sdiv.s
index 524417554e3cd..81c002d0712e8 100644
--- a/llvm/test/MC/SBF/sbf-sdiv.s
+++ b/llvm/test/MC/SBF/sbf-sdiv.s
@@ -1,17 +1,15 @@
 # RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump --output-asm-variant=1 -d -r %t | FileCheck %s
+# RUN: llvm-objdump -d -r %t | FileCheck %s
 
-.syntax_old
+sdiv32 w1, w2   // BPF_SDIV | BPF_X
+// CHECK: ec 21 00 00 00 00 00 00      sdiv32 w1, w2
 
-w1 s/= w2   // BPF_SDIV | BPF_X
-// CHECK: ec 21 00 00 00 00 00 00      w1 s/= w2
+sdiv32 w3, 6    // BPF_SDIV | BPF_K
+// CHECK: e4 03 00 00 06 00 00 00      sdiv32 w3, 0x6
 
-w3 s/= 6    // BPF_SDIV | BPF_K
-// CHECK: e4 03 00 00 06 00 00 00      w3 s/= 0x6
 
+sdiv64 r4, r5   // BPF_SDIV | BPF_X
+// CHECK: ef 54 00 00 00 00 00 00 	sdiv64 r4, r5
 
-r4 s/= r5   // BPF_SDIV | BPF_X
-// CHECK: ef 54 00 00 00 00 00 00 	r4 s/= r5
-
-r5 s/= 6    // BPF_SDIV | BPF_K
-// CHECK: e7 05 00 00 06 00 00 00 	r5 s/= 0x6
+sdiv64 r5, 6    // BPF_SDIV | BPF_K
+// CHECK: e7 05 00 00 06 00 00 00 	sdiv64 r5, 0x6
diff --git a/llvm/tools/llvm-objdump/ObjdumpOpts.td b/llvm/tools/llvm-objdump/ObjdumpOpts.td
index 49ab67c0aca02..c3764c6e97534 100644
--- a/llvm/tools/llvm-objdump/ObjdumpOpts.td
+++ b/llvm/tools/llvm-objdump/ObjdumpOpts.td
@@ -252,10 +252,6 @@ def debug_vars_indent_EQ : Joined<["--"], "debug-vars-indent=">,
   HelpText<"Distance to indent the source-level variable display, "
            "relative to the start of the disassembly">;
 
-def output_asm_variant_EQ : Joined<["--"], "output-asm-variant=">,
-  MetaVarName<"uint">,
-  HelpText<"Select output assembly syntax variant">;
-
 def x86_asm_syntax_att : Flag<["--"], "x86-asm-syntax=att">,
   HelpText<"Emit AT&T-style disassembly">;
 
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 70a81146c4343..99e0440dce78d 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -349,8 +349,6 @@ bool objdump::UnwindInfo;
 static bool Wide;
 std::string objdump::Prefix;
 uint32_t objdump::PrefixStrip;
-static uint64_t OutputAsmVariant;
-static bool HasOutputAsmVariantFlag;
 
 DebugVarsFormat objdump::DbgVariables = DVDisabled;
 
@@ -1090,8 +1088,6 @@ DisassemblerTarget::DisassemblerTarget(const Target *TheTarget, ObjectFile &Obj,
   InstrAnalysis.reset(TheTarget->createMCInstrAnalysis(InstrInfo.get()));
 
   int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
-  if (HasOutputAsmVariantFlag)
-    AsmPrinterVariant = OutputAsmVariant;
   InstPrinter.reset(TheTarget->createMCInstPrinter(Triple(TripleName),
                                                    AsmPrinterVariant, *AsmInfo,
                                                    *InstrInfo, *RegisterInfo));
@@ -3580,8 +3576,6 @@ static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
   }
 
   parseIntArg(InputArgs, OBJDUMP_debug_vars_indent_EQ, DbgIndent);
-  parseIntArg(InputArgs, OBJDUMP_output_asm_variant_EQ, OutputAsmVariant);
-  HasOutputAsmVariantFlag = InputArgs.hasArg(OBJDUMP_output_asm_variant_EQ);
 
   parseMachOOptions(InputArgs);
 
diff --git a/llvm/utils/TableGen/Common/CodeGenInstruction.cpp b/llvm/utils/TableGen/Common/CodeGenInstruction.cpp
index c2634bee34c7e..b1c223a2bc48c 100644
--- a/llvm/utils/TableGen/Common/CodeGenInstruction.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenInstruction.cpp
@@ -554,14 +554,6 @@ std::string CodeGenInstruction::FlattenAsmStringVariants(StringRef Cur,
 
     ++VariantsStart; // Skip the '{'.
 
-    char VariantSeparator = '|';
-    // Check for a separator override "{?x?" where x is the new separator.
-    if ((Cur.size() - VariantsStart > 3) &&
-        Cur[VariantsStart] == '?' && Cur[VariantsStart+2] == '?') {
-      VariantSeparator = Cur[VariantsStart+1];
-      VariantsStart += 3;
-    }
-
     // Scan to the end of the variants string.
     size_t VariantsEnd = VariantsStart;
     unsigned NestedBraces = 1;
@@ -577,8 +569,8 @@ std::string CodeGenInstruction::FlattenAsmStringVariants(StringRef Cur,
     StringRef Selection =
         Cur.substr(VariantsStart, VariantsEnd - VariantsStart);
     for (unsigned i = 0; i != Variant; ++i)
-      Selection = Selection.split(VariantSeparator).second;
-    Res += Selection.split(VariantSeparator).first;
+      Selection = Selection.split('|').second;
+    Res += Selection.split('|').first;
     assert(VariantsEnd != Cur.size() &&
            "Unterminated variants in assembly string!");
     Cur = Cur.substr(VariantsEnd + 1);

From c8c9833292d098c9e4909b88081ebacb7bfa4900 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Sat, 16 Dec 2023 00:56:02 -0300
Subject: [PATCH 022/114] [SOL] Remove `neg` and change the semantics of `sub`
 (#73)

Following the alterations made in solana-labs/rbpf#489, this PR removes the neg instructions and changes the semantics of sub when one of the operands is an immediate.

sub r1, 2 now means r1 = 2 - r1, instead of r1 = r1 - 2.
neg r1 is represented as r1 = 0  - r1.

This is the second task in solana-labs/solana#34250.
---
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 40 ++++++++--
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |  7 +-
 llvm/lib/Target/SBF/SBFSubtarget.h            |  9 ++-
 .../CodeGen/SBF/sub_reversed_immediate.ll     | 79 +++++++++++++++++++
 4 files changed, 125 insertions(+), 10 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/sub_reversed_immediate.ll

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 41a66c375408a..c91a7fbe9bed5 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -54,6 +54,8 @@ def SBFIsBigEndian    : Predicate<"!CurDAG->getDataLayout().isLittleEndian()">;
 def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
 def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
 def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
+def SBFv2 : Predicate<"Subtarget->isSBFv2()">;
+def NoSBFv2 : Predicate<"!Subtarget->isSBFv2()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -263,7 +265,7 @@ class ALU_RR<SBFOpClass Class, SBFArithOp Opc,
   let SBFClass = Class;
 }
 
-multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode> {
+multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode, bit UseImmPat = 1> {
   def _rr : ALU_RR<SBF_ALU64, Opc,
                    (outs GPR:$dst),
                    (ins GPR:$src2, GPR:$src),
@@ -273,7 +275,9 @@ multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode> {
                    (outs GPR:$dst),
                    (ins GPR:$src2, i64imm:$imm),
                    Mnemonic # "64 $dst, $imm",
-                   [(set GPR:$dst, (OpNode GPR:$src2, i64immSExt32:$imm))]>;
+                   !if(UseImmPat,
+                       [(set GPR:$dst,
+                            (OpNode GPR:$src2, i64immSExt32:$imm))], [])>;
   def _rr_32 : ALU_RR<SBF_ALU, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, GPR32:$src),
@@ -283,13 +287,15 @@ multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode> {
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, i32imm:$imm),
                    Mnemonic # "32 $dst, $imm",
-                   [(set GPR32:$dst, (OpNode GPR32:$src2, i32immSExt32:$imm))]>;
+                   !if(UseImmPat,
+                       [(set GPR32:$dst,
+                             (OpNode GPR32:$src2, i32immSExt32:$imm))], [])>;
 }
 
 let Constraints = "$dst = $src2" in {
     let isAsCheapAsAMove = 1 in {
         defm ADD : ALU<SBF_ADD, "add", add>;
-        defm SUB : ALU<SBF_SUB, "sub", sub>;
+        defm SUB : ALU<SBF_SUB, "sub", sub, 0>;
         defm OR  : ALU<SBF_OR, "or", or>;
         defm AND : ALU<SBF_AND, "and", and>;
         defm SLL : ALU<SBF_LSH, "lsh", shl>;
@@ -306,6 +312,19 @@ let Constraints = "$dst = $src2" in {
     }
 }
 
+// Special case for SBFv2
+// In SBFv1, `sub reg, imm` is interpreted as reg = reg - imm,
+// but in SBFv2 it means reg = imm - reg
+def : Pat<(sub GPR:$src, i64immSExt32:$imm),
+          (SUB_ri GPR:$src, i64immSExt32:$imm)>, Requires<[NoSBFv2]>;
+def : Pat<(sub GPR32:$src, i32immSExt32:$imm),
+          (SUB_ri_32 GPR32:$src, i32immSExt32:$imm)>, Requires<[NoSBFv2]>;
+
+def : Pat<(sub i64immSExt32:$imm, GPR:$src),
+          (SUB_ri GPR:$src, i64immSExt32:$imm)>, Requires<[SBFv2]>;
+def : Pat<(sub i32immSExt32:$imm, GPR32:$src),
+          (SUB_ri_32 GPR32:$src, i32immSExt32:$imm)>, Requires<[SBFv2]>;
+
 class NEG_RR<SBFOpClass Class, SBFArithOp Opc,
              dag outs, dag ins, string asmstr, list<dag> pattern>
     : TYPE_ALU_JMP<Opc.Value, 0, outs, ins, asmstr, pattern> {
@@ -318,12 +337,21 @@ class NEG_RR<SBFOpClass Class, SBFArithOp Opc,
 let Constraints = "$dst = $src", isAsCheapAsAMove = 1 in {
   def NEG_64: NEG_RR<SBF_ALU64, SBF_NEG, (outs GPR:$dst), (ins GPR:$src),
                      "neg64 $dst",
-                     [(set GPR:$dst, (ineg i64:$src))]>;
+                     []>;
   def NEG_32: NEG_RR<SBF_ALU, SBF_NEG, (outs GPR32:$dst), (ins GPR32:$src),
                      "neg32 $dst",
-                     [(set GPR32:$dst, (ineg i32:$src))]>;
+                     []>;
 }
 
+// Instruction `neg` exists on SBFv1, but not on SBFv2
+// In SBFv2, the negate operation is done with a subtraction
+def : Pat<(ineg i64:$src), (NEG_64 GPR:$src)>, Requires<[NoSBFv2]>;
+def : Pat<(ineg i32:$src), (NEG_32 GPR32:$src)>, Requires<[NoSBFv2]>;
+
+def : Pat<(ineg i64:$src), (SUB_ri GPR:$src, 0)>, Requires<[SBFv2]>;
+def : Pat<(ineg i32:$src), (SUB_ri_32 GPR32:$src, 0)>, Requires<[SBFv2]>;
+
+
 class LD_IMM64<bits<4> Pseudo, string Mnemonic>
     : TYPE_LD_ST<SBF_IMM.Value, SBF_DW.Value,
                  (outs GPR:$dst),
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index e49f6a31c7ba1..deb57c2d539ae 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -42,6 +42,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasDynamicFrames = false;
   HasSdiv = false;
   UseDwarfRIS = false;
+  IsSBFv2 = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
@@ -64,8 +65,10 @@ void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
     HasAlu32 = true;
   }
 
-  if (CPU == "sbfv2" && !HasDynamicFrames) {
-    report_fatal_error("sbfv2 requires dynamic-frames\n", false);
+  if (CPU == "sbfv2") {
+    IsSBFv2 = true;
+    if (!HasDynamicFrames)
+      report_fatal_error("sbfv2 requires dynamic-frames\n", false);
   }
 }
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 2334bbb1bb89b..613e0168f45c3 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -72,13 +72,17 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // whether we should enable MCAsmInfo DwarfUsesRelocationsAcrossSections
   bool UseDwarfRIS;
 
+  // whether we are targeting SBFv2
+  bool IsSBFv2;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
   SBFSubtarget(const Triple &TT, const std::string &CPU, const std::string &FS,
                const TargetMachine &TM);
 
-  SBFSubtarget &initializeSubtargetDependencies(const Triple &TT, StringRef CPU, StringRef FS);
+  SBFSubtarget &initializeSubtargetDependencies(const Triple &TT, StringRef CPU,
+                                                StringRef FS);
 
   // ParseSubtargetFeatures - Parses features string setting specified
   // subtarget options.  Definition of function is auto generated by tblgen.
@@ -90,6 +94,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasDynamicFrames() const { return HasDynamicFrames; }
   bool getHasSdiv() const { return HasSdiv; }
   bool getUseDwarfRIS() const { return UseDwarfRIS; }
+  bool isSBFv2() const { return IsSBFv2; }
 
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
@@ -105,6 +110,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
     return &InstrInfo.getRegisterInfo();
   }
 };
-} // End llvm namespace
+} // namespace llvm
 
 #endif
diff --git a/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll b/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll
new file mode 100644
index 0000000000000..8040eb767b728
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll
@@ -0,0 +1,79 @@
+; RUN: llc < %s -march=sbf -mattr=+alu32 | FileCheck  --check-prefix=CHECK-v1 %s
+; RUN: llc < %s -march=sbf -mattr=+alu32 -mcpu=sbfv2 | FileCheck  --check-prefix=CHECK-v2 %s
+
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @sub_imm_minus_reg_64(i64 %a) #0 {
+entry:
+; CHECK-LABEL: sub_imm_minus_reg_64:
+  %sub = sub nsw i64 50, %a
+
+; CHECK-v1: mov64 r{{[0-9]+}}, 50
+; CHECK-v1: sub64 r{{[0-9]+}}, r{{[0-9]+}}
+
+; CHECK-v2: sub64 r{{[0-9]+}}, 50
+  ret i64 %sub
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @sub_reg_minus_imm_64(i64 %a) #0 {
+entry:
+; CHECK-LABEL: sub_reg_minus_imm_64:
+  %t = sub nsw i64 %a, 50
+; CHECK-v1: add64 r{{[0-9]+}}, -50
+
+; CHECK-v2: add64 r{{[0-9]+}}, -50
+  ret i64 %t
+}
+
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sub_imm_minus_reg_32(i32 %a) #0 {
+entry:
+; CHECK-LABEL: sub_imm_minus_reg_32:
+  %sub = sub nsw i32 50, %a
+
+; CHECK-v1: mov32 w{{[0-9]+}}, 50
+; CHECK-v1: sub32 w{{[0-9]+}}, w{{[0-9]+}}
+
+; CHECK-v2: sub32 w{{[0-9]+}}, 50
+
+  ret i32 %sub
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @sub_reg_minus_imm_32(i32 %a) #0 {
+entry:
+; CHECK-LABEL: sub_reg_minus_imm_32:
+  %t = sub nsw i32 %a, 50
+
+; CHECK-v1: add32 w{{[0-9]+}}, -50
+
+; CHECK-v2: add32 w{{[0-9]+}}, -50
+  ret i32 %t
+}
+
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @neg_64(i64 %a) #0 {
+entry:
+; CHECK-LABEL: neg_64:
+  %sub = sub nsw i64 0, %a
+
+; CHECK-v1: neg64 r{{[0-9]+}}
+; CHECK-v2: sub64 r{{[0-9]+}}, 0
+
+  ret i64 %sub
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @neg_32(i32 %a) #0 {
+entry:
+; CHECK-LABEL: neg_32:
+  %sub = sub nsw i32 0, %a
+
+; CHECK-v1: neg32 w{{[0-9]+}}
+; CHECK-v2: sub32 w{{[0-9]+}}, 0
+
+  ret i32 %sub
+}

From 30cb25a1f0bd64cfbb26cb5176c1cff389b3c11c Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 21 Dec 2023 00:29:39 -0300
Subject: [PATCH 023/114] [SOL] Remove LE byte swap and input buffers (#75)

This PR addressed two more items in solana-labs/solana#34250.
It removes the little endian byte swap instructions (solana-labs/rbpf#493)
and the input buffers related instructions (solana-labs/rbpf#251).
---
 .../SBF/Disassembler/SBFDisassembler.cpp      | 59 ++++++++-----------
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 40 -------------
 llvm/test/CodeGen/SBF/ninline_asm.ll          |  4 --
 llvm/test/MC/Disassembler/SBF/sbf-alu.txt     |  6 --
 llvm/test/MC/Disassembler/SBF/sbf-ldst.txt    | 14 -----
 llvm/test/MC/SBF/sbf-alu.s                    |  9 ---
 llvm/test/MC/SBF/sbf-ldst.s                   | 21 -------
 7 files changed, 24 insertions(+), 129 deletions(-)

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 042776f28bb25..c5f454c783f90 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -44,12 +44,7 @@ class SBFDisassembler : public MCDisassembler {
     SBF_ALU64 = 0x7
   };
 
-  enum SBF_SIZE {
-    SBF_W = 0x0,
-    SBF_H = 0x1,
-    SBF_B = 0x2,
-    SBF_DW = 0x3
-  };
+  enum SBF_SIZE { SBF_W = 0x0, SBF_H = 0x1, SBF_B = 0x2, SBF_DW = 0x3 };
 
   enum SBF_MODE {
     SBF_IMM = 0x0,
@@ -82,7 +77,6 @@ static MCDisassembler *createSBFDisassembler(const Target &T,
   return new SBFDisassembler(STI, Ctx);
 }
 
-
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFDisassembler() {
   // Register the disassembler.
   TargetRegistry::RegisterMCDisassembler(getTheSBFXTarget(),
@@ -90,8 +84,8 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFDisassembler() {
 }
 
 static const unsigned GPRDecoderTable[] = {
-    SBF::R0,  SBF::R1,  SBF::R2,  SBF::R3,  SBF::R4,  SBF::R5,
-    SBF::R6,  SBF::R7,  SBF::R8,  SBF::R9,  SBF::R10, SBF::R11};
+    SBF::R0, SBF::R1, SBF::R2, SBF::R3, SBF::R4,  SBF::R5,
+    SBF::R6, SBF::R7, SBF::R8, SBF::R9, SBF::R10, SBF::R11};
 
 static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, unsigned RegNo,
                                            uint64_t /*Address*/,
@@ -105,8 +99,8 @@ static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, unsigned RegNo,
 }
 
 static const unsigned GPR32DecoderTable[] = {
-    SBF::W0,  SBF::W1,  SBF::W2,  SBF::W3,  SBF::W4,  SBF::W5,
-    SBF::W6,  SBF::W7,  SBF::W8,  SBF::W9,  SBF::W10, SBF::W11};
+    SBF::W0, SBF::W1, SBF::W2, SBF::W3, SBF::W4,  SBF::W5,
+    SBF::W6, SBF::W7, SBF::W8, SBF::W9, SBF::W10, SBF::W11};
 
 static DecodeStatus
 DecodeGPR32RegisterClass(MCInst &Inst, unsigned RegNo, uint64_t /*Address*/,
@@ -146,12 +140,15 @@ static DecodeStatus readInstruction64(ArrayRef<uint8_t> Bytes, uint64_t Address,
 
   Size = 8;
   if (IsLittleEndian) {
-    Hi = (Bytes[0] << 24) | (Bytes[1] << 16) | (Bytes[2] << 0) | (Bytes[3] << 8);
-    Lo = (Bytes[4] << 0) | (Bytes[5] << 8) | (Bytes[6] << 16) | (Bytes[7] << 24);
+    Hi =
+        (Bytes[0] << 24) | (Bytes[1] << 16) | (Bytes[2] << 0) | (Bytes[3] << 8);
+    Lo =
+        (Bytes[4] << 0) | (Bytes[5] << 8) | (Bytes[6] << 16) | (Bytes[7] << 24);
   } else {
-    Hi = (Bytes[0] << 24) | ((Bytes[1] & 0x0F) << 20) | ((Bytes[1] & 0xF0) << 12) |
-         (Bytes[2] << 8) | (Bytes[3] << 0);
-    Lo = (Bytes[4] << 24) | (Bytes[5] << 16) | (Bytes[6] << 8) | (Bytes[7] << 0);
+    Hi = (Bytes[0] << 24) | ((Bytes[1] & 0x0F) << 20) |
+         ((Bytes[1] & 0xF0) << 12) | (Bytes[2] << 8) | (Bytes[3] << 0);
+    Lo =
+        (Bytes[4] << 24) | (Bytes[5] << 16) | (Bytes[6] << 8) | (Bytes[7] << 0);
   }
   Insn = Make_64(Hi, Lo);
 
@@ -167,7 +164,8 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
   DecodeStatus Result;
 
   Result = readInstruction64(Bytes, Address, Size, Insn, IsLittleEndian);
-  if (Result == MCDisassembler::Fail) return MCDisassembler::Fail;
+  if (Result == MCDisassembler::Fail)
+    return MCDisassembler::Fail;
 
   uint8_t InstClass = getInstClass(Insn);
   uint8_t InstMode = getInstMode(Insn);
@@ -178,10 +176,11 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
     Result = decodeInstruction(DecoderTableSBFALU3264, Instr, Insn, Address,
                                this, STI);
   else
-    Result = decodeInstruction(DecoderTableSBF64, Instr, Insn, Address, this,
-                               STI);
+    Result =
+        decodeInstruction(DecoderTableSBF64, Instr, Insn, Address, this, STI);
 
-  if (Result == MCDisassembler::Fail) return MCDisassembler::Fail;
+  if (Result == MCDisassembler::Fail)
+    return MCDisassembler::Fail;
 
   switch (Instr.getOpcode()) {
   case SBF::LD_imm64:
@@ -192,25 +191,15 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
     }
     Size = 16;
     if (IsLittleEndian)
-      Hi = (Bytes[12] << 0) | (Bytes[13] << 8) | (Bytes[14] << 16) | (Bytes[15] << 24);
+      Hi = (Bytes[12] << 0) | (Bytes[13] << 8) | (Bytes[14] << 16) |
+           (Bytes[15] << 24);
     else
-      Hi = (Bytes[12] << 24) | (Bytes[13] << 16) | (Bytes[14] << 8) | (Bytes[15] << 0);
-    auto& Op = Instr.getOperand(1);
+      Hi = (Bytes[12] << 24) | (Bytes[13] << 16) | (Bytes[14] << 8) |
+           (Bytes[15] << 0);
+    auto &Op = Instr.getOperand(1);
     Op.setImm(Make_64(Hi, Op.getImm()));
     break;
   }
-  case SBF::LD_ABS_B:
-  case SBF::LD_ABS_H:
-  case SBF::LD_ABS_W:
-  case SBF::LD_IND_B:
-  case SBF::LD_IND_H:
-  case SBF::LD_IND_W: {
-    auto Op = Instr.getOperand(0);
-    Instr.clear();
-    Instr.addOperand(MCOperand::createReg(SBF::R6));
-    Instr.addOperand(Op);
-    break;
-  }
   }
 
   return Result;
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index c91a7fbe9bed5..f2e5888fdb05a 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -896,48 +896,8 @@ let Constraints = "$dst = $src" in {
         def BE32 : BSWAP<32, "be32", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 32)))]>;
         def BE64 : BSWAP<64, "be64", SBF_TO_BE, [(set GPR:$dst, (bswap GPR:$src))]>;
     }
-    let Predicates = [SBFIsBigEndian] in {
-        def LE16 : BSWAP<16, "le16", SBF_TO_LE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 48)))]>;
-        def LE32 : BSWAP<32, "le32", SBF_TO_LE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 32)))]>;
-        def LE64 : BSWAP<64, "le64", SBF_TO_LE, [(set GPR:$dst, (bswap GPR:$src))]>;
-    }
-}
-
-let Defs = [R0, R1, R2, R3, R4, R5], Uses = [R6], hasSideEffects = 1,
-    hasExtraDefRegAllocReq = 1, hasExtraSrcRegAllocReq = 1, mayLoad = 1 in {
-class LOAD_ABS<SBFWidthModifer SizeOp, string Mnemonic, Intrinsic OpNode>
-    : TYPE_LD_ST<SBF_ABS.Value, SizeOp.Value,
-                 (outs),
-                 (ins GPR:$skb, i64imm:$imm),
-                 Mnemonic # " $imm",
-                 [(set R0, (OpNode GPR:$skb, i64immSExt32:$imm))]> {
-  bits<32> imm;
-
-  let Inst{31-0} = imm;
-  let SBFClass = SBF_LD;
 }
 
-class LOAD_IND<SBFWidthModifer SizeOp, string Mnemonic, Intrinsic OpNode>
-    : TYPE_LD_ST<SBF_IND.Value, SizeOp.Value,
-                 (outs),
-                 (ins GPR:$skb, GPR:$val),
-                 Mnemonic # " $val",
-                 [(set R0, (OpNode GPR:$skb, GPR:$val))]> {
-  bits<4> val;
-
-  let Inst{55-52} = val;
-  let SBFClass = SBF_LD;
-}
-}
-
-def LD_ABS_B : LOAD_ABS<SBF_B, "ldabsb", int_bpf_load_byte>;
-def LD_ABS_H : LOAD_ABS<SBF_H, "ldabsh", int_bpf_load_half>;
-def LD_ABS_W : LOAD_ABS<SBF_W, "ldabsw", int_bpf_load_word>;
-
-def LD_IND_B : LOAD_IND<SBF_B, "ldindb", int_bpf_load_byte>;
-def LD_IND_H : LOAD_IND<SBF_H, "ldindh", int_bpf_load_half>;
-def LD_IND_W : LOAD_IND<SBF_W, "ldindw", int_bpf_load_word>;
-
 let isCodeGenOnly = 1 in {
   def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
diff --git a/llvm/test/CodeGen/SBF/ninline_asm.ll b/llvm/test/CodeGen/SBF/ninline_asm.ll
index f3412ac0b90ed..ab6c1140c2751 100644
--- a/llvm/test/CodeGen/SBF/ninline_asm.ll
+++ b/llvm/test/CodeGen/SBF/ninline_asm.ll
@@ -9,10 +9,6 @@ entry:
   %0 = bitcast i32* %a to i8*
   call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %0) #2
   store i32 4, i32* %a, align 4
-  tail call void asm sideeffect "ldabsh $0", "i"(i32 2) #2
-; CHECK: ldabsh 2 
-  tail call void asm sideeffect "ldindh $0", "r"(i32 4) #2
-; CHECK: ldindh r1
   %1 = tail call i32 asm sideeffect "mov64 $0, $1", "=r,i"(i32 4) #2
 ; CHECK: mov64 r1, 4
   %2 = tail call i32 asm sideeffect "lddw $0, $1", "=r,i"(i64 333333333333) #2
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
index 148512dda5727..3fe06e375a46c 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
@@ -252,15 +252,9 @@
 
 
 
-# CHECK-NEW: le16 r3
-# CHECK-NEW: le32 r4
-# CHECK-NEW: le64 r5
 # CHECK-NEW: be16 r0
 # CHECK-NEW: be32 r1
 # CHECK-NEW: be64 r2
-0xd4,0x03,0x00,0x00,0x10,0x00,0x00,0x00
-0xd4,0x04,0x00,0x00,0x20,0x00,0x00,0x00
-0xd4,0x05,0x00,0x00,0x40,0x00,0x00,0x00
 0xdc,0x00,0x00,0x00,0x10,0x00,0x00,0x00
 0xdc,0x01,0x00,0x00,0x20,0x00,0x00,0x00
 0xdc,0x02,0x00,0x00,0x40,0x00,0x00,0x00
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
index ddf5818119076..00541d55cc404 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
@@ -130,17 +130,3 @@
 0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00
 
 
-
-# Obsolete ldabs/ldind for completeness.
-# CHECK-NEW: ldabsb 64 
-# CHECK-NEW: ldabsh 128 
-# CHECK-NEW: ldabsw 0
-# CHECK-NEW: ldindb r5
-# CHECK-NEW: ldindh r9
-# CHECK-NEW: ldindw r7
-0x30,0x00,0x00,0x00,0x40,0x00,0x00,0x00
-0x28,0x00,0x00,0x00,0x80,0x00,0x00,0x00
-0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00
-0x48,0x90,0x00,0x00,0x00,0x00,0x00,0x00
-0x40,0x70,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 919e323a22e5b..2f763a0de0917 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -330,21 +330,12 @@ mov32 w5, -123
 
 
 
-# CHECK-OBJ-NEW: le16 r3
-# CHECK-OBJ-NEW: le32 r4
-# CHECK-OBJ-NEW: le64 r5
 # CHECK-OBJ-NEW: be16 r0
 # CHECK-OBJ-NEW: be32 r1
 # CHECK-OBJ-NEW: be64 r2
-# CHECK-ASM-NEW: encoding: [0xd4,0x03,0x00,0x00,0x10,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0xd4,0x04,0x00,0x00,0x20,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0xd4,0x05,0x00,0x00,0x40,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdc,0x00,0x00,0x00,0x10,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdc,0x01,0x00,0x00,0x20,0x00,0x00,0x00]
 # CHECK-ASM-NEW: encoding: [0xdc,0x02,0x00,0x00,0x40,0x00,0x00,0x00]
-le16 r3
-le32 r4
-le64 r5
 be16 r0
 be32 r1
 be64 r2
diff --git a/llvm/test/MC/SBF/sbf-ldst.s b/llvm/test/MC/SBF/sbf-ldst.s
index 227f8235d51a3..001b9f8d51838 100644
--- a/llvm/test/MC/SBF/sbf-ldst.s
+++ b/llvm/test/MC/SBF/sbf-ldst.s
@@ -183,24 +183,3 @@ stxxchgw [r8 - 16], w0
 stxcmpxchgdw [r8 - 16], r5
 stxcmpxchgw [r8 - 16], w5
 
-
-
-# Obsolete ldabs/ldind for completeness.
-# CHECK-OBJ-NEW: ldabsb 0x40
-# CHECK-OBJ-NEW: ldabsh 0x80
-# CHECK-OBJ-NEW: ldabsw 0
-# CHECK-OBJ-NEW: ldindb r5
-# CHECK-OBJ-NEW: ldindh r9
-# CHECK-OBJ-NEW: ldindw r7
-# CHECK-ASM-NEW: encoding: [0x30,0x00,0x00,0x00,0x40,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x28,0x00,0x00,0x00,0x80,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x48,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x40,0x70,0x00,0x00,0x00,0x00,0x00,0x00]
-ldabsb 64
-ldabsh 128
-ldabsw 0
-ldindb r5
-ldindh r9
-ldindw r7

From f4ea2e13884b00b7ee88427a48313de4fe716679 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Sat, 23 Dec 2023 13:52:19 -0300
Subject: [PATCH 024/114] [SOL] Remove `lddw` instruction (#74)

* Remove lddw instruction

* Add suggestions
---
 .../SBF/MCTargetDesc/SBFMCCodeEmitter.cpp     | 12 ++-
 llvm/lib/Target/SBF/SBFInstrFormats.td        |  1 +
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 60 ++++++++++++-
 llvm/test/CodeGen/SBF/cc_args.ll              | 88 +++++++++++--------
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |  9 +-
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      | 23 ++++-
 llvm/test/CodeGen/SBF/objdump_static_var.ll   |  6 +-
 llvm/test/MC/Disassembler/SBF/sbf-alu.txt     |  2 +
 llvm/test/MC/SBF/insn-unit.s                  |  2 +
 llvm/test/MC/SBF/sbf-alu.s                    |  3 +
 10 files changed, 153 insertions(+), 53 deletions(-)

diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
index 24880f0bdc1e4..5c5da990ec745 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
@@ -93,17 +93,21 @@ unsigned SBFMCCodeEmitter::getMachineOpValue(const MCInst &MI,
   if (MI.getOpcode() == SBF::JAL)
     // func call name
     Fixups.push_back(MCFixup::create(0, Expr, FK_PCRel_4));
-  else if (MI.getOpcode() == SBF::LD_imm64)
+  else if (MI.getOpcode() == SBF::LD_imm64 ||
+           MI.getOpcode() == SBF::MOV_32_64_addr)
     Fixups.push_back(MCFixup::create(0, Expr, FK_SecRel_8));
-  else
+  // In SBFv2, LD_imm64 is replaced by MOV_32_64_addr and HOR_addr when loading
+  // addresses. These two instructions always appear together, so if a
+  // relocation is necessary, we only insert it for one of them, in this case
+  // MOV_32_64.
+  else if (MI.getOpcode() != SBF::HOR_addr)
     // bb label
     Fixups.push_back(MCFixup::create(0, Expr, FK_PCRel_2));
 
   return 0;
 }
 
-static uint8_t SwapBits(uint8_t Val)
-{
+static uint8_t SwapBits(uint8_t Val) {
   return (Val & 0x0F) << 4 | (Val & 0xF0) >> 4;
 }
 
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
index bb42a6141e6d0..8bb8281c42185 100644
--- a/llvm/lib/Target/SBF/SBFInstrFormats.td
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -44,6 +44,7 @@ def SBF_MOV  : SBFArithOp<0xb>;
 def SBF_ARSH : SBFArithOp<0xc>;
 def SBF_END  : SBFArithOp<0xd>;
 def SBF_SDIV : SBFArithOp<0xe>;
+def SBF_HOR  : SBFArithOp<0xf>;
 
 def SBF_XCHG    : SBFArithOp<0xe>;
 def SBF_CMPXCHG : SBFArithOp<0xf>;
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index f2e5888fdb05a..2acc18db40056 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -71,6 +71,21 @@ def i64immSExt32 : PatLeaf<(i64 imm),
 def i32immSExt32 : PatLeaf<(i32 imm),
                 [{return isInt<32>(N->getSExtValue()); }]>;
 
+// Fetch the upper 32-bits of a 64-bit integer.
+def Upper32 : SDNodeXForm<imm, [{
+  uint64_t value = N->getSExtValue() >> 32;
+  return CurDAG->getTargetConstant(value, SDLoc(N),
+                                   N->getValueType(0));
+}]>;
+
+// Fetch the lower 32-bits of a 64-bit integer.
+def Lower32 : SDNodeXForm<imm, [{
+  uint64_t value = N->getSExtValue() & 0x00000000ffffffff;
+  return CurDAG->getTargetConstant(value, SDLoc(N),
+                                   N->getValueType(0));
+}]>;
+
+
 // Addressing modes.
 def ADDRri : ComplexPattern<i64, 2, "SelectAddr", [], []>;
 def FIri : ComplexPattern<i64, 2, "SelectFIAddr", [add, or], []>;
@@ -302,6 +317,22 @@ let Constraints = "$dst = $src2" in {
         defm SRL : ALU<SBF_RSH, "rsh", srl>;
         defm XOR : ALU<SBF_XOR, "xor", xor>;
         defm SRA : ALU<SBF_ARSH, "arsh", sra>;
+
+        let Predicates = [SBFv2] in {
+            def HOR :  ALU_RI<SBF_ALU64, SBF_HOR,
+                        (outs GPR:$dst),
+                        (ins GPR:$src2, i32imm:$imm),
+                        "hor64 $dst, $imm",
+                        []>;
+            let DecoderNamespace = "AddrLoad" in {
+              def HOR_addr :  ALU_RI<SBF_ALU64, SBF_HOR,
+                                      (outs GPR:$dst),
+                                      (ins GPR:$src2, u64imm:$imm),
+                                      "hor64 $dst, $imm",
+                                      []>;
+
+            }
+        }
     }
 
     defm MUL : ALU<SBF_MUL, "mul", mul>;
@@ -370,7 +401,7 @@ class LD_IMM64<bits<4> Pseudo, string Mnemonic>
 }
 
 let isReMaterializable = 1, isAsCheapAsAMove = 1 in {
-def LD_imm64 : LD_IMM64<0, "lddw">;
+def LD_imm64 : LD_IMM64<0, "lddw">, Requires<[NoSBFv2]>;
 def MOV_rr : ALU_RR<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins GPR:$src),
@@ -632,9 +663,6 @@ let usesCustomInserter = 1, isCodeGenOnly = 1 in {
                        (SBFselectcc i32:$lhs, (i32immSExt32:$rhs), (i32 imm:$imm), i64:$src, i64:$src2))]>;
 }
 
-// load 64-bit global addr into register
-def : Pat<(SBFWrapper tglobaladdr:$in), (LD_imm64 tglobaladdr:$in)>;
-
 // 0xffffFFFF doesn't fit into simm32, optimize common case
 def : Pat<(i64 (and (i64 GPR:$src), 0xffffFFFF)),
           (SRL_ri (SLL_ri (i64 GPR:$src), 32), 32)>;
@@ -902,8 +930,32 @@ let isCodeGenOnly = 1 in {
   def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
                          "mov32 $dst, $src", []>;
+  let Predicates = [SBFv2] in {
+    def MOV_32_64_imm : ALU_RI<SBF_ALU, SBF_MOV,
+                               (outs GPR:$dst), (ins i32imm:$imm),
+                               "mov32 $dst, $imm", []>;
+    def MOV_32_64_addr : ALU_RI<SBF_ALU, SBF_MOV,
+                           (outs GPR:$dst), (ins u64imm:$imm),
+                           "mov32 $dst, $imm", []>;
+  }
 }
 
+// In SBFv2, a CopyToReg of a 64-bit value is split in two instructions:
+// mov32 r1, 0x55667788
+// hor r1, 0x11223344
+// These instructions copy the value 0x1122334455667788 to a register.
+def : Pat<(i64 imm:$imm),
+            (HOR (MOV_32_64_imm (i32 (Lower32 $imm))),
+                       (i32 (Upper32 $imm)))>, Requires<[SBFv2]>;
+
+// load 64-bit global address into register.
+def : Pat<(SBFWrapper tglobaladdr:$in), (LD_imm64 tglobaladdr:$in)>,
+                                                    Requires<[NoSBFv2]>;
+def : Pat<(SBFWrapper tglobaladdr:$in),
+        (HOR_addr (MOV_32_64_addr tglobaladdr:$in),
+                            tglobaladdr:$in)>, Requires<[SBFv2]>;
+
+
 def : Pat<(i64 (sext GPR32:$src)),
           (SRA_ri (SLL_ri (MOV_32_64 GPR32:$src), 32), 32)>;
 
diff --git a/llvm/test/CodeGen/SBF/cc_args.ll b/llvm/test/CodeGen/SBF/cc_args.ll
index 3b7f46eb74409..13cee14aa0373 100644
--- a/llvm/test/CodeGen/SBF/cc_args.ll
+++ b/llvm/test/CodeGen/SBF/cc_args.ll
@@ -1,36 +1,52 @@
-; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck --check-prefix=CHECK-v1 %s
+; RUN: llc < %s -march=sbf -mcpu=sbfv2 -show-mc-encoding | FileCheck --check-prefix=CHECK-v2 %s
 
 define void @test() #0 {
 entry:
-; CHECK: test:
+; CHECK-LABEL: test:
 
-; CHECK: mov64 r1, 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
-; CHECK: call f_i16
+; CHECK-v1: mov64 r1, 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
+; CHECK-v2: mov64 r1, 123
+; CHECK-v1: call f_i16
   call void @f_i16(i16 123)
 
-; CHECK: mov64 r1, 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
-; CHECK: call f_i32
+; CHECK-v1: mov64 r1, 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
+; CHECK-v2: mov64 r1, 12345678
+; CHECK-v1: call f_i32
   call void @f_i32(i32 12345678)
 
-; CHECK: lddw r1, 72623859790382856 # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
-; CHECK: call f_i64
+; 72623859790382856 = 0x0102030405060708
+; 84281096 = 0x05060708
+; 16909060 = 0x01020304
+
+; CHECK-v2: mov32 r1, 84281096  # encoding: [0xb4,0x01,0x00,0x00,0x08,0x07,0x06,0x05]
+; CHECK-v2: hor64 r1, 16909060  # encoding: [0xf7,0x01,0x00,0x00,0x04,0x03,0x02,0x01]
+
+; CHECK-v1: lddw r1, 72623859790382856 # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
+; CHECK-v1: call f_i64
   call void @f_i64(i64 72623859790382856)
 
-; CHECK: mov64 r1, 1234
-; CHECK: mov64 r2, 5678
-; CHECK: call f_i32_i32
+; CHECK-v1: mov64 r1, 1234
+; CHECK-v1: mov64 r2, 5678
+; CHECK-v1: call f_i32_i32
   call void @f_i32_i32(i32 1234, i32 5678)
 
-; CHECK: mov64 r1, 2
-; CHECK: mov64 r2, 3
-; CHECK: mov64 r3, 4
-; CHECK: call f_i16_i32_i16
+; CHECK-v1: mov64 r1, 2
+; CHECK-v1: mov64 r2, 3
+; CHECK-v1: mov64 r3, 4
+; CHECK-v1: call f_i16_i32_i16
   call void @f_i16_i32_i16(i16 2, i32 3, i16 4)
 
-; CHECK: mov64 r1, 5
-; CHECK: lddw r2, 7262385979038285
-; CHECK: mov64 r3, 6
-; CHECK: call f_i16_i64_i16
+; 7262385979038285 = 0x0019CD1A00809A4D
+; 8428109 = 0x00809A4D
+; 1690906 = 0x0019CD1A
+; CHECK-v2: mov32 r2, 8428109
+; CHECK-v2: hor64 r2, 1690906
+
+; CHECK-v1: mov64 r1, 5
+; CHECK-v1: lddw r2, 7262385979038285
+; CHECK-v1: mov64 r3, 6
+; CHECK-v1: call f_i16_i64_i16
   call void @f_i16_i64_i16(i16 5, i64 7262385979038285, i16 6)
 
   ret void
@@ -41,53 +57,53 @@ entry:
 @g_i64 = common global i64 0, align 4
 
 define void @f_i16(i16 %a) #0 {
-; CHECK: f_i16:
-; CHECK: stxh [r2 + 0], r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v1: f_i16:
+; CHECK-v1: stxh [r2 + 0], r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i16 %a, i16* @g_i16, align 2
   ret void
 }
 
 define void @f_i32(i32 %a) #0 {
-; CHECK: f_i32:
-; CHECK: stxw [r2 + 0], r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v1: f_i32:
+; CHECK-v1: stxw [r2 + 0], r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i32 %a, i32* @g_i32, align 2
   ret void
 }
 
 define void @f_i64(i64 %a) #0 {
-; CHECK: f_i64:
-; CHECK: stxdw [r2 + 0], r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v1: f_i64:
+; CHECK-v1: stxdw [r2 + 0], r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i64 %a, i64* @g_i64, align 2
   ret void
 }
 
 define void @f_i32_i32(i32 %a, i32 %b) #0 {
-; CHECK: f_i32_i32:
-; CHECK: stxw [r3 + 0], r1
+; CHECK-v1: f_i32_i32:
+; CHECK-v1: stxw [r3 + 0], r1
   store volatile i32 %a, i32* @g_i32, align 4
-; CHECK: stxw [r3 + 0], r2
+; CHECK-v1: stxw [r3 + 0], r2
   store volatile i32 %b, i32* @g_i32, align 4
   ret void
 }
 
 define void @f_i16_i32_i16(i16 %a, i32 %b, i16 %c) #0 {
-; CHECK: f_i16_i32_i16:
-; CHECK: stxh [r4 + 0], r1
+; CHECK-v1: f_i16_i32_i16:
+; CHECK-v1: stxh [r4 + 0], r1
   store volatile i16 %a, i16* @g_i16, align 2
-; CHECK: stxw [r1 + 0], r2
+; CHECK-v1: stxw [r1 + 0], r2
   store volatile i32 %b, i32* @g_i32, align 4
-; CHECK: stxh [r4 + 0], r3
+; CHECK-v1: stxh [r4 + 0], r3
   store volatile i16 %c, i16* @g_i16, align 2
   ret void
 }
 
 define void @f_i16_i64_i16(i16 %a, i64 %b, i16 %c) #0 {
-; CHECK: f_i16_i64_i16:
-; CHECK: stxh [r4 + 0], r1
+; CHECK-v1: f_i16_i64_i16:
+; CHECK-v1: stxh [r4 + 0], r1
   store volatile i16 %a, i16* @g_i16, align 2
-; CHECK: stxdw [r1 + 0], r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v1: stxdw [r1 + 0], r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i64 %b, i64* @g_i64, align 8
-; CHECK: stxh [r4 + 0], r3
+; CHECK-v1: stxh [r4 + 0], r3
   store volatile i16 %c, i16* @g_i16, align 2
   ret void
 }
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index 4415b3d64cc8c..dc32f30c01a8b 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -34,7 +34,8 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %10 = load i32, i32* @gbl, align 4
   br i1 %9, label %15, label %11
 
-; CHECK: lddw r1, 0x0
+; CHECK: mov32 w1, 0x0
+; CHECK: hor64 r1, 0x0
 ; CHECK: ldxw r0, [r1 + 0x0]
 ; CHECK: mul64 r0, r0
 ; CHECK: lsh64 r0, 0x1
@@ -45,7 +46,8 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   br label %13
 
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: lddw r3, 0x0
+; CHECK: mov32 w3, 0x0
+; CHECK: hor64 r3, 0x0
 ; CHECK: ldxw r0, [r3 + 0x0]
 ; CHECK: lsh64 r2, 0x20
 ; CHECK: rsh64 r2, 0x20
@@ -57,7 +59,8 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   store i32 %14, i32* @gbl, align 4
   br label %15
 ; CHECK-LABEL: <LBB0_4>:
-; CHECK: lddw r1, 0x0
+; CHECK: mov32 w1, 0x0
+; CHECK: hor64 r1, 0x0
 ; CHECK: stxw [r1 + 0x0], r0
 
 ; <label>:15:                                     ; preds = %8, %13
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
index 40fd3caee878f..0fe239eaf1780 100644
--- a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -1,5 +1,6 @@
 ; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-DEC %s
 ; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d --print-imm-hex - | FileCheck --check-prefix=CHECK-HEX %s
+; RUN: llc < %s -march=sbf -mcpu=sbfv2 -show-mc-encoding | FileCheck --check-prefix=CHECK-REL %s
 
 ; Source Code:
 ; int gbl;
@@ -25,12 +26,19 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 ; CHECK-LABEL: test
   %3 = icmp eq i64 %0, -6067004223159161907
   br i1 %3, label %4, label %8
-; CHECK-DEC: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -0x5432543254325433
+; CHECK-DEC: b4 03 00 00 cd ab cd ab	mov32 w3, -0x54325433
+; CHECK-DEC: f7 03 00 00 cd ab cd ab	hor64 r3, -0x54325433
 ; CHECK-DEC: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
-; CHECK-HEX: 18 03 00 00 cd ab cd ab 00 00 00 00 cd ab cd ab         lddw r3, -0x5432543254325433
+; CHECK-HEX: b4 03 00 00 cd ab cd ab	mov32 w3, -0x54325433
+; CHECK-HEX: f7 03 00 00 cd ab cd ab	hor64 r3, -0x54325433
 ; CHECK-HEX: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
 
 ; <label>:4:                                      ; preds = %2
+; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-DEC: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
+; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-HEX: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
+; CHECK-REL:   fixup A - offset: 0, value: gbl, kind: FK_SecRel_8
   %5 = load i32, i32* @gbl, align 4
   %6 = shl i32 %5, 1
 ; CHECK-DEC: 67 01 00 00 01 00 00 00         lsh64 r1, 0x1
@@ -40,11 +48,18 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i64 %1, 188899839028173
-; CHECK-DEC: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 0xabcdabcdabcd
-; CHECK-HEX: 18 01 00 00 cd ab cd ab 00 00 00 00 cd ab 00 00         lddw r1, 0xabcdabcdabcd
+; CHECK-DEC: b4 01 00 00 cd ab cd ab	mov32 w1, -0x54325433
+; CHECK-DEC: f7 01 00 00 cd ab 00 00	hor64 r1, 0xabcd
+; CHECK-HEX: b4 01 00 00 cd ab cd ab	mov32 w1, -0x54325433
+; CHECK-HEX: f7 01 00 00 cd ab 00 00	hor64 r1, 0xabcd
   br i1 %9, label %10, label %16
 
 ; <label>:10:                                     ; preds = %8
+; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-DEC: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
+; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-HEX: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
+; CHECK-REL: fixup A - offset: 0, value: gbl, kind: FK_SecRel_8
   %11 = load i32, i32* @gbl, align 4
   %12 = shl nsw i32 %11, 2
   br label %13
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index 7a3e2d7257ece..8e4fe390529ce 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -10,12 +10,14 @@
 ; Function Attrs: norecurse nounwind
 define dso_local i32 @test() local_unnamed_addr #0 {
   %1 = load volatile i64, i64* @a, align 8, !tbaa !2
-; CHECK: lddw r1, 0x0
+; CHECK: mov32 w1, 0x0
 ; CHECK: R_SBF_64_64	a
+; CHECK: hor64 r1, 0x0
 ; CHECK: ldxdw r1, [r1 + 0x0]
   %2 = load volatile i32, i32* @b, align 4, !tbaa !6
-; CHECK: lddw r2, 0x0
+; CHECK: mov32 w2, 0x0
 ; CHECK: R_SBF_64_64	b
+; CHECK: hor64 r2, 0x0
 ; CHECK: ldxw r0, [r2 + 0x0]
   %3 = trunc i64 %1 to i32
   %4 = add i32 %2, %3
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
index 3fe06e375a46c..38b3f10efe04e 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
@@ -102,6 +102,8 @@
 0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
 
 
+# CHECK-NEW: hor64 r0, 129
+0xf7,0x90,0x00,0x00,0x81,0x00,0x00,0x00
 
 # CHECK-NEW: or64 r0, r9
 0x4f,0x90,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
index 3d85a9c9394e4..ed24fdcf0b522 100644
--- a/llvm/test/MC/SBF/insn-unit.s
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -149,6 +149,7 @@ Llabel0 :
   mov64 r9, 1            // BPF_MOV  | BPF_K
   mov64 r9, 0xffffffff   // BPF_MOV  | BPF_K
   arsh64 r10, 64       // BPF_ARSH | BPF_K
+  hor64 r3, 0xcafe      // SBF_HOR
 // CHECK: 47 04 00 00 ff 00 00 00 	or64 r4, 0xff
 // CHECK: 57 05 00 00 ff 00 00 00 	and64 r5, 0xff
 // CHECK: 67 06 00 00 3f 00 00 00 	lsh64 r6, 0x3f
@@ -157,3 +158,4 @@ Llabel0 :
 // CHECK: b7 09 00 00 01 00 00 00 	mov64 r9, 0x1
 // CHECK: b7 09 00 00 ff ff ff ff 	mov64 r9, -0x1
 // CHECK: c7 0a 00 00 40 00 00 00 	arsh64 r10, 0x40
+// CHECK: f7 03 00 00 fe ca 00 00	hor64 r3, 0xcafe
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 2f763a0de0917..75ddd021b8f9f 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -135,6 +135,9 @@ sdiv32 w6, w2
 # CHECK-ASM-NEW: encoding: [0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 sdiv32 w5, -123
 
+# CHECK-OBJ-NEW: hor64 r0, 0x2c4
+# CHECK-ASM-NEW: encoding: [0xf7,0x00,0x00,0x00,0xc4,0x02,0x00,0x00]
+hor64 r0, 708
 
 
 # CHECK-OBJ-NEW: or64 r0, r9

From 3565a7b7e94872a22e719212d31df22de1b85f64 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 3 Jan 2024 13:13:06 -0300
Subject: [PATCH 025/114] [SOL] Add feature flag for the removal of neg and the
 new semantics of sub (#76)

---
 llvm/lib/Target/SBF/SBF.td          |  9 ++++++++-
 llvm/lib/Target/SBF/SBFInstrInfo.td | 20 ++++++++++++--------
 llvm/lib/Target/SBF/SBFSubtarget.h  |  9 +++++++++
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
index 30520e99cad7d..c718c9f92bbad 100644
--- a/llvm/lib/Target/SBF/SBF.td
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -38,6 +38,12 @@ def FeatureRelocAbs64 : SubtargetFeature<"reloc-abs64", "UseRelocAbs64", "true",
 def FeatureStaticSyscalls : SubtargetFeature<"static-syscalls", "HasStaticSyscalls", "true",
                                    "Marker feature used for conditional compilation">;
 
+def FeatureDisableNeg : SubtargetFeature<"no-neg", "DisableNeg", "true",
+                                    "Disable the neg instruction">;
+
+def FeatureReverseSubImm : SubtargetFeature<"reverse-sub", "ReverseSubImm", "true",
+                                    "Reverse the operands in the 'sub reg, imm' instruction">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
@@ -46,7 +52,8 @@ def : Proc<"v1", []>;
 def : Proc<"v2", []>;
 def : Proc<"v3", []>;
 def : Proc<"probe", []>;
-def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls]>;
+def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls,
+                        FeatureDisableNeg, FeatureReverseSubImm]>;
 
 //===----------------------------------------------------------------------===//
 // Assembly printer
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 2acc18db40056..9874b80e23e20 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -56,6 +56,10 @@ def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
 def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
 def SBFv2 : Predicate<"Subtarget->isSBFv2()">;
 def NoSBFv2 : Predicate<"!Subtarget->isSBFv2()">;
+def SBFHasNeg : Predicate<"!Subtarget->getDisableNeg()">;
+def SBFNoNeg: Predicate<"Subtarget->getDisableNeg()">;
+def SBFRevSub : Predicate<"Subtarget->getReverseSubImm()">;
+def SBFNoRevSub : Predicate<"!Subtarget->getReverseSubImm()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -347,14 +351,14 @@ let Constraints = "$dst = $src2" in {
 // In SBFv1, `sub reg, imm` is interpreted as reg = reg - imm,
 // but in SBFv2 it means reg = imm - reg
 def : Pat<(sub GPR:$src, i64immSExt32:$imm),
-          (SUB_ri GPR:$src, i64immSExt32:$imm)>, Requires<[NoSBFv2]>;
+          (SUB_ri GPR:$src, i64immSExt32:$imm)>, Requires<[SBFNoRevSub]>;
 def : Pat<(sub GPR32:$src, i32immSExt32:$imm),
-          (SUB_ri_32 GPR32:$src, i32immSExt32:$imm)>, Requires<[NoSBFv2]>;
+          (SUB_ri_32 GPR32:$src, i32immSExt32:$imm)>, Requires<[SBFNoRevSub]>;
 
 def : Pat<(sub i64immSExt32:$imm, GPR:$src),
-          (SUB_ri GPR:$src, i64immSExt32:$imm)>, Requires<[SBFv2]>;
+          (SUB_ri GPR:$src, i64immSExt32:$imm)>, Requires<[SBFRevSub]>;
 def : Pat<(sub i32immSExt32:$imm, GPR32:$src),
-          (SUB_ri_32 GPR32:$src, i32immSExt32:$imm)>, Requires<[SBFv2]>;
+          (SUB_ri_32 GPR32:$src, i32immSExt32:$imm)>, Requires<[SBFRevSub]>;
 
 class NEG_RR<SBFOpClass Class, SBFArithOp Opc,
              dag outs, dag ins, string asmstr, list<dag> pattern>
@@ -376,11 +380,11 @@ let Constraints = "$dst = $src", isAsCheapAsAMove = 1 in {
 
 // Instruction `neg` exists on SBFv1, but not on SBFv2
 // In SBFv2, the negate operation is done with a subtraction
-def : Pat<(ineg i64:$src), (NEG_64 GPR:$src)>, Requires<[NoSBFv2]>;
-def : Pat<(ineg i32:$src), (NEG_32 GPR32:$src)>, Requires<[NoSBFv2]>;
+def : Pat<(ineg i64:$src), (NEG_64 GPR:$src)>, Requires<[SBFHasNeg]>;
+def : Pat<(ineg i32:$src), (NEG_32 GPR32:$src)>, Requires<[SBFHasNeg]>;
 
-def : Pat<(ineg i64:$src), (SUB_ri GPR:$src, 0)>, Requires<[SBFv2]>;
-def : Pat<(ineg i32:$src), (SUB_ri_32 GPR32:$src, 0)>, Requires<[SBFv2]>;
+def : Pat<(ineg i64:$src), (SUB_ri GPR:$src, 0)>, Requires<[SBFNoNeg]>;
+def : Pat<(ineg i32:$src), (SUB_ri_32 GPR32:$src, 0)>, Requires<[SBFNoNeg]>;
 
 
 class LD_IMM64<bits<4> Pseudo, string Mnemonic>
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 613e0168f45c3..0f1fb78f2522e 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -75,6 +75,13 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // whether we are targeting SBFv2
   bool IsSBFv2;
 
+  // Whether to disable the negate (neg) instruction
+  bool DisableNeg;
+
+  // Whether to consider 'sub reg, imm' as 'reg = imm - reg', instead of 'reg =
+  // reg - imm'.
+  bool ReverseSubImm;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -95,6 +102,8 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasSdiv() const { return HasSdiv; }
   bool getUseDwarfRIS() const { return UseDwarfRIS; }
   bool isSBFv2() const { return IsSBFv2; }
+  bool getDisableNeg() const { return DisableNeg; }
+  bool getReverseSubImm() const { return ReverseSubImm; }
 
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {

From 0bdaf2562cc4b8d97236053dbe27d255d57ab27f Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 4 Jan 2024 08:38:55 -0300
Subject: [PATCH 026/114] [SOL] Add feature flag for disabling `lddw` (#77)

* Fix incorrect obj-dump

* Read flag from elf
---
 .../SBF/Disassembler/SBFDisassembler.cpp      |  5 ++++
 llvm/lib/Target/SBF/SBF.td                    |  5 +++-
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 28 +++++++++++--------
 llvm/lib/Target/SBF/SBFSubtarget.h            |  4 +++
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |  6 ++--
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      | 16 +++++------
 llvm/test/CodeGen/SBF/objdump_static_var.ll   |  4 +--
 llvm/test/MC/SBF/insn-unit-32.s               | 10 ++++---
 llvm/test/MC/SBF/sbf-alu.s                    |  2 +-
 llvm/tools/llvm-objdump/llvm-objdump.cpp      |  8 ++++++
 10 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index c5f454c783f90..0feacc6986956 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -67,6 +67,7 @@ class SBFDisassembler : public MCDisassembler {
   uint8_t getInstClass(uint64_t Inst) const { return (Inst >> 56) & 0x7; };
   uint8_t getInstSize(uint64_t Inst) const { return (Inst >> 59) & 0x3; };
   uint8_t getInstMode(uint64_t Inst) const { return (Inst >> 61) & 0x7; };
+  bool isMov32(uint64_t Inst) const { return (Inst >> 56) == 0xb4; }
 };
 
 } // end anonymous namespace
@@ -175,6 +176,10 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
       STI.getFeatureBits()[SBF::ALU32])
     Result = decodeInstruction(DecoderTableSBFALU3264, Instr, Insn, Address,
                                this, STI);
+  else if (isMov32(Insn) && !STI.getFeatureBits()[SBF::ALU32] &&
+           STI.getFeatureBits()[SBF::FeatureDisableLddw])
+    Result =
+        decodeInstruction(DecoderTableSBFv264, Instr, Insn, Address, this, STI);
   else
     Result =
         decodeInstruction(DecoderTableSBF64, Instr, Insn, Address, this, STI);
diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
index c718c9f92bbad..3dddd614e82cd 100644
--- a/llvm/lib/Target/SBF/SBF.td
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -44,6 +44,9 @@ def FeatureDisableNeg : SubtargetFeature<"no-neg", "DisableNeg", "true",
 def FeatureReverseSubImm : SubtargetFeature<"reverse-sub", "ReverseSubImm", "true",
                                     "Reverse the operands in the 'sub reg, imm' instruction">;
 
+def FeatureDisableLddw : SubtargetFeature<"no-lddw", "NoLddw", "true",
+                                    "Disable the lddw instruction">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
@@ -53,7 +56,7 @@ def : Proc<"v2", []>;
 def : Proc<"v3", []>;
 def : Proc<"probe", []>;
 def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls,
-                        FeatureDisableNeg, FeatureReverseSubImm]>;
+                        FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw]>;
 
 //===----------------------------------------------------------------------===//
 // Assembly printer
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 9874b80e23e20..3c363416a1884 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -54,6 +54,9 @@ def SBFIsBigEndian    : Predicate<"!CurDAG->getDataLayout().isLittleEndian()">;
 def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
 def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
 def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
+def SBFHasLddw : Predicate<"!Subtarget->getNoLddw()">;
+def SBFNoLddw : Predicate<"Subtarget->getNoLddw()">;
+
 def SBFv2 : Predicate<"Subtarget->isSBFv2()">;
 def NoSBFv2 : Predicate<"!Subtarget->isSBFv2()">;
 def SBFHasNeg : Predicate<"!Subtarget->getDisableNeg()">;
@@ -322,13 +325,13 @@ let Constraints = "$dst = $src2" in {
         defm XOR : ALU<SBF_XOR, "xor", xor>;
         defm SRA : ALU<SBF_ARSH, "arsh", sra>;
 
-        let Predicates = [SBFv2] in {
+        let Predicates = [SBFNoLddw] in {
             def HOR :  ALU_RI<SBF_ALU64, SBF_HOR,
                         (outs GPR:$dst),
                         (ins GPR:$src2, i32imm:$imm),
                         "hor64 $dst, $imm",
                         []>;
-            let DecoderNamespace = "AddrLoad" in {
+            let DecoderNamespace = "SBFv2" in {
               def HOR_addr :  ALU_RI<SBF_ALU64, SBF_HOR,
                                       (outs GPR:$dst),
                                       (ins GPR:$src2, u64imm:$imm),
@@ -405,7 +408,7 @@ class LD_IMM64<bits<4> Pseudo, string Mnemonic>
 }
 
 let isReMaterializable = 1, isAsCheapAsAMove = 1 in {
-def LD_imm64 : LD_IMM64<0, "lddw">, Requires<[NoSBFv2]>;
+def LD_imm64 : LD_IMM64<0, "lddw">, Requires<[SBFHasLddw]>;
 def MOV_rr : ALU_RR<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins GPR:$src),
@@ -934,14 +937,15 @@ let isCodeGenOnly = 1 in {
   def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
                          "mov32 $dst, $src", []>;
-  let Predicates = [SBFv2] in {
-    def MOV_32_64_imm : ALU_RI<SBF_ALU, SBF_MOV,
+  def MOV_32_64_addr : ALU_RI<SBF_ALU, SBF_MOV,
+                           (outs GPR:$dst), (ins u64imm:$imm),
+                           "mov32 $dst, $imm", []>, Requires<[SBFNoLddw]>;
+}
+
+let DecoderNamespace = "SBFv2", Predicates = [SBFNoLddw] in {
+  def MOV_32_64_imm : ALU_RI<SBF_ALU, SBF_MOV,
                                (outs GPR:$dst), (ins i32imm:$imm),
                                "mov32 $dst, $imm", []>;
-    def MOV_32_64_addr : ALU_RI<SBF_ALU, SBF_MOV,
-                           (outs GPR:$dst), (ins u64imm:$imm),
-                           "mov32 $dst, $imm", []>;
-  }
 }
 
 // In SBFv2, a CopyToReg of a 64-bit value is split in two instructions:
@@ -950,14 +954,14 @@ let isCodeGenOnly = 1 in {
 // These instructions copy the value 0x1122334455667788 to a register.
 def : Pat<(i64 imm:$imm),
             (HOR (MOV_32_64_imm (i32 (Lower32 $imm))),
-                       (i32 (Upper32 $imm)))>, Requires<[SBFv2]>;
+                       (i32 (Upper32 $imm)))>, Requires<[SBFNoLddw]>;
 
 // load 64-bit global address into register.
 def : Pat<(SBFWrapper tglobaladdr:$in), (LD_imm64 tglobaladdr:$in)>,
-                                                    Requires<[NoSBFv2]>;
+                                                    Requires<[SBFHasLddw]>;
 def : Pat<(SBFWrapper tglobaladdr:$in),
         (HOR_addr (MOV_32_64_addr tglobaladdr:$in),
-                            tglobaladdr:$in)>, Requires<[SBFv2]>;
+                            tglobaladdr:$in)>, Requires<[SBFNoLddw]>;
 
 
 def : Pat<(i64 (sext GPR32:$src)),
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 0f1fb78f2522e..f979e4a9ca064 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -82,6 +82,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // reg - imm'.
   bool ReverseSubImm;
 
+  // wether we should use the LDDW instruction
+  bool NoLddw;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -104,6 +107,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool isSBFv2() const { return IsSBFv2; }
   bool getDisableNeg() const { return DisableNeg; }
   bool getReverseSubImm() const { return ReverseSubImm; }
+  bool getNoLddw() const { return NoLddw; }
 
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index dc32f30c01a8b..d753f24656512 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -34,7 +34,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %10 = load i32, i32* @gbl, align 4
   br i1 %9, label %15, label %11
 
-; CHECK: mov32 w1, 0x0
+; CHECK: mov32 r1, 0x0
 ; CHECK: hor64 r1, 0x0
 ; CHECK: ldxw r0, [r1 + 0x0]
 ; CHECK: mul64 r0, r0
@@ -46,7 +46,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   br label %13
 
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: mov32 w3, 0x0
+; CHECK: mov32 r3, 0x0
 ; CHECK: hor64 r3, 0x0
 ; CHECK: ldxw r0, [r3 + 0x0]
 ; CHECK: lsh64 r2, 0x20
@@ -59,7 +59,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   store i32 %14, i32* @gbl, align 4
   br label %15
 ; CHECK-LABEL: <LBB0_4>:
-; CHECK: mov32 w1, 0x0
+; CHECK: mov32 r1, 0x0
 ; CHECK: hor64 r1, 0x0
 ; CHECK: stxw [r1 + 0x0], r0
 
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
index 0fe239eaf1780..a840258825c79 100644
--- a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -26,17 +26,17 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 ; CHECK-LABEL: test
   %3 = icmp eq i64 %0, -6067004223159161907
   br i1 %3, label %4, label %8
-; CHECK-DEC: b4 03 00 00 cd ab cd ab	mov32 w3, -0x54325433
+; CHECK-DEC: b4 03 00 00 cd ab cd ab	mov32 r3, -0x54325433
 ; CHECK-DEC: f7 03 00 00 cd ab cd ab	hor64 r3, -0x54325433
 ; CHECK-DEC: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
-; CHECK-HEX: b4 03 00 00 cd ab cd ab	mov32 w3, -0x54325433
+; CHECK-HEX: b4 03 00 00 cd ab cd ab	mov32 r3, -0x54325433
 ; CHECK-HEX: f7 03 00 00 cd ab cd ab	hor64 r3, -0x54325433
 ; CHECK-HEX: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
 
 ; <label>:4:                                      ; preds = %2
-; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
 ; CHECK-DEC: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
-; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
 ; CHECK-HEX: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
 ; CHECK-REL:   fixup A - offset: 0, value: gbl, kind: FK_SecRel_8
   %5 = load i32, i32* @gbl, align 4
@@ -48,16 +48,16 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i64 %1, 188899839028173
-; CHECK-DEC: b4 01 00 00 cd ab cd ab	mov32 w1, -0x54325433
+; CHECK-DEC: b4 01 00 00 cd ab cd ab	mov32 r1, -0x54325433
 ; CHECK-DEC: f7 01 00 00 cd ab 00 00	hor64 r1, 0xabcd
-; CHECK-HEX: b4 01 00 00 cd ab cd ab	mov32 w1, -0x54325433
+; CHECK-HEX: b4 01 00 00 cd ab cd ab	mov32 r1, -0x54325433
 ; CHECK-HEX: f7 01 00 00 cd ab 00 00	hor64 r1, 0xabcd
   br i1 %9, label %10, label %16
 
 ; <label>:10:                                     ; preds = %8
-; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
 ; CHECK-DEC: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
-; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
+; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
 ; CHECK-HEX: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
 ; CHECK-REL: fixup A - offset: 0, value: gbl, kind: FK_SecRel_8
   %11 = load i32, i32* @gbl, align 4
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index 8e4fe390529ce..26d645ae8147f 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -10,12 +10,12 @@
 ; Function Attrs: norecurse nounwind
 define dso_local i32 @test() local_unnamed_addr #0 {
   %1 = load volatile i64, i64* @a, align 8, !tbaa !2
-; CHECK: mov32 w1, 0x0
+; CHECK: mov32 r1, 0x0
 ; CHECK: R_SBF_64_64	a
 ; CHECK: hor64 r1, 0x0
 ; CHECK: ldxdw r1, [r1 + 0x0]
   %2 = load volatile i32, i32* @b, align 4, !tbaa !6
-; CHECK: mov32 w2, 0x0
+; CHECK: mov32 r2, 0x0
 ; CHECK: R_SBF_64_64	b
 ; CHECK: hor64 r2, 0x0
 ; CHECK: ldxw r0, [r2 + 0x0]
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index 198b4dcae7955..9e7227258396e 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -1,6 +1,6 @@
 # RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump  -d -r %t | FileCheck %s
-# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck %s
+# RUN: llvm-objdump  -d -r %t | FileCheck %s --check-prefixes=CHECK,CHECK-alu64
+# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck %s --check-prefixes=CHECK,CHECK-alu32
 
 // ======== BPF_ALU Class ========
   neg32 w1    // BPF_NEG
@@ -51,8 +51,10 @@
 // CHECK: 64 06 00 00 3f 00 00 00      lsh32 w6, 0x3f
 // CHECK: 74 07 00 00 20 00 00 00      rsh32 w7, 0x20
 // CHECK: a4 08 00 00 00 00 00 00      xor32 w8, 0x0
-// CHECK: b4 09 00 00 01 00 00 00      mov32 w9, 0x1
-// CHECK: b4 09 00 00 ff ff ff ff      mov32 w9, -0x1
+// CHECK-alu64: b4 09 00 00 01 00 00 00      mov32 r9, 0x1
+// CHECK-alu64: b4 09 00 00 ff ff ff ff      mov32 r9, -0x1
+// CHECK-alu32: b4 09 00 00 01 00 00 00      mov32 w9, 0x1
+// CHECK-alu32: b4 09 00 00 ff ff ff ff      mov32 w9, -0x1
 // CHECK: c4 0a 00 00 40 00 00 00      arsh32 w10, 0x40
 
   jeq w0, w1, Llabel0   // BPF_JEQ  | BPF_X
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 75ddd021b8f9f..7cc5ce6d2a346 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -1,7 +1,7 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
-# RUN:     | llvm-objdump -d -r - \
+# RUN:     | llvm-objdump -d -r --mattr=+alu32 - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
 
 
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 99e0440dce78d..f0ec439a0657e 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -2588,6 +2588,14 @@ static void disassembleObject(ObjectFile *Obj, bool InlineRelocs) {
   }
 
   DisassemblerTarget PrimaryTarget(TheTarget, *Obj, TripleName, MCPU, Features);
+  // The SBF target specifies the cpu type as an ELF flag, which is not parsed automatically in LLVM objdump.
+  // We must set the CPU type here so that the disassembler can decode the SBFv2 features correctly.
+  if (MCPU.empty() && Obj->isELF() && Obj->getArch() == Triple::sbf) {
+    const auto *Elf64 = dyn_cast<ELF64LEObjectFile>(Obj);
+    if (Elf64->getPlatformFlags() & ELF::EF_SBF_V2) {
+      MCPU = "sbfv2";
+    }
+  }
 
   // If we have an ARM object file, we need a second disassembler, because
   // ARM CPUs have two different instruction sets: ARM mode, and Thumb mode.

From ffe5f04eeeccac5b02db8b79297c53039909d975 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 4 Jan 2024 14:01:56 -0300
Subject: [PATCH 027/114] [SOL] Change encoding of `callx` instruction (#78)

* Change encoding of callx instruction
---
 .../SBF/Disassembler/SBFDisassembler.cpp      |  6 ++
 llvm/lib/Target/SBF/SBF.td                    | 45 --------------
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 28 +++++++--
 llvm/lib/Target/SBF/SBFSubtarget.cpp          | 10 +++-
 llvm/lib/Target/SBF/SBFSubtarget.h            | 10 ++--
 llvm/lib/Target/SBF/SBFTargetFeatures.td      | 58 +++++++++++++++++++
 llvm/test/CodeGen/SBF/callx.ll                |  8 ++-
 llvm/test/MC/SBF/sbf-jmp.s                    |  9 ++-
 8 files changed, 112 insertions(+), 62 deletions(-)
 create mode 100644 llvm/lib/Target/SBF/SBFTargetFeatures.td

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 0feacc6986956..55932f6a30797 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -205,6 +205,12 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
     Op.setImm(Make_64(Hi, Op.getImm()));
     break;
   }
+  case SBF::JALX: {
+    if (STI.getFeatureBits()[SBF::FeatureCallxRegSrc]) {
+      Result = decodeInstruction(DecoderTableSBFv264, Instr, Insn, Address,
+                                 this, STI);
+    }
+  }
   }
 
   return Result;
diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
index 3dddd614e82cd..23908cc9b171c 100644
--- a/llvm/lib/Target/SBF/SBF.td
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -13,51 +13,6 @@ include "SBFCallingConv.td"
 include "SBFInstrInfo.td"
 
 def SBFInstrInfo : InstrInfo;
-
-def DummyFeature : SubtargetFeature<"dummy", "isDummyMode",
-                                    "true", "unused feature">;
-
-def ALU32 : SubtargetFeature<"alu32", "HasAlu32", "true",
-                             "Enable ALU32 instructions">;
-
-def DwarfRIS: SubtargetFeature<"dwarfris", "UseDwarfRIS", "true",
-                               "Disable MCAsmInfo DwarfUsesRelocationsAcrossSections">;
-
-def FeatureSolana : SubtargetFeature<"solana", "IsSolana", "true",
-                                     "Enable Solana extensions">;
-
-def FeatureDynamicFrames : SubtargetFeature<"dynamic-frames", "HasDynamicFrames", "true",
-                                            "Enable dynamic frames">;
-
-def FeatureSdiv : SubtargetFeature<"sdiv", "HasSdiv", "true",
-                                   "Enable native SBF_SDIV support">;
-
-def FeatureRelocAbs64 : SubtargetFeature<"reloc-abs64", "UseRelocAbs64", "true",
-                                   "Fix 64bit data relocations">;
-
-def FeatureStaticSyscalls : SubtargetFeature<"static-syscalls", "HasStaticSyscalls", "true",
-                                   "Marker feature used for conditional compilation">;
-
-def FeatureDisableNeg : SubtargetFeature<"no-neg", "DisableNeg", "true",
-                                    "Disable the neg instruction">;
-
-def FeatureReverseSubImm : SubtargetFeature<"reverse-sub", "ReverseSubImm", "true",
-                                    "Reverse the operands in the 'sub reg, imm' instruction">;
-
-def FeatureDisableLddw : SubtargetFeature<"no-lddw", "NoLddw", "true",
-                                    "Disable the lddw instruction">;
-
-class Proc<string Name, list<SubtargetFeature> Features>
- : Processor<Name, NoItineraries, Features>;
-
-def : Proc<"generic", []>;
-def : Proc<"v1", []>;
-def : Proc<"v2", []>;
-def : Proc<"v3", []>;
-def : Proc<"probe", []>;
-def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls,
-                        FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw]>;
-
 //===----------------------------------------------------------------------===//
 // Assembly printer
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 3c363416a1884..1f8ea2cd3b611 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 include "SBFInstrFormats.td"
+include "SBFTargetFeatures.td"
 
 // Instruction Operands and Patterns
 
@@ -56,13 +57,12 @@ def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
 def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
 def SBFHasLddw : Predicate<"!Subtarget->getNoLddw()">;
 def SBFNoLddw : Predicate<"Subtarget->getNoLddw()">;
-
-def SBFv2 : Predicate<"Subtarget->isSBFv2()">;
-def NoSBFv2 : Predicate<"!Subtarget->isSBFv2()">;
 def SBFHasNeg : Predicate<"!Subtarget->getDisableNeg()">;
 def SBFNoNeg: Predicate<"Subtarget->getDisableNeg()">;
 def SBFRevSub : Predicate<"Subtarget->getReverseSubImm()">;
 def SBFNoRevSub : Predicate<"!Subtarget->getReverseSubImm()">;
+def SBFCallxSrc : Predicate<"Subtarget->getCallXRegSrc()">, AssemblerPredicate<(all_of FeatureCallxRegSrc)>;
+def NoSBFCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -574,6 +574,18 @@ class CALLX<string OpcodeStr>
   let SBFClass = SBF_JMP;
 }
 
+class CALLX_SRC_REG<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_CALL.Value, SBF_X.Value,
+                   (outs),
+                   (ins GPR:$BrDst),
+                   !strconcat(OpcodeStr, " $BrDst"),
+                   []> {
+  bits<4> BrDst;
+
+  let Inst{55-52} = BrDst;
+  let SBFClass = SBF_JMP;
+}
+
 // Jump always
 let isBranch = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1 in {
   def JMP : BRANCH<SBF_JA, "ja", [(br bb:$BrDst)]>;
@@ -583,8 +595,11 @@ let isBranch = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1 in {
 let isCall=1, hasDelaySlot=0, Uses = [R11],
     // Potentially clobbered registers
     Defs = [R0, R1, R2, R3, R4, R5] in {
-  def JAL  : CALL<"call">;
-  def JALX  : CALLX<"callx">;
+  def JAL     : CALL<"call">;
+  def JALX    : CALLX<"callx">, Requires<[NoSBFCallxSrc]>;
+  let DecoderNamespace = "SBFv2" in {
+    def JALX_v2 : CALLX_SRC_REG<"callx">, Requires<[SBFCallxSrc]>;
+  }
 }
 
 class NOP_I<string OpcodeStr>
@@ -678,7 +693,8 @@ def : Pat<(i64 (and (i64 GPR:$src), 0xffffFFFF)),
 def : Pat<(SBFcall tglobaladdr:$dst), (JAL tglobaladdr:$dst)>;
 def : Pat<(SBFcall texternalsym:$dst), (JAL texternalsym:$dst)>;
 def : Pat<(SBFcall imm:$dst), (JAL imm:$dst)>;
-def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>;
+def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>, Requires<[NoSBFCallxSrc]>;
+def : Pat<(SBFcall GPR:$dst), (JALX_v2 GPR:$dst)>, Requires<[SBFCallxSrc]>;
 
 // Loads
 let Predicates = [SBFNoALU32] in {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index deb57c2d539ae..e82fa30f0cc15 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -39,10 +39,15 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasJmpExt = false;
   HasJmp32 = false;
   HasAlu32 = false;
-  HasDynamicFrames = false;
   HasSdiv = false;
   UseDwarfRIS = false;
-  IsSBFv2 = false;
+
+  // SBFv2 features
+  HasDynamicFrames = false;
+  DisableNeg = false;
+  ReverseSubImm = false;
+  NoLddw = false;
+  CallxRegSrc = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
@@ -66,7 +71,6 @@ void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
   }
 
   if (CPU == "sbfv2") {
-    IsSBFv2 = true;
     if (!HasDynamicFrames)
       report_fatal_error("sbfv2 requires dynamic-frames\n", false);
   }
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index f979e4a9ca064..5461d8a476555 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -72,9 +72,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // whether we should enable MCAsmInfo DwarfUsesRelocationsAcrossSections
   bool UseDwarfRIS;
 
-  // whether we are targeting SBFv2
-  bool IsSBFv2;
-
   // Whether to disable the negate (neg) instruction
   bool DisableNeg;
 
@@ -82,9 +79,12 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // reg - imm'.
   bool ReverseSubImm;
 
-  // wether we should use the LDDW instruction
+  // Whether we should use the LDDW instruction
   bool NoLddw;
 
+  // Whether to encode destination register in Callx's src field
+  bool CallxRegSrc;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -104,10 +104,10 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasDynamicFrames() const { return HasDynamicFrames; }
   bool getHasSdiv() const { return HasSdiv; }
   bool getUseDwarfRIS() const { return UseDwarfRIS; }
-  bool isSBFv2() const { return IsSBFv2; }
   bool getDisableNeg() const { return DisableNeg; }
   bool getReverseSubImm() const { return ReverseSubImm; }
   bool getNoLddw() const { return NoLddw; }
+  bool getCallXRegSrc() const { return CallxRegSrc; }
 
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
new file mode 100644
index 0000000000000..47056be9f14d2
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -0,0 +1,58 @@
+//===-- SBFTargetFeatures.td - Target Features for SBF Target ---------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file describes the SBF target features in TableGen format.
+//
+//===----------------------------------------------------------------------===//
+
+def DummyFeature : SubtargetFeature<"dummy", "isDummyMode",
+                                    "true", "unused feature">;
+
+def ALU32 : SubtargetFeature<"alu32", "HasAlu32", "true",
+                             "Enable ALU32 instructions">;
+
+def DwarfRIS: SubtargetFeature<"dwarfris", "UseDwarfRIS", "true",
+                               "Disable MCAsmInfo DwarfUsesRelocationsAcrossSections">;
+
+def FeatureSolana : SubtargetFeature<"solana", "IsSolana", "true",
+                                     "Enable Solana extensions">;
+
+def FeatureDynamicFrames : SubtargetFeature<"dynamic-frames", "HasDynamicFrames", "true",
+                                            "Enable dynamic frames">;
+
+def FeatureSdiv : SubtargetFeature<"sdiv", "HasSdiv", "true",
+                                   "Enable native SBF_SDIV support">;
+
+def FeatureRelocAbs64 : SubtargetFeature<"reloc-abs64", "UseRelocAbs64", "true",
+                                   "Fix 64bit data relocations">;
+
+def FeatureStaticSyscalls : SubtargetFeature<"static-syscalls", "HasStaticSyscalls", "true",
+                                   "Marker feature used for conditional compilation">;
+
+def FeatureDisableNeg : SubtargetFeature<"no-neg", "DisableNeg", "true",
+                                    "Disable the neg instruction">;
+
+def FeatureReverseSubImm : SubtargetFeature<"reverse-sub", "ReverseSubImm", "true",
+                                    "Reverse the operands in the 'sub reg, imm' instruction">;
+
+def FeatureDisableLddw : SubtargetFeature<"no-lddw", "NoLddw", "true",
+                                    "Disable the lddw instruction">;
+
+def FeatureCallxRegSrc : SubtargetFeature<"callx-reg-src", "CallxRegSrc", "true",
+                                    "Encode Callx destination register in the src field">;
+
+class Proc<string Name, list<SubtargetFeature> Features>
+ : Processor<Name, NoItineraries, Features>;
+
+def : Proc<"generic", []>;
+def : Proc<"v1", []>;
+def : Proc<"v2", []>;
+def : Proc<"v3", []>;
+def : Proc<"probe", []>;
+def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls,
+                        FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc]>;
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/callx.ll b/llvm/test/CodeGen/SBF/callx.ll
index 04ab27a09821a..bebcf4a11d4cb 100644
--- a/llvm/test/CodeGen/SBF/callx.ll
+++ b/llvm/test/CodeGen/SBF/callx.ll
@@ -1,4 +1,7 @@
-; RUN: llc < %s -march=sbf | FileCheck %s
+; RUN: llc < %s -march=sbf --show-mc-encoding \
+; RUN:      | FileCheck %s -check-prefixes=CHECK-v1
+; RUN: llc < %s -march=sbf --mcpu=sbfv2 --show-mc-encoding \
+; RUN:      | FileCheck %s -check-prefixes=CHECK-v2
 ; source:
 ;   int test(int (*f)(void)) { return f(); }
 
@@ -6,7 +9,8 @@
 define dso_local i32 @test(i32 ()* nocapture %f) local_unnamed_addr #0 {
 entry:
   %call = tail call i32 %f() #1
-; CHECK: callx r{{[0-9]+}}
+; CHECK-v1: callx r{{[0-9]+}} # encoding: [0x8d,0x00,0x00,0x00,0x0{{[0-9]|a|b}},0x00,0x00,0x00]
+; CHECK-v2: callx r{{[0-9]+}} # encoding: [0x8d,0x{{[0-9]}}0,0x00,0x00,0x00,0x00,0x00,0x00]
   ret i32 %call
 }
 
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index 257df3239de87..ca39066d8d11f 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -1,8 +1,13 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-OLD
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
+# RUN:     | llvm-objdump -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-OLD %s
 
 
 
@@ -215,7 +220,9 @@ jsle w5, -123, +8
 call 8
 
 # CHECK-OBJ-NEW: callx r4
-# CHECK-ASM-NEW: encoding: [0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00]
+# CHECK-OBJ-OLD: callx r4
+# CHECK-ASM-NEW: encoding: [0x8d,0x40,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-OLD: encoding: [0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00]
 callx r4
 
 # CHECK-OBJ-NEW: exit

From 5bd6c7d62cbaf776f408d06fbdde946064049505 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:02:30 -0300
Subject: [PATCH 028/114] [SOL] Add tests for call (#79)

---
 llvm/lib/Target/SBF/SBFTargetFeatures.td  |  2 +-
 llvm/test/CodeGen/SBF/call_internal.ll    | 46 +++++++++++++++++++++++
 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt |  3 ++
 llvm/test/MC/SBF/call.s                   | 10 +++++
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/CodeGen/SBF/call_internal.ll
 create mode 100644 llvm/test/MC/SBF/call.s

diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 47056be9f14d2..75115bf36eb29 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -32,7 +32,7 @@ def FeatureRelocAbs64 : SubtargetFeature<"reloc-abs64", "UseRelocAbs64", "true",
                                    "Fix 64bit data relocations">;
 
 def FeatureStaticSyscalls : SubtargetFeature<"static-syscalls", "HasStaticSyscalls", "true",
-                                   "Marker feature used for conditional compilation">;
+                                   "Enable static syscalls">;
 
 def FeatureDisableNeg : SubtargetFeature<"no-neg", "DisableNeg", "true",
                                     "Disable the neg instruction">;
diff --git a/llvm/test/CodeGen/SBF/call_internal.ll b/llvm/test/CodeGen/SBF/call_internal.ll
new file mode 100644
index 0000000000000..8d92c6dc3063a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/call_internal.ll
@@ -0,0 +1,46 @@
+; RUN: llc < %s -march=sbf --show-mc-encoding | FileCheck --check-prefix=CHECK-ASM %s
+; RUN: llc -march=sbf --filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-OBJ %s
+; RUN: llc < %s -march=sbf -mcpu=sbfv2 --show-mc-encoding | FileCheck --check-prefix=CHECK-ASM %s
+; RUN: llc -march=sbf -mcpu=sbfv2 --filetype=obj -o - %s | llvm-objdump -d -
+;                                       | FileCheck --check-prefix=CHECK-OBJ %s
+
+@.str = private unnamed_addr constant [5 x i8] c"foo\0A\00", align 1
+
+; Function Attrs: mustprogress nofree noinline norecurse nosync nounwind willreturn memory(none)
+define dso_local i64 @sum(i64 noundef %a, i64 noundef %b) local_unnamed_addr #0 {
+entry:
+  %add = add i64 %b, %a
+  ret i64 %add
+}
+
+; Function Attrs: nounwind
+define dso_local i64 @entrypoint(ptr noundef %input) local_unnamed_addr #1 {
+entry:
+; CHECK-ASM: call 1811268606      # encoding: [0x85,0x00,0x00,0x00,0xfe,0xc3,0xf5,0x6b]
+; CHECK-OBJ: 85 00 00 00 fe c3 f5 6b	call 0x6bf5c3fe
+
+  tail call void inttoptr (i64 1811268606 to ptr)(ptr noundef nonnull @.str, i64 noundef 4) #3
+  %add.ptr = getelementptr inbounds i8, ptr %input, i64 4
+
+; CHECK-ASM: call invoke_c        # encoding: [0x85'A',A,A,A,0x00,0x00,0x00,0x00]
+; CHECK-ASM: fixup A - offset: 0, value: invoke_c, kind: FK_PCRel_4
+; CHECK-OBJ: 85 10 00 00 ff ff ff ff	call -0x1
+
+  tail call void @invoke_c(ptr noundef %input) #3
+  %0 = load i64, ptr %input, align 8, !tbaa !3
+  %1 = load i64, ptr %add.ptr, align 8, !tbaa !3
+
+; CHECK-ASM: call sum             # encoding: [0x85'A',A,A,A,0x00,0x00,0x00,0x00]
+; CHECK-ASM: fixup A - offset: 0, value: sum, kind: FK_PCRel_4
+; CHECK-OBJ: 85 10 00 00 ff ff ff ff	call -0x1
+
+  %call = tail call i64 @sum(i64 noundef %0, i64 noundef %1)
+  ret i64 %call
+}
+
+declare dso_local void @invoke_c(ptr noundef) local_unnamed_addr #2
+
+
+!3 = !{!4, !4, i64 0}
+!4 = !{!"long", !5, i64 0}
+!5 = !{!"omnipotent char"}
\ No newline at end of file
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
index c3852b1ddef07..b5a683f9a3a7e 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
@@ -145,5 +145,8 @@
 # CHECK-NEW: callx r4
 0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00
 
+# CHECK-NEW: call -1
+0x85,0x10,0x00,0x00,0xff,0xff,0xff,0xff
+
 # CHECK-NEW: exit
 0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/call.s b/llvm/test/MC/SBF/call.s
new file mode 100644
index 0000000000000..b9bf06db689df
--- /dev/null
+++ b/llvm/test/MC/SBF/call.s
@@ -0,0 +1,10 @@
+# RUN: llvm-mc -triple=sbf-solana-solana -filetype=obj -o %t %s
+# RUN: llvm-objdump -d -r %t | FileCheck --check-prefix=CHECK %s
+# RUN: llvm-mc -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj -o %t %s
+# RUN: llvm-objdump -d -r %t | FileCheck --check-prefix=CHECK %s
+
+call 1823123
+call sum
+
+// CHECK: 85 00 00 00 93 d1 1b 00	call 0x1bd193
+// CHECK: 85 10 00 00 ff ff ff ff	call -0x1

From 9118f5f68a2a8cf33c36a9e74f74f47b22b6e9d5 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 15 Jan 2024 14:43:16 -0300
Subject: [PATCH 029/114] [SOL] Remove `SBF_JMP32` instruction class (#80)

* Remove SBF_JMP32 class
---
 .../SBF/Disassembler/SBFDisassembler.cpp      |  1 -
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 19 ++---
 llvm/lib/Target/SBF/SBFISelLowering.h         |  2 -
 llvm/lib/Target/SBF/SBFInstrFormats.td        |  1 -
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 76 +++----------------
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |  2 -
 llvm/lib/Target/SBF/SBFSubtarget.h            |  5 --
 llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll     |  4 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll     |  4 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll     |  4 +-
 llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll     |  4 +-
 llvm/test/CodeGen/SBF/atomics_sbf.ll          | 24 ++++--
 llvm/test/CodeGen/SBF/loop-exit-cond.ll       |  9 ++-
 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt     | 42 ----------
 llvm/test/MC/SBF/insn-unit-32.s               | 47 ------------
 llvm/test/MC/SBF/sbf-jmp.s                    | 62 ---------------
 16 files changed, 51 insertions(+), 255 deletions(-)

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 55932f6a30797..49a63e02eb3ea 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -40,7 +40,6 @@ class SBFDisassembler : public MCDisassembler {
     SBF_STX = 0x3,
     SBF_ALU = 0x4,
     SBF_JMP = 0x5,
-    SBF_JMP32 = 0x6,
     SBF_ALU64 = 0x7
   };
 
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 5ab4c21c6374a..51b85d8cb66ef 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -150,8 +150,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
 
   if (STI.getHasAlu32()) {
     setOperationAction(ISD::BSWAP, MVT::i32, Promote);
-    setOperationAction(ISD::BR_CC, MVT::i32,
-                       STI.getHasJmp32() ? Custom : Promote);
+    setOperationAction(ISD::BR_CC, MVT::i32, Promote);
   }
 
   if (Subtarget->isSolana()) {
@@ -219,7 +218,6 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
 
   // CPU/Feature control
   HasAlu32 = STI.getHasAlu32();
-  HasJmp32 = STI.getHasJmp32();
   HasJmpExt = STI.getHasJmpExt();
   SBFRegisterInfo::FrameLength = STI.isSolana() ? 4096 : 512;
 }
@@ -800,7 +798,7 @@ SDValue SBFTargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
     NegateCC(LHS, RHS, CC);
 
   return DAG.getNode(SBFISD::BR_CC, DL, Op.getValueType(), Chain, LHS, RHS,
-                     DAG.getConstant(CC, DL, LHS.getValueType()), Dest);
+                     DAG.getConstant(CC, DL, MVT::i64), Dest);
 }
 
 SDValue SBFTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
@@ -1091,12 +1089,9 @@ SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
   int CC = MI.getOperand(3).getImm();
   int NewCC;
   switch (CC) {
-#define SET_NEWCC(X, Y) \
-  case ISD::X: \
-    if (is32BitCmp && HasJmp32) \
-      NewCC = isSelectRROp ? SBF::Y##_rr_32 : SBF::Y##_ri_32; \
-    else \
-      NewCC = isSelectRROp ? SBF::Y##_rr : SBF::Y##_ri; \
+#define SET_NEWCC(X, Y)                                                        \
+  case ISD::X:                                                                 \
+    NewCC = isSelectRROp ? SBF::Y##_rr : SBF::Y##_ri;                          \
     break
   SET_NEWCC(SETGT, JSGT);
   SET_NEWCC(SETUGT, JUGT);
@@ -1125,13 +1120,13 @@ SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
   //
   // We simply do extension for all situations in this method, but we will
   // try to remove those unnecessary in SBFMIPeephole pass.
-  if (is32BitCmp && !HasJmp32)
+  if (is32BitCmp)
     LHS = EmitSubregExt(MI, BB, LHS, isSignedCmp);
 
   if (isSelectRROp) {
     Register RHS = MI.getOperand(2).getReg();
 
-    if (is32BitCmp && !HasJmp32)
+    if (is32BitCmp)
       RHS = EmitSubregExt(MI, BB, RHS, isSignedCmp);
 
     BuildMI(BB, DL, TII.get(NewCC)).addReg(LHS).addReg(RHS).addMBB(Copy1MBB);
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index e017ce2c9805e..1aa5a1f45aa4b 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -63,7 +63,6 @@ class SBFTargetLowering : public TargetLowering {
                               MachineBasicBlock *BB) const override;
 
   bool getHasAlu32() const { return HasAlu32; }
-  bool getHasJmp32() const { return HasJmp32; }
   bool getHasJmpExt() const { return HasJmpExt; }
 
   EVT getSetCCResultType(const DataLayout &DL, LLVMContext &Context,
@@ -77,7 +76,6 @@ class SBFTargetLowering : public TargetLowering {
 private:
   // Control Instruction Selection Features
   bool HasAlu32;
-  bool HasJmp32;
   bool HasJmpExt;
 
   SDValue LowerBR_CC(SDValue Op, SelectionDAG &DAG) const;
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
index 8bb8281c42185..de8b36da7af79 100644
--- a/llvm/lib/Target/SBF/SBFInstrFormats.td
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -16,7 +16,6 @@ def SBF_ST    : SBFOpClass<0x2>;
 def SBF_STX   : SBFOpClass<0x3>;
 def SBF_ALU   : SBFOpClass<0x4>;
 def SBF_JMP   : SBFOpClass<0x5>;
-def SBF_JMP32 : SBFOpClass<0x6>;
 def SBF_ALU64 : SBFOpClass<0x7>;
 
 class SBFSrcType<bits<1> val> {
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 1f8ea2cd3b611..381a0fbc27bb2 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -126,26 +126,6 @@ def SBF_CC_LTU : PatLeaf<(i64 imm),
                          [{return (N->getZExtValue() == ISD::SETULT);}]>;
 def SBF_CC_LEU : PatLeaf<(i64 imm),
                          [{return (N->getZExtValue() == ISD::SETULE);}]>;
-def SBF_CC_EQ_32  : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETEQ);}]>;
-def SBF_CC_NE_32  : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETNE);}]>;
-def SBF_CC_GE_32  : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETGE);}]>;
-def SBF_CC_GT_32  : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETGT);}]>;
-def SBF_CC_GTU_32 : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETUGT);}]>;
-def SBF_CC_GEU_32 : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETUGE);}]>;
-def SBF_CC_LE_32  : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETLE);}]>;
-def SBF_CC_LT_32  : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETLT);}]>;
-def SBF_CC_LTU_32 : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETULT);}]>;
-def SBF_CC_LEU_32 : PatLeaf<(i32 imm),
-                         [{return (N->getZExtValue() == ISD::SETULE);}]>;
 
 // For arithmetic and jump instructions the 8-bit 'code'
 // field is divided into three parts:
@@ -211,57 +191,23 @@ class JMP_RI<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
   let SBFClass = SBF_JMP;
 }
 
-class JMP_RR_32<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
-    : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
-                   (outs),
-                   (ins GPR32:$dst, GPR32:$src, brtarget:$BrDst),
-                   Mnemonic # " $dst, $src, $BrDst",
-                   [(SBFbrcc i32:$dst, i32:$src, Cond, bb:$BrDst)]> {
-  bits<4> dst;
-  bits<4> src;
-  bits<16> BrDst;
-
-  let Inst{55-52} = src;
-  let Inst{51-48} = dst;
-  let Inst{47-32} = BrDst;
-  let SBFClass = SBF_JMP32;
-}
-
-class JMP_RI_32<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
-    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
-                   (outs),
-                   (ins GPR32:$dst, i32imm:$imm, brtarget:$BrDst),
-                   Mnemonic # " $dst, $imm, $BrDst",
-                   [(SBFbrcc i32:$dst, i32immSExt32:$imm, Cond, bb:$BrDst)]> {
-  bits<4> dst;
-  bits<16> BrDst;
-  bits<32> imm;
-
-  let Inst{51-48} = dst;
-  let Inst{47-32} = BrDst;
-  let Inst{31-0} = imm;
-  let SBFClass = SBF_JMP32;
-}
-
-multiclass J<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond, PatLeaf Cond32> {
+multiclass J<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond> {
   def _rr : JMP_RR<Opc, Mnemonic, Cond>;
   def _ri : JMP_RI<Opc, Mnemonic, Cond>;
-  def _rr_32 : JMP_RR_32<Opc, Mnemonic, Cond32>;
-  def _ri_32 : JMP_RI_32<Opc, Mnemonic, Cond32>;
 }
 
 let isBranch = 1, isTerminator = 1, hasDelaySlot=0 in {
 // cmp+goto instructions
-defm JEQ  : J<SBF_JEQ, "jeq", SBF_CC_EQ, SBF_CC_EQ_32>;
-defm JUGT : J<SBF_JGT, "jgt", SBF_CC_GTU, SBF_CC_GTU_32>;
-defm JUGE : J<SBF_JGE, "jge", SBF_CC_GEU, SBF_CC_GEU_32>;
-defm JNE  : J<SBF_JNE, "jne", SBF_CC_NE, SBF_CC_NE_32>;
-defm JSGT : J<SBF_JSGT, "jsgt", SBF_CC_GT, SBF_CC_GT_32>;
-defm JSGE : J<SBF_JSGE, "jsge", SBF_CC_GE, SBF_CC_GE_32>;
-defm JULT : J<SBF_JLT, "jlt", SBF_CC_LTU, SBF_CC_LTU_32>;
-defm JULE : J<SBF_JLE, "jle", SBF_CC_LEU, SBF_CC_LEU_32>;
-defm JSLT : J<SBF_JSLT, "jslt", SBF_CC_LT, SBF_CC_LT_32>;
-defm JSLE : J<SBF_JSLE, "jsle", SBF_CC_LE, SBF_CC_LE_32>;
+defm JEQ  : J<SBF_JEQ, "jeq", SBF_CC_EQ>;
+defm JUGT : J<SBF_JGT, "jgt", SBF_CC_GTU>;
+defm JUGE : J<SBF_JGE, "jge", SBF_CC_GEU>;
+defm JNE  : J<SBF_JNE, "jne", SBF_CC_NE>;
+defm JSGT : J<SBF_JSGT, "jsgt", SBF_CC_GT>;
+defm JSGE : J<SBF_JSGE, "jsge", SBF_CC_GE>;
+defm JULT : J<SBF_JLT, "jlt", SBF_CC_LTU>;
+defm JULE : J<SBF_JLE, "jle", SBF_CC_LEU>;
+defm JSLT : J<SBF_JSLT, "jslt", SBF_CC_LT>;
+defm JSLE : J<SBF_JSLE, "jsle", SBF_CC_LE>;
 }
 
 // ALU instructions
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index e82fa30f0cc15..c820d3b13eca8 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -37,7 +37,6 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
   IsSolana = true;
   HasJmpExt = false;
-  HasJmp32 = false;
   HasAlu32 = false;
   HasSdiv = false;
   UseDwarfRIS = false;
@@ -66,7 +65,6 @@ void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
 
   if (CPU == "v3") {
     HasJmpExt = true;
-    HasJmp32 = true;
     HasAlu32 = true;
   }
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 5461d8a476555..07ad4a8f1b225 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -50,10 +50,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // whether the cpu supports jmp ext
   bool HasJmpExt;
 
-  // whether the cpu supports jmp32 ext.
-  // NOTE: jmp32 is not enabled when alu32 enabled.
-  bool HasJmp32;
-
   // whether the cpu supports alu32 instructions.
   bool HasAlu32;
 
@@ -99,7 +95,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);
   bool isSolana() const { return IsSolana; }
   bool getHasJmpExt() const { return HasJmpExt; }
-  bool getHasJmp32() const { return HasJmp32; }
   bool getHasAlu32() const { return HasAlu32; }
   bool getHasDynamicFrames() const { return HasDynamicFrames; }
   bool getHasSdiv() const { return HasSdiv; }
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
index 28d932bbf5937..049ec7115325a 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
@@ -41,7 +41,7 @@ return:                                           ; preds = %if.end, %if.then
 
 ; CHECK-LABEL: test1
 ; CHECK-V1:    jgt r[[#]], r[[#]],
-; CHECK-V3:    jlt w[[#]], 4,
+; CHECK-V3:    jlt r[[#]], 4,
 
 ; Function Attrs: nounwind
 define dso_local i32 @test2(i64 %a) #0 {
@@ -69,7 +69,7 @@ return:                                           ; preds = %if.end, %if.then
 
 ; CHECK-LABEL: test2
 ; CHECK-V1:    jgt r[[#]], r[[#]],
-; CHECK-V3:    jlt w[[#]], 4,
+; CHECK-V3:    jlt r[[#]], 4,
 
 attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
 
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
index a3d202657847c..16f300a8ba845 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
@@ -41,7 +41,7 @@ return:                                           ; preds = %if.end, %if.then
 
 ; CHECK-LABEL: test1
 ; CHECK-V1:    jgt r[[#]], 3,
-; CHECK-V3:    jgt w[[#]], 3,
+; CHECK-V3:    jgt r[[#]], 3,
 
 ; Function Attrs: nounwind
 define dso_local i32 @test2(i64 %a) #0 {
@@ -69,7 +69,7 @@ return:                                           ; preds = %if.end, %if.then
 
 ; CHECK-LABEL: test2
 ; CHECK-V1:    jgt r[[#]], 3,
-; CHECK-V3:    jgt w[[#]], 3,
+; CHECK-V3:    jgt r[[#]], 3,
 
 attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
 
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
index 39f38c8499456..5b88384b788f2 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
@@ -49,8 +49,8 @@ return:                                           ; preds = %if.end, %if.then
 ; CHECK-LABEL: test
 ; CHECK-V1:    jsgt r[[#]], r[[#]],
 ; CHECK-V1:    jsgt r[[#]], 6,
-; CHECK-V3:    jslt w[[#]], 1,
-; CHECK-V3:    jsgt w[[#]], 6,
+; CHECK-V3:    jslt r[[#]], 1,
+; CHECK-V3:    jsgt r[[#]], 6,
 
 declare dso_local i32 @bar(i32 noundef) #1
 
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
index 51863589cd86a..210beca0acfa9 100644
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
+++ b/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
@@ -49,8 +49,8 @@ return:                                           ; preds = %if.end, %if.then
 ; CHECK-LABEL: test
 ; CHECK-V1:    jgt r[[#]], r[[#]],
 ; CHECK-V1:    jgt r[[#]], 6,
-; CHECK-V3:    jlt w[[#]], 2,
-; CHECK-V3:    jgt w[[#]], 6,
+; CHECK-V3:    jlt r[[#]], 2,
+; CHECK-V3:    jgt r[[#]], 6,
 
 declare dso_local i32 @bar(i32 noundef) #1
 
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
index 4af68c876f20e..88e3e7c80ba9b 100644
--- a/llvm/test/CodeGen/SBF/atomics_sbf.ll
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -67,7 +67,7 @@ entry:
 
 ; CHECK-LABEL: test_cas_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: jeq w0, w2,
+; CHECK: jeq r0, r2,
 ; CHECK: mov32 w3, w0
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
@@ -181,8 +181,14 @@ entry:
 
 ; CHECK-LABEL: test_min_32
 ; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov64 r4, r0
+; CHECK: lsh64 r4, 32
+; CHECK: arsh64 r4, 32
+; CHECK: mov32 r5, w2
+; CHECK: lsh64 r5, 32
+; CHECK: arsh64 r5, 32
 ; CHECK: mov32 w3, w0
-; CHECK: jslt w0, w2,
+; CHECK: jslt r4, r5, LBB16_2
 ; CHECK: mov32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_min_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
@@ -205,8 +211,14 @@ entry:
 
 ; CHECK-LABEL: test_max_32
 ; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov64 r4, r0
+; CHECK: lsh64 r4, 32
+; CHECK: arsh64 r4, 32
+; CHECK: mov32 r5, w2
+; CHECK: lsh64 r5, 32
+; CHECK: arsh64 r5, 32
 ; CHECK: mov32 w3, w0
-; CHECK: jsgt w0, w2,
+; CHECK: jsgt r4, r5, LBB18_2
 ; CHECK: mov32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_max_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
@@ -229,8 +241,9 @@ entry:
 
 ; CHECK-LABEL: test_umin_32
 ; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 r4, w2
 ; CHECK: mov32 w3, w0
-; CHECK: jlt w0, w2,
+; CHECK: jlt r0, r4,
 ; CHECK: mov32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umin_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
@@ -253,8 +266,9 @@ entry:
 
 ; CHECK-LABEL: test_umax_32
 ; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 r4, w2
 ; CHECK: mov32 w3, w0
-; CHECK: jgt w0, w2,
+; CHECK: jgt r0, r4,
 ; CHECK: mov32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umax_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
diff --git a/llvm/test/CodeGen/SBF/loop-exit-cond.ll b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
index e42467d05cb8c..9d422664232b0 100644
--- a/llvm/test/CodeGen/SBF/loop-exit-cond.ll
+++ b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
@@ -49,9 +49,12 @@ for.cond:                                         ; preds = %for.inc, %if.then
   %cmp1 = icmp slt i32 %2, %3
   br i1 %cmp1, label %for.body, label %for.cond.cleanup
 
-; CHECK:      mov32 w[[LEN:[0-9]+]], w1
-; CHECK:      add32 w[[IDX:[0-9]+]], 1
-; CHECK-NEXT: jslt w[[IDX]], w[[LEN]],
+; CHECK:      mov32 r[[LEN:[0-9]+]], w1
+; CHECK:      add32 w[[IDX32:[0-9]+]], 1
+; CHECK:      mov64 r[[IDX:[0-9]+]], r[[IDX32:[0-9]+]]
+; CHECK:      lsh64 r[[IDX:[0-9]+]], 32
+; CHECK:      arsh64 r[[IDX:[0-9]+]], 32
+; CHECK-NEXT: jslt r[[IDX]], r[[LEN]],
 
 for.cond.cleanup:                                 ; preds = %for.cond
   %4 = bitcast i32* %i to i8*
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
index b5a683f9a3a7e..33a35d36a7a63 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
@@ -96,48 +96,6 @@
 0xc5,0x05,0x08,0x00,0x85,0xff,0xff,0xff
 0xd5,0x05,0x08,0x00,0x85,0xff,0xff,0xff
 
-# CHECK-NEW: jeq w6, w2, +8
-# CHECK-NEW: jne w6, w2, +8
-# CHECK-NEW: jgt w6, w2, +8
-# CHECK-NEW: jge w6, w2, +8
-# CHECK-NEW: jlt w6, w2, +8
-# CHECK-NEW: jle w6, w2, +8
-# CHECK-NEW: jsgt w6, w2, +8
-# CHECK-NEW: jsge w6, w2, +8
-# CHECK-NEW: jslt w6, w2, +8
-# CHECK-NEW: jsle w6, w2, +8
-0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0x3e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0xae,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0xbe,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0x6e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0x7e,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0xce,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-0xde,0x26,0x08,0x00,0x00,0x00,0x00,0x00
-
-# CHECK-NEW: jeq w5, -123, +8
-# CHECK-NEW: jne w5, -123, +8
-# CHECK-NEW: jgt w5, -123, +8
-# CHECK-NEW: jge w5, -123, +8
-# CHECK-NEW: jlt w5, -123, +8
-# CHECK-NEW: jle w5, -123, +8
-# CHECK-NEW: jsgt w5, -123, +8
-# CHECK-NEW: jsge w5, -123, +8
-# CHECK-NEW: jslt w5, -123, +8
-# CHECK-NEW: jsle w5, -123, +8
-0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0x36,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0xa6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0xb6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0x66,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0x76,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0xc6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-0xd6,0x05,0x08,0x00,0x85,0xff,0xff,0xff
-
 
 # CHECK-NEW: call 8
 0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index 9e7227258396e..b44bbc375f40e 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -56,50 +56,3 @@
 // CHECK-alu32: b4 09 00 00 01 00 00 00      mov32 w9, 0x1
 // CHECK-alu32: b4 09 00 00 ff ff ff ff      mov32 w9, -0x1
 // CHECK: c4 0a 00 00 40 00 00 00      arsh32 w10, 0x40
-
-  jeq w0, w1, Llabel0   // BPF_JEQ  | BPF_X
-  jne w3, w4, Llabel0   // BPF_JNE  | BPF_X
-// CHECK: 1e 10 0b 00 00 00 00 00 	jeq w0, w1, +0xb
-// CHECK: 5e 43 0a 00 00 00 00 00 	jne w3, w4, +0xa
-
-  jgt w1, w2, Llabel0    // BPF_JGT  | BPF_X
-  jge w2, w3, Llabel0   // BPF_JGE  | BPF_X
-  jsgt w4, w5, Llabel0   // BPF_JSGT | BPF_X
-  jsge w5, w6, Llabel0  // BPF_JSGE | BPF_X
-// CHECK: 2e 21 09 00 00 00 00 00 	jgt w1, w2, +0x9
-// CHECK: 3e 32 08 00 00 00 00 00 	jge w2, w3, +0x8
-// CHECK: 6e 54 07 00 00 00 00 00 	jsgt w4, w5, +0x7
-// CHECK: 7e 65 06 00 00 00 00 00 	jsge w5, w6, +0x6
-
-  jlt w6, w7, Llabel0    // BPF_JLT  | BPF_X
-  jle w7, w8, Llabel0   // BPF_JLE  | BPF_X
-  jslt w8, w9, Llabel0   // BPF_JSLT | BPF_X
-  jsle w9, w10, Llabel0 // BPF_JSLE | BPF_X
-// CHECK: ae 76 05 00 00 00 00 00 	jlt w6, w7, +0x5
-// CHECK: be 87 04 00 00 00 00 00 	jle w7, w8, +0x4
-// CHECK: ce 98 03 00 00 00 00 00 	jslt w8, w9, +0x3
-// CHECK: de a9 02 00 00 00 00 00 	jsle w9, w10, +0x2
-
-  jeq w0, 0, Llabel0           // BPF_JEQ  | BPF_K
-  jne w3, -1, Llabel0          // BPF_JNE  | BPF_K
-// CHECK: 16 00 01 00 00 00 00 00 	jeq w0, 0x0, +0x1
-// CHECK: 56 03 00 00 ff ff ff ff 	jne w3, -0x1, +0x0
-
-Llabel0 :
-  jgt w1, 64, Llabel0           // BPF_JGT  | BPF_K
-  jge w2, 0xffffffff, Llabel0  // BPF_JGE  | BPF_K
-  jsgt w4, 0xffffffff, Llabel0  // BPF_JSGT | BPF_K
-  jsge w5, 0x7fffffff, Llabel0 // BPF_JSGE | BPF_K
-// CHECK: 26 01 ff ff 40 00 00 00 	jgt w1, 0x40, -0x1
-// CHECK: 36 02 fe ff ff ff ff ff 	jge w2, -0x1, -0x2
-// CHECK: 66 04 fd ff ff ff ff ff 	jsgt w4, -0x1, -0x3
-// CHECK: 76 05 fc ff ff ff ff 7f 	jsge w5, 0x7fffffff, -0x4
-
-  jlt w6, 0xff, Llabel0         // BPF_JLT  | BPF_K
-  jle w7, 0xffff, Llabel0      // BPF_JLE  | BPF_K
-  jslt w8, 0, Llabel0           // BPF_JSLT | BPF_K
-  jsle w9, -1, Llabel0         // BPF_JSLE | BPF_K
-// CHECK: a6 06 fb ff ff 00 00 00 	jlt w6, 0xff, -0x5
-// CHECK: b6 07 fa ff ff ff 00 00 	jle w7, 0xffff, -0x6
-// CHECK: c6 08 f9 ff 00 00 00 00 	jslt w8, 0x0, -0x7
-// CHECK: d6 09 f8 ff ff ff ff ff 	jsle w9, -0x1, -0x8
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index ca39066d8d11f..ac1dbdde2b929 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -152,68 +152,6 @@ jsge r5, -123, +8
 jslt r5, -123, +8
 jsle r5, -123, +8
 
-# CHECK-OBJ-NEW: jeq w6, w2, +0x8
-# CHECK-OBJ-NEW: jne w6, w2, +0x8
-# CHECK-OBJ-NEW: jgt w6, w2, +0x8
-# CHECK-OBJ-NEW: jge w6, w2, +0x8
-# CHECK-OBJ-NEW: jlt w6, w2, +0x8
-# CHECK-OBJ-NEW: jle w6, w2, +0x8
-# CHECK-OBJ-NEW: jsgt w6, w2, +0x8
-# CHECK-OBJ-NEW: jsge w6, w2, +0x8
-# CHECK-OBJ-NEW: jslt w6, w2, +0x8
-# CHECK-OBJ-NEW: jsle w6, w2, +0x8
-# CHECK-ASM-NEW: encoding: [0x1e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x5e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x2e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x3e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0xae,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0xbe,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x6e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0x7e,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0xce,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-# CHECK-ASM-NEW: encoding: [0xde,0x26,0x08,0x00,0x00,0x00,0x00,0x00]
-jeq w6, w2, +8
-jne w6, w2, +8
-jgt w6, w2, +8
-jge w6, w2, +8
-jlt w6, w2, +8
-jle w6, w2, +8
-jsgt w6, w2, +8
-jsge w6, w2, +8
-jslt w6, w2, +8
-jsle w6, w2, +8
-
-# CHECK-OBJ-NEW: jeq w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jne w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jgt w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jge w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jlt w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jle w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jsgt w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jsge w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jslt w5, -0x7b, +0x8
-# CHECK-OBJ-NEW: jsle w5, -0x7b, +0x8
-# CHECK-ASM-NEW: encoding: [0x16,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0x56,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0x26,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0x36,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0xa6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0xb6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0x66,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0x76,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0xc6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-# CHECK-ASM-NEW: encoding: [0xd6,0x05,0x08,0x00,0x85,0xff,0xff,0xff]
-jeq w5, -123, +8
-jne w5, -123, +8
-jgt w5, -123, +8
-jge w5, -123, +8
-jlt w5, -123, +8
-jle w5, -123, +8
-jsgt w5, -123, +8
-jsge w5, -123, +8
-jslt w5, -123, +8
-jsle w5, -123, +8
-
 
 # CHECK-OBJ-NEW: call 0x8
 # CHECK-ASM-NEW: encoding: [0x85,0x00,0x00,0x00,0x08,0x00,0x00,0x00]

From c90f16704e036caf849185b35c19bed043effa1a Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:58:51 -0300
Subject: [PATCH 030/114] [SOL] Create PQR instruction class (#81)

* Create PQR instruction class
---
 .../SBF/Disassembler/SBFDisassembler.cpp      |   1 +
 llvm/lib/Target/SBF/SBFISelLowering.cpp       |  10 +-
 llvm/lib/Target/SBF/SBFInstrFormats.td        |   9 +
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 115 ++++++----
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |   2 +-
 llvm/lib/Target/SBF/SBFSubtarget.h            |   8 +-
 llvm/lib/Target/SBF/SBFTargetFeatures.td      |  11 +-
 llvm/test/CodeGen/SBF/pqr-class.ll            | 196 ++++++++++++++++++
 llvm/test/MC/Disassembler/SBF/sbf-alu.txt     |  19 --
 llvm/test/MC/Disassembler/SBF/sbf-pqr.txt     |  75 +++++++
 llvm/test/MC/SBF/sbf-alu.s                    |  24 ---
 llvm/test/MC/SBF/sbf-pqr.s                    | 102 +++++++++
 llvm/test/MC/SBF/sbf-sdiv.s                   |  15 --
 13 files changed, 477 insertions(+), 110 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/pqr-class.ll
 create mode 100644 llvm/test/MC/Disassembler/SBF/sbf-pqr.txt
 create mode 100644 llvm/test/MC/SBF/sbf-pqr.s
 delete mode 100644 llvm/test/MC/SBF/sbf-sdiv.s

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 49a63e02eb3ea..73c9feb1e4754 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -40,6 +40,7 @@ class SBFDisassembler : public MCDisassembler {
     SBF_STX = 0x3,
     SBF_ALU = 0x4,
     SBF_JMP = 0x5,
+    SBF_PQR = 0x6,
     SBF_ALU64 = 0x7
   };
 
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 51b85d8cb66ef..32420b735469d 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -124,16 +124,16 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     if (VT == MVT::i32 && !STI.getHasAlu32())
       continue;
 
-    if (Subtarget->isSolana() && !STI.getHasSdiv()) {
+    if (Subtarget->isSolana() && !STI.getHasPqrClass()) {
       setOperationAction(ISD::SDIV, VT, Expand);
+      setOperationAction(ISD::SREM, VT, Expand);
+      setOperationAction(ISD::UREM, VT, Expand);
+      setOperationAction(ISD::MULHU, VT, Expand);
+      setOperationAction(ISD::MULHS, VT, Expand);
     }
 
     setOperationAction(ISD::SDIVREM, VT, Expand);
     setOperationAction(ISD::UDIVREM, VT, Expand);
-    setOperationAction(ISD::SREM, VT, Expand);
-    setOperationAction(ISD::UREM, VT, Expand);
-    setOperationAction(ISD::MULHU, VT, Expand);
-    setOperationAction(ISD::MULHS, VT, Expand);
     setOperationAction(ISD::UMUL_LOHI, VT, Expand);
     setOperationAction(ISD::SMUL_LOHI, VT, Expand);
     setOperationAction(ISD::ROTR, VT, Expand);
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
index de8b36da7af79..2bc92f939dde4 100644
--- a/llvm/lib/Target/SBF/SBFInstrFormats.td
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -16,6 +16,7 @@ def SBF_ST    : SBFOpClass<0x2>;
 def SBF_STX   : SBFOpClass<0x3>;
 def SBF_ALU   : SBFOpClass<0x4>;
 def SBF_JMP   : SBFOpClass<0x5>;
+def SBF_PQR   : SBFOpClass<0x6>;
 def SBF_ALU64 : SBFOpClass<0x7>;
 
 class SBFSrcType<bits<1> val> {
@@ -45,6 +46,14 @@ def SBF_END  : SBFArithOp<0xd>;
 def SBF_SDIV : SBFArithOp<0xe>;
 def SBF_HOR  : SBFArithOp<0xf>;
 
+def PQR_UHMUL : SBFArithOp<0x2>;
+def PQR_UDIV  : SBFArithOp<0x4>;
+def PQR_UREM  : SBFArithOp<0x6>;
+def PQR_LMUL  : SBFArithOp<0x8>;
+def PQR_SHMUL : SBFArithOp<0xa>;
+def PQR_SDIV  : SBFArithOp<0xc>;
+def PQR_SREM  : SBFArithOp<0xe>;
+
 def SBF_XCHG    : SBFArithOp<0xe>;
 def SBF_CMPXCHG : SBFArithOp<0xf>;
 
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 381a0fbc27bb2..95ce0ec412c03 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -63,6 +63,8 @@ def SBFRevSub : Predicate<"Subtarget->getReverseSubImm()">;
 def SBFNoRevSub : Predicate<"!Subtarget->getReverseSubImm()">;
 def SBFCallxSrc : Predicate<"Subtarget->getCallXRegSrc()">, AssemblerPredicate<(all_of FeatureCallxRegSrc)>;
 def NoSBFCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">;
+def SBFPqrInstr : Predicate<"Subtarget->getHasPqrClass()">;
+def SBFNoPqrInstr : Predicate<"!Subtarget->getHasPqrClass()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -136,10 +138,13 @@ def SBF_CC_LEU : PatLeaf<(i64 imm),
 //  +----------------+--------+--------------------+
 //  (MSB)                                      (LSB)
 class TYPE_ALU_JMP<bits<4> op, bits<1> srctype,
-                   dag outs, dag ins, string asmstr, list<dag> pattern>
+                   dag outs, dag ins, string asmstr, list<dag> pattern,
+                   bit IsPqr64 = 0>
   : InstSBF<outs, ins, asmstr, pattern> {
 
-  let Inst{63-60} = op;
+  // In the PQR class, instructions that deal with 64-bit registers have a different OpCode.
+  // To obtain it, we add one to its base value.
+  let Inst{63-60} = !if(IsPqr64, !add(op, 1), op);
   let Inst{59} = srctype;
 }
 
@@ -211,9 +216,11 @@ defm JSLE : J<SBF_JSLE, "jsle", SBF_CC_LE>;
 }
 
 // ALU instructions
-class ALU_RI<SBFOpClass Class, SBFArithOp Opc,
-             dag outs, dag ins, string asmstr, list<dag> pattern>
-    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value, outs, ins, asmstr, pattern> {
+class MATH_RI<SBFOpClass Class, SBFArithOp Opc,
+             dag outs, dag ins, string asmstr,
+             list<dag> pattern, bit isPqr64 = 0>
+    : TYPE_ALU_JMP<Opc.Value, SBF_K.Value, outs, ins,
+                           asmstr, pattern, isPqr64> {
   bits<4> dst;
   bits<32> imm;
 
@@ -222,9 +229,11 @@ class ALU_RI<SBFOpClass Class, SBFArithOp Opc,
   let SBFClass = Class;
 }
 
-class ALU_RR<SBFOpClass Class, SBFArithOp Opc,
-             dag outs, dag ins, string asmstr, list<dag> pattern>
-    : TYPE_ALU_JMP<Opc.Value, SBF_X.Value, outs, ins, asmstr, pattern> {
+class MATH_RR<SBFOpClass Class, SBFArithOp Opc,
+               dag outs, dag ins, string asmstr,
+                list<dag> pattern, bit isPqr64 = 0>
+    : TYPE_ALU_JMP<Opc.Value, SBF_X.Value, outs, ins,
+                           asmstr, pattern, isPqr64> {
   bits<4> dst;
   bits<4> src;
 
@@ -233,25 +242,14 @@ class ALU_RR<SBFOpClass Class, SBFArithOp Opc,
   let SBFClass = Class;
 }
 
-multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode, bit UseImmPat = 1> {
-  def _rr : ALU_RR<SBF_ALU64, Opc,
-                   (outs GPR:$dst),
-                   (ins GPR:$src2, GPR:$src),
-                   Mnemonic # "64 $dst, $src",
-                   [(set GPR:$dst, (OpNode i64:$src2, i64:$src))]>;
-  def _ri : ALU_RI<SBF_ALU64, Opc,
-                   (outs GPR:$dst),
-                   (ins GPR:$src2, i64imm:$imm),
-                   Mnemonic # "64 $dst, $imm",
-                   !if(UseImmPat,
-                       [(set GPR:$dst,
-                            (OpNode GPR:$src2, i64immSExt32:$imm))], [])>;
-  def _rr_32 : ALU_RR<SBF_ALU, Opc,
+multiclass MATH_32<SBFArithOp Opc, string Mnemonic,
+                    SBFOpClass Class, SDNode OpNode, bit UseImmPat = 1> {
+  def _rr_32 : MATH_RR<Class, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, GPR32:$src),
                    Mnemonic # "32 $dst, $src",
                    [(set GPR32:$dst, (OpNode i32:$src2, i32:$src))]>;
-  def _ri_32 : ALU_RI<SBF_ALU, Opc,
+  def _ri_32 : MATH_RI<Class, Opc,
                    (outs GPR32:$dst),
                    (ins GPR32:$src2, i32imm:$imm),
                    Mnemonic # "32 $dst, $imm",
@@ -260,6 +258,40 @@ multiclass ALU<SBFArithOp Opc, string Mnemonic, SDNode OpNode, bit UseImmPat = 1
                              (OpNode GPR32:$src2, i32immSExt32:$imm))], [])>;
 }
 
+multiclass MATH_64<SBFArithOp Opc, string Mnemonic,
+                     SBFOpClass Class, SDNode OpNode, bit UseImmPat = 1> {
+
+  defvar isPqr64 = !if(!eq(Class, SBF_PQR), 1, 0);
+
+  def _rr : MATH_RR<Class, Opc,
+                   (outs GPR:$dst),
+                   (ins GPR:$src2, GPR:$src),
+                   Mnemonic # "64 $dst, $src",
+                   [(set GPR:$dst, (OpNode i64:$src2, i64:$src))],
+                   isPqr64>;
+
+  def _ri : MATH_RI<Class, Opc,
+                   (outs GPR:$dst),
+                   (ins GPR:$src2, i64imm:$imm),
+                   Mnemonic # "64 $dst, $imm",
+                   !if(UseImmPat,
+                       [(set GPR:$dst,
+                            (OpNode GPR:$src2, i64immSExt32:$imm))], []),
+                   isPqr64>;
+}
+
+multiclass ALU<SBFArithOp Opc, string Mnemonic,
+                    SDNode OpNode, bit UseImmPat = 1> {
+  defm "" : MATH_64<Opc, Mnemonic, SBF_ALU64, OpNode, UseImmPat>;
+
+  defm "" : MATH_32<Opc, Mnemonic, SBF_ALU, OpNode, UseImmPat>;
+}
+
+multiclass PQR<SBFArithOp Opc, string Mnemonic, SDNode OpNode> {
+  defm "" : MATH_64<Opc, Mnemonic, SBF_PQR, OpNode>;
+  defm "" : MATH_32<Opc, Mnemonic, SBF_PQR, OpNode>;
+}
+
 let Constraints = "$dst = $src2" in {
     let isAsCheapAsAMove = 1 in {
         defm ADD : ALU<SBF_ADD, "add", add>;
@@ -272,13 +304,13 @@ let Constraints = "$dst = $src2" in {
         defm SRA : ALU<SBF_ARSH, "arsh", sra>;
 
         let Predicates = [SBFNoLddw] in {
-            def HOR :  ALU_RI<SBF_ALU64, SBF_HOR,
+            def HOR :  MATH_RI<SBF_ALU64, SBF_HOR,
                         (outs GPR:$dst),
                         (ins GPR:$src2, i32imm:$imm),
                         "hor64 $dst, $imm",
                         []>;
             let DecoderNamespace = "SBFv2" in {
-              def HOR_addr :  ALU_RI<SBF_ALU64, SBF_HOR,
+              def HOR_addr :  MATH_RI<SBF_ALU64, SBF_HOR,
                                       (outs GPR:$dst),
                                       (ins GPR:$src2, u64imm:$imm),
                                       "hor64 $dst, $imm",
@@ -288,11 +320,20 @@ let Constraints = "$dst = $src2" in {
         }
     }
 
-    defm MUL : ALU<SBF_MUL, "mul", mul>;
-    defm DIV : ALU<SBF_DIV, "div", udiv>;
 
-    let Predicates = [SBFSubtargetSolana] in {
-        defm SDIV : ALU<SBF_SDIV, "sdiv", sdiv>;
+    let Predicates = [SBFNoPqrInstr] in {
+        defm MUL : ALU<SBF_MUL, "mul", mul>;
+        defm DIV : ALU<SBF_DIV, "div", udiv>;
+    }
+
+    let Predicates = [SBFPqrInstr] in {
+        defm UHMUL    : MATH_64<PQR_UHMUL, "uhmul", SBF_PQR, mulhu>;
+        defm UDIV     : PQR<PQR_UDIV, "udiv", udiv>;
+        defm UREM     : PQR<PQR_UREM, "urem", urem>;
+        defm LMUL     : PQR<PQR_LMUL, "lmul", mul>;
+        defm SHMUL    : MATH_64<PQR_SHMUL, "shmul", SBF_PQR, mulhs>;
+        defm SDIV_pqr : PQR<PQR_SDIV, "sdiv", sdiv>;
+        defm SREM     : PQR<PQR_SREM, "srem", srem>;
     }
 }
 
@@ -355,22 +396,22 @@ class LD_IMM64<bits<4> Pseudo, string Mnemonic>
 
 let isReMaterializable = 1, isAsCheapAsAMove = 1 in {
 def LD_imm64 : LD_IMM64<0, "lddw">, Requires<[SBFHasLddw]>;
-def MOV_rr : ALU_RR<SBF_ALU64, SBF_MOV,
+def MOV_rr : MATH_RR<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins GPR:$src),
                     "mov64 $dst, $src",
                     []>;
-def MOV_ri : ALU_RI<SBF_ALU64, SBF_MOV,
+def MOV_ri : MATH_RI<SBF_ALU64, SBF_MOV,
                     (outs GPR:$dst),
                     (ins i64imm:$imm),
                     "mov64 $dst, $imm",
                     [(set GPR:$dst, (i64 i64immSExt32:$imm))]>;
-def MOV_rr_32 : ALU_RR<SBF_ALU, SBF_MOV,
+def MOV_rr_32 : MATH_RR<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins GPR32:$src),
                     "mov32 $dst, $src",
                     []>;
-def MOV_ri_32 : ALU_RI<SBF_ALU, SBF_MOV,
+def MOV_ri_32 : MATH_RI<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins i32imm:$imm),
                     "mov32 $dst, $imm",
@@ -468,7 +509,7 @@ let isCodeGenOnly = 1 in {
                                   "$dst = core_alu32_mem($opcode, $src, $offset)",
                                   []>;
   let Constraints = "$dst = $src" in {
-    def CORE_SHIFT : ALU_RR<SBF_ALU64, SBF_LSH,
+    def CORE_SHIFT : MATH_RR<SBF_ALU64, SBF_LSH,
                              (outs GPR:$dst),
                              (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
                              "$dst = core_shift($opcode, $src, $offset)",
@@ -896,16 +937,16 @@ let Constraints = "$dst = $src" in {
 }
 
 let isCodeGenOnly = 1 in {
-  def MOV_32_64 : ALU_RR<SBF_ALU, SBF_MOV,
+  def MOV_32_64 : MATH_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
                          "mov32 $dst, $src", []>;
-  def MOV_32_64_addr : ALU_RI<SBF_ALU, SBF_MOV,
+  def MOV_32_64_addr : MATH_RI<SBF_ALU, SBF_MOV,
                            (outs GPR:$dst), (ins u64imm:$imm),
                            "mov32 $dst, $imm", []>, Requires<[SBFNoLddw]>;
 }
 
 let DecoderNamespace = "SBFv2", Predicates = [SBFNoLddw] in {
-  def MOV_32_64_imm : ALU_RI<SBF_ALU, SBF_MOV,
+  def MOV_32_64_imm : MATH_RI<SBF_ALU, SBF_MOV,
                                (outs GPR:$dst), (ins i32imm:$imm),
                                "mov32 $dst, $imm", []>;
 }
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index c820d3b13eca8..2ea2804eb94b7 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -38,7 +38,6 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   IsSolana = true;
   HasJmpExt = false;
   HasAlu32 = false;
-  HasSdiv = false;
   UseDwarfRIS = false;
 
   // SBFv2 features
@@ -47,6 +46,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   ReverseSubImm = false;
   NoLddw = false;
   CallxRegSrc = false;
+  HasPqrClass = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 07ad4a8f1b225..1b07852f0d98c 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -59,9 +59,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Relocate FK_Data_8 fixups as R_SBF_64_ABS64
   bool UseRelocAbs64;
 
-  // whether the cpu supports native SBF_SDIV
-  bool HasSdiv;
-
   // Not used for anything, just set by the static-syscalls marker feature.
   bool HasStaticSyscalls;
 
@@ -81,6 +78,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether to encode destination register in Callx's src field
   bool CallxRegSrc;
 
+  // Whether we have the PQR instruction class
+  bool HasPqrClass;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -97,12 +97,12 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasJmpExt() const { return HasJmpExt; }
   bool getHasAlu32() const { return HasAlu32; }
   bool getHasDynamicFrames() const { return HasDynamicFrames; }
-  bool getHasSdiv() const { return HasSdiv; }
   bool getUseDwarfRIS() const { return UseDwarfRIS; }
   bool getDisableNeg() const { return DisableNeg; }
   bool getReverseSubImm() const { return ReverseSubImm; }
   bool getNoLddw() const { return NoLddw; }
   bool getCallXRegSrc() const { return CallxRegSrc; }
+  bool getHasPqrClass() const { return HasPqrClass; }
 
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 75115bf36eb29..bc2e83ef97337 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -25,9 +25,6 @@ def FeatureSolana : SubtargetFeature<"solana", "IsSolana", "true",
 def FeatureDynamicFrames : SubtargetFeature<"dynamic-frames", "HasDynamicFrames", "true",
                                             "Enable dynamic frames">;
 
-def FeatureSdiv : SubtargetFeature<"sdiv", "HasSdiv", "true",
-                                   "Enable native SBF_SDIV support">;
-
 def FeatureRelocAbs64 : SubtargetFeature<"reloc-abs64", "UseRelocAbs64", "true",
                                    "Fix 64bit data relocations">;
 
@@ -46,6 +43,9 @@ def FeatureDisableLddw : SubtargetFeature<"no-lddw", "NoLddw", "true",
 def FeatureCallxRegSrc : SubtargetFeature<"callx-reg-src", "CallxRegSrc", "true",
                                     "Encode Callx destination register in the src field">;
 
+def FeaturePqrInstr : SubtargetFeature<"pqr-instr", "HasPqrClass", "true",
+                                    "Enable the PQR instruction class">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
@@ -54,5 +54,6 @@ def : Proc<"v1", []>;
 def : Proc<"v2", []>;
 def : Proc<"v3", []>;
 def : Proc<"probe", []>;
-def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureSdiv, FeatureRelocAbs64, FeatureStaticSyscalls,
-                        FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc]>;
\ No newline at end of file
+def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
+                        FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
+                          FeaturePqrInstr]>;
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/pqr-class.ll b/llvm/test/CodeGen/SBF/pqr-class.ll
new file mode 100644
index 0000000000000..7c8e01093a4ed
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/pqr-class.ll
@@ -0,0 +1,196 @@
+; RUN: llc -march=sbf -mcpu=sbfv2 -mattr=+alu32 < %s | FileCheck --check-prefix=CHECK-v2 %s
+; RUN: llc -march=sbf -mattr=+alu32 < %s | FileCheck --check-prefix=CHECK-v1 %s
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i64 @test_pqr_unsigned(i64 noundef %a, i64 noundef %b) local_unnamed_addr #0 {
+entry:
+  %div1 = udiv i64 %a, %b
+  %div2 = udiv i64 %b, 7
+  %rem1 = urem i64 %a, %b
+  %rem2 = urem i64 %b, 17
+
+; CHECK-v2: urem64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v2: udiv64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v2: urem64 r{{[0-9]+}}, 17
+; CHECK-v2: udiv64 r{{[0-9]+}}, 7
+; CHECK-v2: lmul64 r{{[0-9]+}}, r2
+; CHECK-V2: lmul64 r{{[0-9]+}}, 7
+
+; CHECK-v1: div64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: mul64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: sub64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: add64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: div64 r{{[0-9]+}}, 17
+; CHECK-v1: mul64 r{{[0-9]+}}, 17
+; CHECK-v1: mov64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: sub64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: div64 r{{[0-9]+}}, 7
+; CHECK-v1: mul64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: mul64 r{{[0-9]+}}, 7
+
+  %add1 = add i64 %div1, %rem1
+  %add2 = add i64 %div2, %rem2
+
+  %mul1 = mul i64 %add1, %add2
+  %mul2 = mul i64 %mul1, 7
+  ret i64 %mul2
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i64 @test_pqr_signed(i64 noundef %a, i64 noundef %b) local_unnamed_addr #0 {
+entry:
+  %div1 = sdiv i64 %a, %b
+  %div2 = sdiv i64 %b, 7
+  %rem1 = srem i64 %a, %b
+  %rem2 = srem i64 %b, 17
+
+; CHECK-v2: srem64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v2: sdiv64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v2: srem64 r{{[0-9]+}}, 17
+; CHECK-v2: sdiv64 r{{[0-9]+}}, 7
+; CHECK-v2: lmul64 r{{[0-9]+}}, r2
+; CHECK-v2: lmul64 r{{[0-9]+}}, 7
+
+; CHECK-v1: call __divdi3
+; CHECK-v1: call __moddi3
+; CHECK-v1: call __divdi3
+; CHECK-v1: call __moddi3
+
+  %add1 = add i64 %div1, %rem1
+  %add2 = add i64 %div2, %rem2
+
+  %mul1 = mul i64 %add1, %add2
+  %mul2 = mul i64 %mul1, 7
+  ret i64 %mul2
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i32 @test_pqr_unsigned_32(i32 noundef %a, i32 noundef %b) local_unnamed_addr #0 {
+entry:
+  %div1 = udiv i32 %a, %b
+  %div2 = udiv i32 %b, 7
+  %rem1 = urem i32 %a, %b
+  %rem2 = urem i32 %b, 17
+
+; CHECK-v2: urem32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v2: udiv32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v2: urem32 w{{[0-9]+}}, 17
+; CHECK-v2: udiv32 w{{[0-9]+}}, 7
+; CHECK-v2: lmul32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v2: lmul32 w{{[0-9]+}}, 7
+
+; CHECK-v1: div32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: mul32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: sub32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: add32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: div32 w{{[0-9]+}}, 17
+; CHECK-v1: mul32 w{{[0-9]+}}, 17
+; CHECK-v1: mov32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: sub32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: div32 w{{[0-9]+}}, 7
+; CHECK-v1: add32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: mul32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: mul32 w{{[0-9]+}}, 7
+
+  %add1 = add i32 %div1, %rem1
+  %add2 = add i32 %div2, %rem2
+
+  %mul1 = mul i32 %add1, %add2
+  %mul2 = mul i32 %mul1, 7
+  ret i32 %mul2
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i32 @test_pqr_signed_32(i32 noundef %a, i32 noundef %b) local_unnamed_addr #0 {
+entry:
+  %div1 = sdiv i32 %a, %b
+  %div2 = sdiv i32 %b, 7
+  %rem1 = srem i32 %a, %b
+  %rem2 = srem i32 %b, 17
+
+; CHECK-v2: srem32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v2: sdiv32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v2: srem32 w{{[0-9]+}}, 17
+; CHECK-v2: sdiv32 w{{[0-9]+}}, 7
+; CHECK-v2: lmul32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v2: lmul32 w{{[0-9]+}}, 7
+
+; CHECK-v1: call __divsi3
+; CHECK-v1: call __modsi3
+; CHECK-v1: call __divsi3
+; CHECK-v1: call __modsi3
+
+  %add1 = add i32 %div1, %rem1
+  %add2 = add i32 %div2, %rem2
+
+  %mul1 = mul i32 %add1, %add2
+  %mul2 = mul i32 %mul1, 7
+  ret i32 %mul2
+}
+
+
+; int64_t try_mul(int64_t a, int64_t b) {
+;    int64_t c = (a * (unsigned __int128)b) >> 64;
+;    int64_t d = (73 * (unsigned __int128)b) >> 64;
+;    return c+d;
+;  }
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind ssp willreturn memory(none) uwtable(sync)
+define i64 @uhmul(i64 noundef %a, i64 noundef %b) local_unnamed_addr #0 {
+entry:
+  %conv = zext i64 %a to i128
+  %conv1 = zext i64 %b to i128
+  %mul = mul nuw i128 %conv1, %conv
+  %shr = lshr i128 %mul, 64
+  %conv2 = trunc i128 %shr to i64
+  %mul4 = mul nuw nsw i128 %conv1, 73
+  %shr5 = lshr i128 %mul4, 64
+  %conv6 = trunc i128 %shr5 to i64
+  %add = add i64 %conv2, %conv6
+  ret i64 %add
+
+; CHECK-v2: uhmul64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v2: uhmul64 r{{[0-9]+}}, 73
+
+; CHECK-v1: call __multi3
+; CHECK-v1: call __multi3
+
+}
+
+; uint64_t try_mul(int64_t a, int64_t b) {
+;    uint64_t c = (a * (unsigned __int128)b) >> 64;
+;    uint64_t d = (73 * (unsigned __int128)b) >> 64;
+;    return c+d;
+;  }
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind ssp willreturn memory(none) uwtable(sync)
+define i64 @shmul(i64 noundef %a, i64 noundef %b) local_unnamed_addr #0 {
+entry:
+  %conv = sext i64 %a to i128
+  %conv1 = sext i64 %b to i128
+  %mul = mul nsw i128 %conv1, %conv
+  %shr = lshr i128 %mul, 64
+  %conv2 = trunc i128 %shr to i64
+  %mul4 = mul nsw i128 %conv1, 73
+  %shr5 = lshr i128 %mul4, 64
+  %conv6 = trunc i128 %shr5 to i64
+  %add = add nsw i64 %conv2, %conv6
+  ret i64 %add
+
+; CHECK-v2: shmul64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v2: shmul64 r{{[0-9]+}}, 73
+
+; CHECK-v1: call __multi3
+; CHECK-v1: call __multi3
+
+}
+
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn memory(none) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+solana" }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 16.0.5 (https://github.com/solana-labs/llvm-project.git abdbb6e4ef63f7b5b4ee40d2770ed0fca909c2dc)"}
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
index 38b3f10efe04e..20e3f701c0d8f 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
@@ -83,25 +83,6 @@
 
 
 
-# CHECK-NEW: sdiv64 r0, r9
-0xef,0x90,0x00,0x00,0x00,0x00,0x00,0x00
-
-# CHECK-NEW: sdiv64 r3, r2
-0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00
-
-# CHECK-NEW: sdiv64 r3, 123 
-0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
-
-# CHECK-NEW: sdiv64 r5, -123 
-0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff
-
-# CHECK-NEW: sdiv32 w6, w2
-0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00
-
-# CHECK-NEW: sdiv32 w5, -123 
-0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff
-
-
 # CHECK-NEW: hor64 r0, 129
 0xf7,0x90,0x00,0x00,0x81,0x00,0x00,0x00
 
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt b/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt
new file mode 100644
index 0000000000000..d941711b1987f
--- /dev/null
+++ b/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt
@@ -0,0 +1,75 @@
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
+# RUN:                          | FileCheck %s --check-prefix=CHECK
+
+
+# CHECK: uhmul64 r1, 65226
+0x36,0x01,0x00,0x00,0xca,0xfe,0x00,0x00
+
+# CHECK: uhmul64 r5, r4
+0x3e,0x45,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: udiv32 w9, 4185
+0x46,0x09,0x00,0x00,0x59,0x10,0x00,0x00
+
+# CHECK: udiv32 w3, w2
+0x4e,0x23,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: udiv64 r5, 120
+0x56,0x05,0x00,0x00,0x78,0x00,0x00,0x00
+
+# CHECK: udiv64 r7, r6
+0x5e,0x67,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: urem32 w5, 27
+0x66,0x05,0x00,0x00,0x1b,0x00,0x00,0x00
+
+# CHECK: urem32 w8, w2
+0x6e,0x28,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: urem64 r2, 125
+0x76,0x02,0x00,0x00,0x7d,0x00,0x00,0x00
+
+# CHECK: urem64 r4, r3
+0x7e,0x34,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: lmul32 w3, 29819
+0x86,0x03,0x00,0x00,0x7b,0x74,0x00,0x00
+
+# CHECK: lmul32 w9, w10
+0x8e,0xa9,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: lmul64 r7, 903
+0x96,0x07,0x00,0x00,0x87,0x03,0x00,0x00
+
+# CHECK: lmul64 r8, r2
+0x9e,0x28,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: shmul64 r7, 629
+0xb6,0x07,0x00,0x00,0x75,0x02,0x00,0x00
+
+# CHECK: shmul64 r10, r9
+0xbe,0x9a,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: sdiv32 w10, 14912
+0xc6,0x0a,0x00,0x00,0x40,0x3a,0x00,0x00
+
+# CHECK: sdiv32 w1, w10
+0xce,0xa1,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: sdiv64 r10, 15804061
+0xd6,0x0a,0x00,0x00,0x9d,0x26,0xf1,0x00
+
+# CHECK: sdiv64 r9, r10
+0xde,0xa9,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: srem32 w3, -98
+0xe6,0x03,0x00,0x00,0x9e,0xff,0xff,0xff
+
+# CHECK: srem32 w11, w10
+0xee,0xab,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK: srem64 r7, -987
+0xf6,0x07,0x00,0x00,0x25,0xfc,0xff,0xff
+
+# CHECK: srem64 r6, r5
+0xfe,0x56,0x00,0x00,0x00,0x00,0x00,0x00
\ No newline at end of file
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 7cc5ce6d2a346..eb0d5da9de041 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -111,30 +111,6 @@ div32 w5, -123
 
 
 
-# CHECK-OBJ-NEW: sdiv64 r0, r9
-# CHECK-ASM-NEW: encoding: [0xef,0x90,0x00,0x00,0x00,0x00,0x00,0x00]
-sdiv64 r0, r9
-
-# CHECK-OBJ-NEW: sdiv64 r3, r2
-# CHECK-ASM-NEW: encoding: [0xef,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
-sdiv64 r3, r2
-
-# CHECK-OBJ-NEW: sdiv64 r3, 0x7b
-# CHECK-ASM-NEW: encoding: [0xe7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
-sdiv64 r3, 123
-
-# CHECK-OBJ-NEW: sdiv64 r5, -0x7b
-# CHECK-ASM-NEW: encoding: [0xe7,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-sdiv64 r5, -123
-
-# CHECK-OBJ-NEW: sdiv32 w6, w2
-# CHECK-ASM-NEW: encoding: [0xec,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
-sdiv32 w6, w2
-
-# CHECK-OBJ-NEW: sdiv32 w5, -0x7b
-# CHECK-ASM-NEW: encoding: [0xe4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
-sdiv32 w5, -123
-
 # CHECK-OBJ-NEW: hor64 r0, 0x2c4
 # CHECK-ASM-NEW: encoding: [0xf7,0x00,0x00,0x00,0xc4,0x02,0x00,0x00]
 hor64 r0, 708
diff --git a/llvm/test/MC/SBF/sbf-pqr.s b/llvm/test/MC/SBF/sbf-pqr.s
new file mode 100644
index 0000000000000..d2d1a65a25f8b
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-pqr.s
@@ -0,0 +1,102 @@
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
+# RUN:     | llvm-objdump -d -r --mattr=+alu32 - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
+
+
+# CHECK-OBJ-NEW: uhmul64 r1, 0x1b
+# CHECK-ASM-NEW: encoding: [0x36,0x01,0x00,0x00,0x1b,0x00,0x00,0x00]
+uhmul64 r1, 27
+
+# CHECK-OBJ-NEW: uhmul64 r2, r3
+# CHECK-ASM-NEW: encoding: [0x3e,0x32,0x00,0x00,0x00,0x00,0x00,0x00]
+uhmul64 r2, r3
+
+# CHECK-OBJ-NEW: udiv32 w4, 0x59
+# CHECK-ASM-NEW: encoding: [0x46,0x04,0x00,0x00,0x59,0x00,0x00,0x00]
+udiv32 w4, 89
+
+# CHECK-OBJ-NEW: udiv32 w4, w5
+# CHECK-ASM-NEW: encoding: [0x4e,0x54,0x00,0x00,0x00,0x00,0x00,0x00]
+udiv32 w4, w5
+
+# CHECK-OBJ-NEW: udiv64 r5, 0x63
+# CHECK-ASM-NEW: encoding: [0x56,0x05,0x00,0x00,0x63,0x00,0x00,0x00]
+udiv64 r5, 99
+
+# CHECK-OBJ-NEW: udiv64 r6, r7
+# CHECK-ASM-NEW: encoding: [0x5e,0x76,0x00,0x00,0x00,0x00,0x00,0x00]
+udiv64 r6, r7
+
+# CHECK-OBJ-NEW: urem32 w9, 0xb
+# CHECK-ASM-NEW: encoding: [0x66,0x09,0x00,0x00,0x0b,0x00,0x00,0x00]
+urem32 w9, 11
+
+# CHECK-OBJ-NEW: urem32 w2, w1
+# CHECK-ASM-NEW: encoding: [0x6e,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+urem32 w2, w1
+
+# CHECK-OBJ-NEW: urem64 r4, 0x4d
+# CHECK-ASM-NEW: encoding: [0x76,0x04,0x00,0x00,0x4d,0x00,0x00,0x00]
+urem64 r4, 77
+
+# CHECK-OBJ-NEW: urem64 r4, r3
+# CHECK-ASM-NEW: encoding: [0x7e,0x34,0x00,0x00,0x00,0x00,0x00,0x00]
+urem64 r4, r3
+
+# CHECK-OBJ-NEW: lmul32 w4, 0x7b
+# CHECK-ASM-NEW: encoding: [0x86,0x04,0x00,0x00,0x7b,0x00,0x00,0x00]
+lmul32 w4, 123
+
+# CHECK-OBJ-NEW: lmul32 w5, w4
+# CHECK-ASM-NEW: encoding: [0x8e,0x45,0x00,0x00,0x00,0x00,0x00,0x00]
+lmul32 w5, w4
+
+# CHECK-OBJ-NEW: lmul64 r6, 0x387
+# CHECK-ASM-NEW: encoding: [0x96,0x06,0x00,0x00,0x87,0x03,0x00,0x00]
+lmul64 r6, 903
+
+# CHECK-OBJ-NEW: lmul64 r8, r7
+# CHECK-ASM-NEW: encoding: [0x9e,0x78,0x00,0x00,0x00,0x00,0x00,0x00]
+lmul64 r8, r7
+
+# CHECK-OBJ-NEW: shmul64 r8, 0x275
+# CHECK-ASM-NEW: encoding: [0xb6,0x08,0x00,0x00,0x75,0x02,0x00,0x00]
+shmul64 r8, 629
+
+# CHECK-OBJ-NEW: shmul64 r9, r8
+# CHECK-ASM-NEW: encoding: [0xbe,0x89,0x00,0x00,0x00,0x00,0x00,0x00]
+shmul64 r9, r8
+
+# CHECK-OBJ-NEW: sdiv32 w10, 0x3a40
+# CHECK-ASM-NEW: encoding: [0xc6,0x0a,0x00,0x00,0x40,0x3a,0x00,0x00]
+sdiv32 w10, 14912
+
+# CHECK-OBJ-NEW: sdiv32 w10, w9
+# CHECK-ASM-NEW: encoding: [0xce,0x9a,0x00,0x00,0x00,0x00,0x00,0x00]
+sdiv32 w10, w9
+
+# CHECK-OBJ-NEW: sdiv64 r10, 0x1269d
+# CHECK-ASM-NEW: encoding: [0xd6,0x0a,0x00,0x00,0x9d,0x26,0x01,0x00]
+sdiv64 r10, 75421
+
+# CHECK-OBJ-NEW: sdiv64 r9, r10
+# CHECK-ASM-NEW: encoding: [0xde,0xa9,0x00,0x00,0x00,0x00,0x00,0x00]
+sdiv64 r9, r10
+
+# CHECK-OBJ-NEW: srem32 w3, -0x62
+# CHECK-ASM-NEW: encoding: [0xe6,0x03,0x00,0x00,0x9e,0xff,0xff,0xff]
+srem32 w3, -98
+
+# CHECK-OBJ-NEW: srem32 w4, w3
+# CHECK-ASM-NEW: encoding: [0xee,0x34,0x00,0x00,0x00,0x00,0x00,0x00]
+srem32 w4, w3
+
+# CHECK-OBJ-NEW: srem64 r7, -0x3db
+# CHECK-ASM-NEW: encoding: [0xf6,0x07,0x00,0x00,0x25,0xfc,0xff,0xff]
+srem64 r7, -987
+
+# CHECK-OBJ-NEW: srem64 r10, r5
+# CHECK-ASM-NEW: encoding: [0xfe,0x5a,0x00,0x00,0x00,0x00,0x00,0x00]
+srem64 r10, r5
diff --git a/llvm/test/MC/SBF/sbf-sdiv.s b/llvm/test/MC/SBF/sbf-sdiv.s
deleted file mode 100644
index 81c002d0712e8..0000000000000
--- a/llvm/test/MC/SBF/sbf-sdiv.s
+++ /dev/null
@@ -1,15 +0,0 @@
-# RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump -d -r %t | FileCheck %s
-
-sdiv32 w1, w2   // BPF_SDIV | BPF_X
-// CHECK: ec 21 00 00 00 00 00 00      sdiv32 w1, w2
-
-sdiv32 w3, 6    // BPF_SDIV | BPF_K
-// CHECK: e4 03 00 00 06 00 00 00      sdiv32 w3, 0x6
-
-
-sdiv64 r4, r5   // BPF_SDIV | BPF_X
-// CHECK: ef 54 00 00 00 00 00 00 	sdiv64 r4, r5
-
-sdiv64 r5, 6    // BPF_SDIV | BPF_K
-// CHECK: e7 05 00 00 06 00 00 00 	sdiv64 r5, 0x6

From e7e6756254fc62f4fccda6e5e348b0e9bf05d164 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 19 Jan 2024 09:56:20 -0300
Subject: [PATCH 031/114] [SOL] Fix Predicate naming convention (#82)

* Fix out of pattern name

* Remove deprecated function
---
 llvm/lib/Target/SBF/SBFISelLowering.cpp | 2 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 32420b735469d..fc415d6231a11 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -471,7 +471,7 @@ SDValue SBFTargetLowering::LowerFormalArguments(
       SDValue Const = DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(), DL, MVT::i64);
       SDValue SDV = DAG.getCopyFromReg(Chain, DL, reg, getPointerTy(MF.getDataLayout()));
       SDV = DAG.getNode(ISD::SUB, DL, PtrVT, SDV, Const);
-      SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo(), 0);
+      SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo());
       InVals.push_back(SDV);
     } else {
       fail(DL, DAG, "defined with too many args");
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 95ce0ec412c03..3ccb1a3587b68 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -62,7 +62,7 @@ def SBFNoNeg: Predicate<"Subtarget->getDisableNeg()">;
 def SBFRevSub : Predicate<"Subtarget->getReverseSubImm()">;
 def SBFNoRevSub : Predicate<"!Subtarget->getReverseSubImm()">;
 def SBFCallxSrc : Predicate<"Subtarget->getCallXRegSrc()">, AssemblerPredicate<(all_of FeatureCallxRegSrc)>;
-def NoSBFCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">;
+def SBFNoCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">;
 def SBFPqrInstr : Predicate<"Subtarget->getHasPqrClass()">;
 def SBFNoPqrInstr : Predicate<"!Subtarget->getHasPqrClass()">;
 
@@ -583,7 +583,7 @@ let isCall=1, hasDelaySlot=0, Uses = [R11],
     // Potentially clobbered registers
     Defs = [R0, R1, R2, R3, R4, R5] in {
   def JAL     : CALL<"call">;
-  def JALX    : CALLX<"callx">, Requires<[NoSBFCallxSrc]>;
+  def JALX    : CALLX<"callx">, Requires<[SBFNoCallxSrc]>;
   let DecoderNamespace = "SBFv2" in {
     def JALX_v2 : CALLX_SRC_REG<"callx">, Requires<[SBFCallxSrc]>;
   }
@@ -680,7 +680,7 @@ def : Pat<(i64 (and (i64 GPR:$src), 0xffffFFFF)),
 def : Pat<(SBFcall tglobaladdr:$dst), (JAL tglobaladdr:$dst)>;
 def : Pat<(SBFcall texternalsym:$dst), (JAL texternalsym:$dst)>;
 def : Pat<(SBFcall imm:$dst), (JAL imm:$dst)>;
-def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>, Requires<[NoSBFCallxSrc]>;
+def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>, Requires<[SBFNoCallxSrc]>;
 def : Pat<(SBFcall GPR:$dst), (JALX_v2 GPR:$dst)>, Requires<[SBFCallxSrc]>;
 
 // Loads

From 1da91bb104a8bf15f4d390cf5c79dc3f02368353 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 30 Jan 2024 09:35:33 -0300
Subject: [PATCH 032/114] [SOL] Allocate call arguments on a fixed stack object
 (#84)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp | 43 +++++++++++++++++++------
 llvm/test/CodeGen/SBF/stack_args_v2.ll  | 32 ++++++++++++++++++
 2 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/stack_args_v2.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index fc415d6231a11..e87262e1b993f 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -11,11 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SBFISelLowering.h"
-#include "SBF.h"
 #include "SBFRegisterInfo.h"
 #include "SBFSubtarget.h"
-#include "SBFTargetMachine.h"
 #include "llvm/CodeGen/CallingConvLower.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
@@ -26,7 +23,6 @@
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/IR/IntrinsicsBPF.h" // TODO: jle.
-#include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
@@ -466,9 +462,17 @@ SDValue SBFTargetLowering::LowerFormalArguments(
       EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
       EVT LocVT = VA.getLocVT();
 
+      unsigned Offset;
+      if (Subtarget->getHasDynamicFrames()) {
+        // In SBFv2, the arguments are stored on the start of the frame.
+        Offset = VA.getLocMemOffset() + PtrVT.getFixedSizeInBits() / 8;
+      } else {
+        Offset = SBFRegisterInfo::FrameLength - VA.getLocMemOffset();
+      }
+
       // Arguments relative to SBF::R5
       unsigned reg = MF.addLiveIn(SBF::R5, &SBF::GPRRegClass);
-      SDValue Const = DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(), DL, MVT::i64);
+      SDValue Const = DAG.getConstant(Offset, DL, MVT::i64);
       SDValue SDV = DAG.getCopyFromReg(Chain, DL, reg, getPointerTy(MF.getDataLayout()));
       SDV = DAG.getNode(ISD::SUB, DL, PtrVT, SDV, Const);
       SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo());
@@ -587,7 +591,10 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   SDValue InFlag;
 
   if (HasStackArgs) {
-    SDValue FramePtr = DAG.getCopyFromReg(Chain, CLI.DL, SBF::R10, getPointerTy(MF.getDataLayout()));
+    SDValue FramePtr = DAG.getCopyFromReg(Chain,
+                                          CLI.DL,
+                                          Subtarget->getRegisterInfo()->getFrameRegister(MF),
+                                          getPointerTy(MF.getDataLayout()));
 
     // Stack arguments have to be walked in reverse order by inserting
     // chained stores, this ensures their order is not changed by the scheduler
@@ -601,9 +608,27 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       assert(VA.isMemLoc());
 
       EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
-      SDValue Const = DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(), CLI.DL, MVT::i64);
-      SDValue PtrOff = DAG.getNode(ISD::SUB, CLI.DL, PtrVT, FramePtr, Const);
-      Chain = DAG.getStore(Chain, CLI.DL, Arg, PtrOff, MachinePointerInfo());
+      SDValue DstAddr;
+      MachinePointerInfo DstInfo;
+      if (Subtarget->getHasDynamicFrames()) {
+        // When dynamic frames are enabled, the frame size is only calculated
+        // after lowering instructions, so we must place arguments at the start
+        // of the frame.
+        int64_t Offset = -static_cast<int64_t>(VA.getLocMemOffset() +
+                                               PtrVT.getFixedSizeInBits() / 8);
+        int FrameIndex = MF.getFrameInfo().CreateFixedObject(
+            VA.getLocVT().getFixedSizeInBits() / 8, Offset, false);
+        DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
+        DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
+      } else {
+        SDValue Const =
+            DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(),
+                            CLI.DL, MVT::i64);
+        DstAddr = DAG.getNode(ISD::SUB, CLI.DL, PtrVT, FramePtr, Const);
+        DstInfo = MachinePointerInfo();
+      }
+
+      Chain = DAG.getStore(Chain, CLI.DL, Arg, DstAddr, DstInfo);
     }
 
     // Pass the current stack frame pointer via SBF::R5, gluing the
diff --git a/llvm/test/CodeGen/SBF/stack_args_v2.ll b/llvm/test/CodeGen/SBF/stack_args_v2.ll
new file mode 100644
index 0000000000000..4a13de3771ecc
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/stack_args_v2.ll
@@ -0,0 +1,32 @@
+; RUN: llc -O2 -march=sbf -mcpu=sbfv2 < %s | FileCheck %s
+
+; Function Attrs: nounwind uwtable
+define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
+; CHECK-LABEL: foo:
+; CHECK: mov64 r4, 2
+; CHECK: stxdw [r10 - 8], r4
+; CHECK: mov64 r4, 3
+; CHECK: stxdw [r10 - 16], r4
+; CHECK: mov64 r5, r10
+; CHECK: mov64 r4, 1
+; CHECK: call bar
+entry:
+  %call = tail call i32 @bar(i32 %a, i32 %b, i32 %c, i32 1, i32 2, i32 3) #3
+  ret i32 %call
+}
+
+; Function Attrs: nounwind uwtable
+define i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) #1 {
+; CHECK-LABEL: bar:
+; CHECK: ldxdw r1, [r5 - 8]
+; CHECK: sub64 r0, r1
+; CHECK: ldxdw r1, [r5 - 16]
+; CHECK: add64 r0, r1
+entry:
+  %g = add i32 %a, %b
+  %h = sub i32 %g, %c
+  %i = add i32 %h, %d
+  %j = sub i32 %i, %e
+  %k = add i32 %j, %f
+  ret i32 %k
+}

From 20f3013a8529292a3f3d4837ffdb43400d89fa5e Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Wed, 31 Jan 2024 11:38:45 -0300
Subject: [PATCH 033/114] [SOL] Adjust compilation after upgrading to LLVM 17

---
 clang/lib/Basic/Targets.cpp                        |  2 ++
 clang/test/CodeGen/ext-int-cc.c                    |  2 +-
 lld/test/MachO/compact-unwind-generated.test       |  1 -
 llvm/lib/Target/BPF/BPFRegisterInfo.cpp            |  2 ++
 llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h    |  2 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp            |  2 +-
 llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll    |  1 +
 llvm/test/CodeGen/RISCV/inline-option-directive.ll |  1 -
 llvm/test/CodeGen/RISCV/rv32xtheadbb.ll            |  1 +
 llvm/test/CodeGen/RISCV/rv64xtheadbb.ll            |  1 +
 llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll      |  2 --
 llvm/test/CodeGen/SBF/undef.ll                     | 14 +++++++-------
 llvm/test/MC/RISCV/option-invalid.s                |  1 -
 13 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 281aebdb1c35d..1d02695119473 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -268,6 +268,8 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
   case llvm::Triple::bpfeb:
   case llvm::Triple::bpfel:
     return std::make_unique<BPFTargetInfo>(Triple, Opts);
+  case llvm::Triple::sbf:
+    return std::make_unique<BPFTargetInfo>(Triple, Opts);
 
   case llvm::Triple::msp430:
     return std::make_unique<MSP430TargetInfo>(Triple, Opts);
diff --git a/clang/test/CodeGen/ext-int-cc.c b/clang/test/CodeGen/ext-int-cc.c
index 33a85dfbd078c..e8e7fa7998b67 100644
--- a/clang/test/CodeGen/ext-int-cc.c
+++ b/clang/test/CodeGen/ext-int-cc.c
@@ -29,7 +29,7 @@
 // RUN: %clang_cc1 -no-enable-noundef-analysis -triple arm -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=ARM
 // RUN: %clang_cc1 -no-enable-noundef-analysis -triple loongarch64 -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=LA64
 // RUN: %clang_cc1 -no-enable-noundef-analysis -triple loongarch32 -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=LA32
-// RUN: %clang_cc1 -no-opaque-pointers -no-enable-noundef-analysis -triple sbf -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=SBF
+// RUN: %clang_cc1 -no-enable-noundef-analysis -triple sbf -O3 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s --check-prefixes=SBF
 
 // Make sure 128 and 64 bit versions are passed like integers.
 void ParamPassing(_BitInt(128) b, _BitInt(64) c) {}
diff --git a/lld/test/MachO/compact-unwind-generated.test b/lld/test/MachO/compact-unwind-generated.test
index 34a4e9d820762..b81236b198c3b 100644
--- a/lld/test/MachO/compact-unwind-generated.test
+++ b/lld/test/MachO/compact-unwind-generated.test
@@ -1,5 +1,4 @@
 # REQUIRES: x86
-# XFAIL: system-darwin
 
 # FIXME(gkm): This test is fast on a Release tree, and slow (~10s) on
 # a Debug tree mostly because of llvm-mc. Is there a way to prefer the
diff --git a/llvm/lib/Target/BPF/BPFRegisterInfo.cpp b/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
index 307f278025ff4..4f9135922d34a 100644
--- a/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
+++ b/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
@@ -31,6 +31,8 @@ static cl::opt<int>
                        cl::desc("Specify the BPF stack size limit"),
                        cl::init(512));
 
+unsigned BPFRegisterInfo::FrameLength = 512;
+
 BPFRegisterInfo::BPFRegisterInfo()
     : BPFGenRegisterInfo(BPF::R0) {}
 
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
index fe884c622b2f2..4b114c44f7565 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCAsmInfo.h
@@ -13,8 +13,8 @@
 #ifndef LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCASMINFO_H
 #define LLVM_LIB_TARGET_SBF_MCTARGETDESC_SBFMCASMINFO_H
 
-#include "llvm/ADT/Triple.h"
 #include "llvm/MC/MCAsmInfo.h"
+#include "llvm/TargetParser/Triple.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index e87262e1b993f..b43ec8dba7ac9 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -532,7 +532,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
     CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32 : CC_SBF64);
   }
 
-  unsigned NumBytes = CCInfo.getNextStackOffset();
+  unsigned NumBytes = CCInfo.getStackSize();
 
   if (!Subtarget->isSolana()) {
     if (Outs.size() > MaxArgs)
diff --git a/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll b/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll
index 03a6a6b1c4b7d..1a8ffc9550d4e 100644
--- a/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll
+++ b/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll
@@ -1,4 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 3
+; XFAIL: *
 ; RUN: llc -mtriple=riscv64 -mattr=+zbb -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV64ZBB
 ; RUN: llc -mtriple=riscv32 -mattr=+zbb -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV32ZBB
 
diff --git a/llvm/test/CodeGen/RISCV/inline-option-directive.ll b/llvm/test/CodeGen/RISCV/inline-option-directive.ll
index 09b22f9f301e9..2c4a936b2dff3 100644
--- a/llvm/test/CodeGen/RISCV/inline-option-directive.ll
+++ b/llvm/test/CodeGen/RISCV/inline-option-directive.ll
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; RUN: llc -mtriple=riscv64 < %s -o - | FileCheck --check-prefixes=CHECK-ATTRIBUTES %s
 ; RUN: llc -mtriple=riscv64 < %s -filetype=obj | llvm-readelf -h - \
 ; RUN:     | FileCheck --check-prefixes=CHECK-EFLAGS %s
diff --git a/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll b/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll
index 4bb8d6c248caa..68265afec4dc9 100644
--- a/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll
+++ b/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll
@@ -1,3 +1,4 @@
+; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \
 ; RUN:   | FileCheck %s -check-prefixes=RV32I
diff --git a/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll b/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll
index d9f7d36127293..0b4f910646d21 100644
--- a/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll
+++ b/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll
@@ -1,3 +1,4 @@
+; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc -mtriple=riscv64 -verify-machineinstrs < %s \
 ; RUN:   | FileCheck %s -check-prefix=RV64I
diff --git a/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll b/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll
index bda5d106f50d5..b869622704301 100644
--- a/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll
+++ b/llvm/test/CodeGen/SBF/CORE/intrinsic-array.ll
@@ -1,8 +1,6 @@
 ; RUN: opt -O2 %s | llvm-dis > %t1
 ; RUN: llc -sbf-enable-btf-emission -filetype=asm -o - %t1 | FileCheck %s
 ; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -o - %t1 | FileCheck %s
-; RUN: llc -sbf-enable-btf-emission -filetype=asm -opaque-pointers -o - %t1 | FileCheck %s
-; RUN: llc -sbf-enable-btf-emission -mattr=+alu32 -filetype=asm -opaque-pointers -o - %t1 | FileCheck %s
 ;
 ; Source code:
 ;   #define _(x) (__builtin_preserve_access_index(x))
diff --git a/llvm/test/CodeGen/SBF/undef.ll b/llvm/test/CodeGen/SBF/undef.ll
index 133a9456ea8bb..e3fcffdd92e75 100644
--- a/llvm/test/CodeGen/SBF/undef.ll
+++ b/llvm/test/CodeGen/SBF/undef.ll
@@ -15,18 +15,18 @@
 define i32 @ebpf_filter(%struct.__sk_buff* nocapture readnone %ebpf_packet) #0 section "socket1" {
 
 ; CHECK: mov64 r1, 2569
-; CHECK: stxh [r10 - 4], r1
+; CHECK: stxh [r10 - 2], r1
 ; CHECK: mov64 r1, 134678021
-; CHECK: stxw [r10 - 8], r1
+; CHECK: stxw [r10 - 6], r1
 
 ; CHECK: mov64 r1, 0
-; CHECK-DAG: stxdw [r10 - 2], r1
-; CHECK-DAG: stxdw [r10 + 6], r1
-; CHECK-DAG: stxdw [r10 + 14], r1
-; CHECK-DAG: stxdw [r10 + 20], r1
+; CHECK-DAG: stxdw [r10 + 0], r1
+; CHECK-DAG: stxdw [r10 + 8], r1
+; CHECK-DAG: stxdw [r10 + 16], r1
+; CHECK-DAG: stxdw [r10 + 22], r1
 
 ; CHECK: mov64 r2, r10
-; CHECK: add64 r2, -8
+; CHECK: add64 r2, -6
 ; CHECK: lddw r1, routing
 ; CHECK: call bpf_map_lookup_elem
 ; CHECK: exit
diff --git a/llvm/test/MC/RISCV/option-invalid.s b/llvm/test/MC/RISCV/option-invalid.s
index e776131cc26fb..7f6de5f38c528 100644
--- a/llvm/test/MC/RISCV/option-invalid.s
+++ b/llvm/test/MC/RISCV/option-invalid.s
@@ -1,4 +1,3 @@
-# XFAIL: *
 # RUN: not llvm-mc -triple riscv32 < %s 2>&1 \
 # RUN:   | FileCheck --implicit-check-not=error: %s
 

From 13c3266012d80f91836387ab28894b1306e48782 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Wed, 31 Jan 2024 17:09:02 -0300
Subject: [PATCH 034/114] [SOL] Bring upstream BPF changes to SBF

---
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp |  4 --
 llvm/lib/Target/SBF/BTFDebug.cpp              |  2 +-
 llvm/lib/Target/SBF/CMakeLists.txt            |  1 +
 .../SBF/Disassembler/SBFDisassembler.cpp      |  8 +--
 .../SBF/MCTargetDesc/SBFMCCodeEmitter.cpp     | 18 ++++---
 llvm/lib/Target/SBF/SBF.h                     |  8 ---
 .../Target/SBF/SBFAbstractMemberAccess.cpp    | 26 ----------
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp          | 16 ------
 llvm/lib/Target/SBF/SBFIRPeephole.cpp         | 15 ------
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |  3 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 40 ++++++++-------
 llvm/lib/Target/SBF/SBFISelLowering.h         |  4 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td           |  4 +-
 llvm/lib/Target/SBF/SBFMIChecking.cpp         |  4 +-
 llvm/lib/Target/SBF/SBFMIPeephole.cpp         |  2 +-
 .../lib/Target/SBF/SBFMISimplifyPatchable.cpp | 26 +++++++++-
 llvm/lib/Target/SBF/SBFPreserveDIType.cpp     | 19 -------
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |  2 +-
 llvm/lib/Target/SBF/SBFSubtarget.h            |  1 -
 llvm/lib/Target/SBF/SBFTargetFeatures.td      |  2 +-
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      | 14 +++--
 llvm/test/CodeGen/SBF/no-merge-attr.ll        | 51 +++++++++++++++++++
 llvm/test/CodeGen/SBF/vla.ll                  |  2 +-
 23 files changed, 133 insertions(+), 139 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/no-merge-attr.ll

diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index fcc56073520aa..76c08a5d46f6e 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -46,8 +46,6 @@ class SBFAsmParser : public MCTargetAsmParser {
   bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                         SMLoc NameLoc, OperandVector &Operands) override;
 
-  bool ParseDirective(AsmToken DirectiveID) override;
-
 #define GET_ASSEMBLER_HEADER
 #include "SBFGenAsmMatcher.inc"
 
@@ -457,8 +455,6 @@ bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
   return false;
 }
 
-bool SBFAsmParser::ParseDirective(AsmToken DirectiveID) { return true; }
-
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFAsmParser() {
   RegisterMCAsmParser<SBFAsmParser> XX(getTheSBFXTarget());
 }
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index f0317c76dd44b..22edaa0e55846 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -983,7 +983,7 @@ std::string BTFDebug::populateFileContent(const DISubprogram *SP) {
     FileName = std::string(File->getFilename());
 
   // No need to populate the contends if it has been populated!
-  if (FileContent.find(FileName) != FileContent.end())
+  if (FileContent.contains(FileName))
     return FileName;
 
   std::vector<std::string> Content;
diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index 40f071e00e737..2f0147a5476f1 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -39,6 +39,7 @@ add_llvm_target(SBFCodeGen
   Analysis
   AsmPrinter
   CodeGen
+  CodeGenTypes
   Core
   MC
   SBFDesc
diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 73c9feb1e4754..33d32dca68406 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -173,11 +173,11 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
   if ((InstClass == SBF_LDX || InstClass == SBF_STX) &&
       getInstSize(Insn) != SBF_DW &&
       (InstMode == SBF_MEM || InstMode == SBF_ATOMIC) &&
-      STI.getFeatureBits()[SBF::ALU32])
+      STI.hasFeature(SBF::ALU32))
     Result = decodeInstruction(DecoderTableSBFALU3264, Instr, Insn, Address,
                                this, STI);
-  else if (isMov32(Insn) && !STI.getFeatureBits()[SBF::ALU32] &&
-           STI.getFeatureBits()[SBF::FeatureDisableLddw])
+  else if (isMov32(Insn) && !STI.hasFeature(SBF::ALU32) &&
+           STI.hasFeature(SBF::FeatureDisableLddw))
     Result =
         decodeInstruction(DecoderTableSBFv264, Instr, Insn, Address, this, STI);
   else
@@ -206,7 +206,7 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
     break;
   }
   case SBF::JALX: {
-    if (STI.getFeatureBits()[SBF::FeatureCallxRegSrc]) {
+    if (STI.hasFeature(SBF::FeatureCallxRegSrc)) {
       Result = decodeInstruction(DecoderTableSBFv264, Instr, Insn, Address,
                                  this, STI);
     }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
index 5c5da990ec745..baf49bf109909 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
@@ -58,7 +58,7 @@ class SBFMCCodeEmitter : public MCCodeEmitter {
                             SmallVectorImpl<MCFixup> &Fixups,
                             const MCSubtargetInfo &STI) const;
 
-  void encodeInstruction(const MCInst &MI, raw_ostream &OS,
+  void encodeInstruction(const MCInst &MI, SmallVectorImpl<char> &CB,
                          SmallVectorImpl<MCFixup> &Fixups,
                          const MCSubtargetInfo &STI) const override;
 };
@@ -111,20 +111,22 @@ static uint8_t SwapBits(uint8_t Val) {
   return (Val & 0x0F) << 4 | (Val & 0xF0) >> 4;
 }
 
-void SBFMCCodeEmitter::encodeInstruction(const MCInst &MI, raw_ostream &OS,
+void SBFMCCodeEmitter::encodeInstruction(const MCInst &MI,
+                                         SmallVectorImpl<char> &CB,
                                          SmallVectorImpl<MCFixup> &Fixups,
                                          const MCSubtargetInfo &STI) const {
   unsigned Opcode = MI.getOpcode();
+  raw_svector_ostream OS(CB);
   support::endian::Writer OSE(OS,
                               IsLittleEndian ? support::little : support::big);
 
   if (Opcode == SBF::LD_imm64 || Opcode == SBF::LD_pseudo) {
     uint64_t Value = getBinaryCodeForInstr(MI, Fixups, STI);
-    OS << char(Value >> 56);
+    CB.push_back(Value >> 56);
     if (IsLittleEndian)
-      OS << char((Value >> 48) & 0xff);
+      CB.push_back((Value >> 48) & 0xff);
     else
-      OS << char(SwapBits((Value >> 48) & 0xff));
+      CB.push_back(SwapBits((Value >> 48) & 0xff));
     OSE.write<uint16_t>(0);
     OSE.write<uint32_t>(Value & 0xffffFFFF);
 
@@ -137,11 +139,11 @@ void SBFMCCodeEmitter::encodeInstruction(const MCInst &MI, raw_ostream &OS,
   } else {
     // Get instruction encoding and emit it
     uint64_t Value = getBinaryCodeForInstr(MI, Fixups, STI);
-    OS << char(Value >> 56);
+    CB.push_back(Value >> 56);
     if (IsLittleEndian)
-      OS << char((Value >> 48) & 0xff);
+      CB.push_back((Value >> 48) & 0xff);
     else
-      OS << char(SwapBits((Value >> 48) & 0xff));
+      CB.push_back(SwapBits((Value >> 48) & 0xff));
     OSE.write<uint16_t>((Value >> 32) & 0xffff);
     OSE.write<uint32_t>(Value & 0xffffFFFF);
   }
diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
index 91e072c6caeb6..0878b6375cd41 100644
--- a/llvm/lib/Target/SBF/SBF.h
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -18,12 +18,8 @@ namespace llvm {
 class SBFTargetMachine;
 class PassRegistry;
 
-ModulePass *createSBFAdjustOpt();
 ModulePass *createSBFCheckAndAdjustIR();
 
-FunctionPass *createSBFAbstractMemberAccess(SBFTargetMachine *TM);
-FunctionPass *createSBFPreserveDIType();
-FunctionPass *createSBFIRPeephole();
 FunctionPass *createSBFISelDag(SBFTargetMachine &TM);
 FunctionPass *createSBFMISimplifyPatchablePass();
 FunctionPass *createSBFMIPeepholePass();
@@ -31,17 +27,13 @@ FunctionPass *createSBFMIPeepholeTruncElimPass();
 FunctionPass *createSBFMIPreEmitPeepholePass();
 FunctionPass *createSBFMIPreEmitCheckingPass();
 
-void initializeSBFAbstractMemberAccessLegacyPassPass(PassRegistry &);
-void initializeSBFAdjustOptPass(PassRegistry&);
 void initializeSBFCheckAndAdjustIRPass(PassRegistry&);
 void initializeSBFDAGToDAGISelPass(PassRegistry &);
-void initializeSBFIRPeepholePass(PassRegistry &);
 void initializeSBFMIPeepholePass(PassRegistry&);
 void initializeSBFMIPeepholeTruncElimPass(PassRegistry &);
 void initializeSBFMIPreEmitCheckingPass(PassRegistry&);
 void initializeSBFMIPreEmitPeepholePass(PassRegistry &);
 void initializeSBFMISimplifyPatchablePass(PassRegistry &);
-void initializeSBFPreserveDITypePass(PassRegistry &);
 
 class SBFAbstractMemberAccessPass
     : public PassInfoMixin<SBFAbstractMemberAccessPass> {
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
index bba59962f3df5..28189161f61e5 100644
--- a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -188,34 +188,8 @@ class SBFAbstractMemberAccess final {
 
 std::map<std::string, GlobalVariable *> SBFAbstractMemberAccess::GEPGlobals;
 
-class SBFAbstractMemberAccessLegacyPass final : public FunctionPass {
-  SBFTargetMachine *TM;
-
-  bool runOnFunction(Function &F) override {
-    return SBFAbstractMemberAccess(TM).run(F);
-  }
-
-public:
-  static char ID;
-
-  // Add optional SBFTargetMachine parameter so that SBF backend can add the
-  // phase with target machine to find out the endianness. The default
-  // constructor (without parameters) is used by the pass manager for managing
-  // purposes.
-  SBFAbstractMemberAccessLegacyPass(SBFTargetMachine *TM = nullptr)
-      : FunctionPass(ID), TM(TM) {}
-};
-
 } // End anonymous namespace
 
-char SBFAbstractMemberAccessLegacyPass::ID = 0;
-INITIALIZE_PASS(SBFAbstractMemberAccessLegacyPass, DEBUG_TYPE,
-                "SBF Abstract Member Access", false, false)
-
-FunctionPass *llvm::createSBFAbstractMemberAccess(SBFTargetMachine *TM) {
-  return new SBFAbstractMemberAccessLegacyPass(TM);
-}
-
 bool SBFAbstractMemberAccess::run(Function &F) {
   LLVM_DEBUG(dbgs() << "********** Abstract Member Accesses **********\n");
 
diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
index ea6c1c97885dc..27ebb79f8c3f6 100644
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -41,14 +41,6 @@ static cl::opt<bool> DisableSBFavoidSpeculation(
 
 namespace {
 
-class SBFAdjustOpt final : public ModulePass {
-public:
-  static char ID;
-
-  SBFAdjustOpt() : ModulePass(ID) {}
-  bool runOnModule(Module &M) override;
-};
-
 class SBFAdjustOptImpl {
   struct PassThroughInfo {
     Instruction *Input;
@@ -78,14 +70,6 @@ class SBFAdjustOptImpl {
 
 } // End anonymous namespace
 
-char SBFAdjustOpt::ID = 0;
-INITIALIZE_PASS(SBFAdjustOpt, "sbf-adjust-opt", "SBF Adjust Optimization",
-                false, false)
-
-ModulePass *llvm::createSBFAdjustOpt() { return new SBFAdjustOpt(); }
-
-bool SBFAdjustOpt::runOnModule(Module &M) { return SBFAdjustOptImpl(&M).run(); }
-
 bool SBFAdjustOptImpl::run() {
   bool Changed = adjustICmpToBuiltin();
 
diff --git a/llvm/lib/Target/SBF/SBFIRPeephole.cpp b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
index 3b15c5c13e344..4ff66291585d8 100644
--- a/llvm/lib/Target/SBF/SBFIRPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
@@ -94,23 +94,8 @@ static bool SBFIRPeepholeImpl(Function &F) {
 
   return Changed;
 }
-
-class SBFIRPeephole final : public FunctionPass {
-  bool runOnFunction(Function &F) override;
-
-public:
-  static char ID;
-  SBFIRPeephole() : FunctionPass(ID) {}
-};
 } // End anonymous namespace
 
-char SBFIRPeephole::ID = 0;
-INITIALIZE_PASS(SBFIRPeephole, DEBUG_TYPE, "SBF IR Peephole", false, false)
-
-FunctionPass *llvm::createSBFIRPeephole() { return new SBFIRPeephole(); }
-
-bool SBFIRPeephole::runOnFunction(Function &F) { return SBFIRPeepholeImpl(F); }
-
 PreservedAnalyses SBFIRPeepholePass::run(Function &F,
                                          FunctionAnalysisManager &AM) {
   return SBFIRPeepholeImpl(F) ? PreservedAnalyses::none()
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index 3acd2d0215ffd..16d09b5b31684 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -77,7 +77,6 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
 
   // Node preprocessing cases
   void PreprocessLoad(SDNode *Node, SelectionDAG::allnodes_iterator &I);
-  void PreprocessCopyToReg(SDNode *Node);
   void PreprocessTrunc(SDNode *Node, SelectionDAG::allnodes_iterator &I);
 
   // Find constants from a constant structure
@@ -172,7 +171,7 @@ bool SBFDAGToDAGISel::SelectInlineAsmMemoryOperand(
   }
 
   SDLoc DL(Op);
-  SDValue AluOp = CurDAG->getTargetConstant(ISD::ADD, DL, MVT::i32);;
+  SDValue AluOp = CurDAG->getTargetConstant(ISD::ADD, DL, MVT::i32);
   OutOps.push_back(Op0);
   OutOps.push_back(Op1);
   OutOps.push_back(AluOp);
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index b43ec8dba7ac9..f87cb9d28230a 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -588,7 +588,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       llvm_unreachable("call arg pass bug");
   }
 
-  SDValue InFlag;
+  SDValue InGlue;
 
   if (HasStackArgs) {
     SDValue FramePtr = DAG.getCopyFromReg(Chain,
@@ -634,16 +634,16 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
     // Pass the current stack frame pointer via SBF::R5, gluing the
     // instruction to instructions passing the first 4 arguments in
     // registers below.
-    Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InFlag);
-    InFlag = Chain.getValue(1);
+    Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InGlue);
+    InGlue = Chain.getValue(1);
   }
 
   // Build a sequence of copy-to-reg nodes chained together with token chain and
-  // flag operands which copy the outgoing args into registers.  The InFlag is
+  // flag operands which copy the outgoing args into registers.  The InGlue is
   // necessary since all emitted instructions must be stuck together.
   for (auto &Reg : RegsToPass) {
-    Chain = DAG.getCopyToReg(Chain, CLI.DL, Reg.first, Reg.second, InFlag);
-    InFlag = Chain.getValue(1);
+    Chain = DAG.getCopyToReg(Chain, CLI.DL, Reg.first, Reg.second, InGlue);
+    InGlue = Chain.getValue(1);
   }
 
   // If the callee is a GlobalAddress node (quite common, every direct call is)
@@ -677,19 +677,21 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
     Ops.push_back(DAG.getRegister(SBF::R5, MVT::i64));
   }
 
-  if (InFlag.getNode())
-    Ops.push_back(InFlag);
+  if (InGlue.getNode())
+    Ops.push_back(InGlue);
 
   Chain = DAG.getNode(SBFISD::CALL, CLI.DL, NodeTys, Ops);
-  InFlag = Chain.getValue(1);
+  InGlue = Chain.getValue(1);
+
+  DAG.addNoMergeSiteInfo(Chain.getNode(), CLI.NoMerge);
 
   // Create the CALLSEQ_END node.
-  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, 0, InFlag, CLI.DL);
-  InFlag = Chain.getValue(1);
+  Chain = DAG.getCALLSEQ_END(Chain, NumBytes, 0, InGlue, CLI.DL);
+  InGlue = Chain.getValue(1);
 
   // Handle result values, copying them out of physregs into vregs that we
   // return.
-  return LowerCallResult(Chain, InFlag, CallConv, IsVarArg, Ins, CLI.DL, DAG,
+  return LowerCallResult(Chain, InGlue, CallConv, IsVarArg, Ins, CLI.DL, DAG,
                          InVals);
 }
 
@@ -715,7 +717,7 @@ SBFTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
                                const SmallVectorImpl<ISD::OutputArg> &Outs,
                                const SmallVectorImpl<SDValue> &OutVals,
                                const SDLoc &DL, SelectionDAG &DAG) const {
-  unsigned Opc = SBFISD::RET_FLAG;
+  unsigned Opc = SBFISD::RET_GLUE;
 
   // CCValAssign - represent the assignment of the return value to a location
   SmallVector<CCValAssign, 16> RVLocs;
@@ -763,7 +765,7 @@ SBFTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
 }
 
 SDValue SBFTargetLowering::LowerCallResult(
-    SDValue Chain, SDValue InFlag, CallingConv::ID CallConv, bool IsVarArg,
+    SDValue Chain, SDValue InGlue, CallingConv::ID CallConv, bool IsVarArg,
     const SmallVectorImpl<ISD::InputArg> &Ins, const SDLoc &DL,
     SelectionDAG &DAG, SmallVectorImpl<SDValue> &InVals) const {
 
@@ -781,7 +783,7 @@ SDValue SBFTargetLowering::LowerCallResult(
     fail(DL, DAG, "only small returns supported");
     for (unsigned i = 0, e = Ins.size(); i != e; ++i)
       InVals.push_back(DAG.getConstant(0, DL, Ins[i].VT));
-    return DAG.getCopyFromReg(Chain, DL, 1, Ins[0].VT, InFlag).getValue(1);
+    return DAG.getCopyFromReg(Chain, DL, 1, Ins[0].VT, InGlue).getValue(1);
   }
 
   CCInfo.AnalyzeCallResult(Ins, getHasAlu32() ? RetCC_SBF32 : RetCC_SBF64);
@@ -789,8 +791,8 @@ SDValue SBFTargetLowering::LowerCallResult(
   // Copy all of the result registers out of their specified physreg.
   for (auto &Val : RVLocs) {
     Chain = DAG.getCopyFromReg(Chain, DL, Val.getLocReg(),
-                               Val.getValVT(), InFlag).getValue(1);
-    InFlag = Chain.getValue(2);
+                               Val.getValVT(), InGlue).getValue(1);
+    InGlue = Chain.getValue(2);
     InVals.push_back(Chain.getValue(0));
   }
 
@@ -956,8 +958,8 @@ const char *SBFTargetLowering::getTargetNodeName(unsigned Opcode) const {
   switch ((SBFISD::NodeType)Opcode) {
   case SBFISD::FIRST_NUMBER:
     break;
-  case SBFISD::RET_FLAG:
-    return "SBFISD::RET_FLAG";
+  case SBFISD::RET_GLUE:
+    return "SBFISD::RET_GLUE";
   case SBFISD::CALL:
     return "SBFISD::CALL";
   case SBFISD::SELECT_CC:
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index 1aa5a1f45aa4b..74f377cf0d715 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -23,7 +23,7 @@ class SBFSubtarget;
 namespace SBFISD {
 enum NodeType : unsigned {
   FIRST_NUMBER = ISD::BUILTIN_OP_END,
-  RET_FLAG,
+  RET_GLUE,
   CALL,
   SELECT_CC,
   BR_CC,
@@ -84,7 +84,7 @@ class SBFTargetLowering : public TargetLowering {
   SDValue LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const;
 
   // Lower the result values of a call, copying them out of physregs into vregs
-  SDValue LowerCallResult(SDValue Chain, SDValue InFlag,
+  SDValue LowerCallResult(SDValue Chain, SDValue InGlue,
                           CallingConv::ID CallConv, bool IsVarArg,
                           const SmallVectorImpl<ISD::InputArg> &Ins,
                           const SDLoc &DL, SelectionDAG &DAG,
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 3ccb1a3587b68..84cdf3aa1a55d 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -36,7 +36,7 @@ def SDT_SBFMEMCPY       : SDTypeProfile<0, 4, [SDTCisVT<0, i64>,
 def SBFcall         : SDNode<"SBFISD::CALL", SDT_SBFCall,
                              [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                               SDNPVariadic]>;
-def SBFretflag      : SDNode<"SBFISD::RET_FLAG", SDTNone,
+def SBFretglue     : SDNode<"SBFISD::RET_GLUE", SDTNone,
                              [SDNPHasChain, SDNPOptInGlue, SDNPVariadic]>;
 def SBFcallseq_start: SDNode<"ISD::CALLSEQ_START", SDT_SBFCallSeqStart,
                              [SDNPHasChain, SDNPOutGlue]>;
@@ -609,7 +609,7 @@ class RET<string OpcodeStr>
                    (outs),
                    (ins),
                    !strconcat(OpcodeStr, ""),
-                   [(SBFretflag)]> {
+                   [(SBFretglue)]> {
   let Inst{31-0} = 0;
   let SBFClass = SBF_JMP;
 }
diff --git a/llvm/lib/Target/SBF/SBFMIChecking.cpp b/llvm/lib/Target/SBF/SBFMIChecking.cpp
index 6fc74f7d71306..c224aeeff8326 100644
--- a/llvm/lib/Target/SBF/SBFMIChecking.cpp
+++ b/llvm/lib/Target/SBF/SBFMIChecking.cpp
@@ -144,8 +144,8 @@ static bool hasLiveDefs(const MachineInstr &MI, const TargetRegisterInfo *TRI) {
 
   // Otherwise, return true if any aliased SuperReg of GPR32 is not dead.
   for (auto I : GPR32LiveDefs)
-    for (MCSuperRegIterator SR(I, TRI); SR.isValid(); ++SR)
-      if (!llvm::is_contained(GPR64DeadDefs, *SR))
+    for (MCPhysReg SR : TRI->superregs(I))
+      if (!llvm::is_contained(GPR64DeadDefs, SR))
         return true;
 
   return false;
diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index 3aa7d88f2a8c7..e88bad1e46c39 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -98,7 +98,7 @@ bool SBFMIPeephole::isCopyFrom32Def(MachineInstr *CopyMI)
   // Most likely, this physical register is aliased to
   // function call return value or current function parameters.
   Register Reg = opnd.getReg();
-  if (!Register::isVirtualRegister(Reg))
+  if (!Reg.isVirtual())
     return false;
 
   if (MRI->getRegClass(Reg) == &SBF::GPRRegClass)
diff --git a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
index 86a54147a35f7..1a5bef5e149d6 100644
--- a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
+++ b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
@@ -206,8 +206,32 @@ void SBFMISimplifyPatchable::processDstReg(MachineRegisterInfo *MRI,
   decltype(End) NextI;
   for (auto I = Begin; I != End; I = NextI) {
     NextI = std::next(I);
-    if (doSrcRegProp)
+    if (doSrcRegProp) {
+      // In situations like below it is not known if usage is a kill
+      // after setReg():
+      //
+      // .-> %2:gpr = LD_imm64 @"llvm.t:0:0$0:0"
+      // |
+      // |`----------------.
+      // |   %3:gpr = LDD %2:gpr, 0
+      // |   %4:gpr = ADD_rr %0:gpr(tied-def 0), killed %3:gpr <--- (1)
+      // |   %5:gpr = LDD killed %4:gpr, 0       ^^^^^^^^^^^^^
+      // |   STD killed %5:gpr, %1:gpr, 0         this is I
+      //  `----------------.
+      //     %6:gpr = LDD %2:gpr, 0
+      //     %7:gpr = ADD_rr %0:gpr(tied-def 0), killed %6:gpr <--- (2)
+      //     %8:gpr = LDD killed %7:gpr, 0       ^^^^^^^^^^^^^
+      //     STD killed %8:gpr, %1:gpr, 0         this is I
+      //
+      // Instructions (1) and (2) would be updated by setReg() to:
+      //
+      //     ADD_rr %0:gpr(tied-def 0), %2:gpr
+      //
+      // %2:gpr is not killed at (1), so it is necessary to remove kill flag
+      // from I.
       I->setReg(SrcReg);
+      I->setIsKill(false);
+    }
 
     // The candidate needs to have a unique definition.
     if (IsAma && MRI->getUniqueVRegDef(I->getReg()))
diff --git a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
index 59a7ec2c51d2e..ac21f37d109dd 100644
--- a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
+++ b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
@@ -125,27 +125,8 @@ static bool SBFPreserveDITypeImpl(Function &F) {
   return true;
 }
 
-class SBFPreserveDIType final : public FunctionPass {
-  bool runOnFunction(Function &F) override;
-
-public:
-  static char ID;
-  SBFPreserveDIType() : FunctionPass(ID) {}
-};
 } // End anonymous namespace
 
-char SBFPreserveDIType::ID = 0;
-INITIALIZE_PASS(SBFPreserveDIType, DEBUG_TYPE, "SBF Preserve Debuginfo Type",
-                false, false)
-
-FunctionPass *llvm::createSBFPreserveDIType() {
-  return new SBFPreserveDIType();
-}
-
-bool SBFPreserveDIType::runOnFunction(Function &F) {
-  return SBFPreserveDITypeImpl(F);
-}
-
 PreservedAnalyses SBFPreserveDITypePass::run(Function &F,
                                              FunctionAnalysisManager &AM) {
   return SBFPreserveDITypeImpl(F) ? PreservedAnalyses::none()
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 2ea2804eb94b7..3d44332bf2938 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -13,7 +13,7 @@
 #include "SBFSubtarget.h"
 #include "SBF.h"
 #include "llvm/MC/TargetRegistry.h"
-#include "llvm/Support/Host.h"
+#include "llvm/TargetParser/Host.h"
 
 using namespace llvm;
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 1b07852f0d98c..935fde7ea2ffa 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -38,7 +38,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
 private:
   void initializeEnvironment(const Triple &TT);
   void initSubtargetFeatures(StringRef CPU, StringRef FS);
-  bool probeJmpExt();
 
 protected:
   // unused
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index bc2e83ef97337..e4e65004b8a83 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -52,7 +52,7 @@ class Proc<string Name, list<SubtargetFeature> Features>
 def : Proc<"generic", []>;
 def : Proc<"v1", []>;
 def : Proc<"v2", []>;
-def : Proc<"v3", []>;
+def : Proc<"v3", [ALU32]>;
 def : Proc<"probe", []>;
 def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
                         FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 6d13b6ca61de5..3b338d74db486 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -18,7 +18,6 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
-#include "llvm/IR/LegacyPassManager.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Passes/PassBuilder.h"
@@ -39,10 +38,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTarget() {
   RegisterTargetMachine<SBFTargetMachine> XX(getTheSBFXTarget());
 
   PassRegistry &PR = *PassRegistry::getPassRegistry();
-  initializeSBFAbstractMemberAccessLegacyPassPass(PR);
-  initializeSBFPreserveDITypePass(PR);
-  initializeSBFIRPeepholePass(PR);
-  initializeSBFAdjustOptPass(PR);
   initializeSBFCheckAndAdjustIRPass(PR);
   initializeSBFMIPeepholePass(PR);
   initializeSBFMIPeepholeTruncElimPass(PR);
@@ -102,6 +97,15 @@ TargetPassConfig *SBFTargetMachine::createPassConfig(PassManagerBase &PM) {
 }
 
 void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+  PB.registerPipelineParsingCallback(
+      [](StringRef PassName, FunctionPassManager &FPM,
+         ArrayRef<PassBuilder::PipelineElement>) {
+        if (PassName == "sbf-ir-peephole") {
+          FPM.addPass(SBFIRPeepholePass());
+          return true;
+        }
+        return false;
+      });
   PB.registerPipelineStartEPCallback(
       [=](ModulePassManager &MPM, OptimizationLevel) {
         FunctionPassManager FPM;
diff --git a/llvm/test/CodeGen/SBF/no-merge-attr.ll b/llvm/test/CodeGen/SBF/no-merge-attr.ll
new file mode 100644
index 0000000000000..6505cdce5b5a5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/no-merge-attr.ll
@@ -0,0 +1,51 @@
+; RUN: llc -march=sbf -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+;
+; Source:
+;   extern void foo(void) __attribute__((nomerge));
+;
+;   void bar(long i) {
+;     if (i)
+;       foo();
+;     else
+;       foo();
+;   }
+;
+; Compilation flag:
+;   clang -target bpf -S -O2 -emit-llvm t.c -o t.ll
+
+; The goal of the test is to check that 'nomerge' attribute
+; preserves two calls to 'foo' from merging.
+
+; CHECK:     call foo
+; CHECK:     call foo
+
+; Function Attrs: nounwind
+define dso_local void @bar(i64 noundef %i) local_unnamed_addr #0 {
+entry:
+  %tobool.not = icmp eq i64 %i, 0
+  br i1 %tobool.not, label %if.else, label %if.then
+
+if.then:                                          ; preds = %entry
+  tail call void @foo() #2
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  tail call void @foo() #2
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  ret void
+}
+
+declare dso_local void @foo() local_unnamed_addr #1
+
+attributes #0 = { nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+attributes #2 = { nomerge nounwind }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 17.0.0 (/home/eddy/work/llvm-project/clang bd66f4b1da304af8e5a890b3205ce6f3d76667ee)"}
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/vla.ll b/llvm/test/CodeGen/SBF/vla.ll
index 9291b61157a79..6d5246a786738 100644
--- a/llvm/test/CodeGen/SBF/vla.ll
+++ b/llvm/test/CodeGen/SBF/vla.ll
@@ -1,4 +1,4 @@
-; RUN: opt --sbf-ir-peephole -mtriple=sbf -S %s | FileCheck %s
+; RUN: opt -passes=sbf-ir-peephole -mtriple=sbf -S %s | FileCheck %s
 ; Source:
 ;   #define AA 40
 ;   struct t {

From 46ac94731c74045ddfb61d758928e2420470b253 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Thu, 22 Feb 2024 17:52:34 -0500
Subject: [PATCH 035/114] [SOL] Update references to solana-labs redirecting
 them to anza-xyz

---
 README.md                             | 4 ++++
 lld/ELF/Arch/BPF.cpp                  | 2 +-
 lld/ELF/Arch/SBF.cpp                  | 2 +-
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp | 2 +-
 llvm/test/CodeGen/SBF/pqr-class.ll    | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a9b29ecbc1a3a..ff0c236bcd335 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+# The LLVM Compiler Infrastructure modified to support Berkley Packet Filter modules written in Rust
+
+This fork of LLVM is used by [this fork of Rust](https://github.com/anza-xyz/rust)
+
 # The LLVM Compiler Infrastructure
 
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/llvm/llvm-project/badge)](https://securityscorecards.dev/viewer/?uri=github.com/llvm/llvm-project)
diff --git a/lld/ELF/Arch/BPF.cpp b/lld/ELF/Arch/BPF.cpp
index d2d71c0f48fdb..baecd8607cda5 100644
--- a/lld/ELF/Arch/BPF.cpp
+++ b/lld/ELF/Arch/BPF.cpp
@@ -64,7 +64,7 @@ RelType BPF::getDynRel(RelType type) const {
         // the symbol isn't preemptible, we emit a _RELATIVE relocation instead
         // and skip emitting the symbol.
         //
-        // See https://github.com/solana-labs/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
+        // See https://github.com/anza-xyz/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
         return R_BPF_64_64;
     default:
         return type;
diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
index 0b30bbeacf0f9..7f3921c0b46f3 100644
--- a/lld/ELF/Arch/SBF.cpp
+++ b/lld/ELF/Arch/SBF.cpp
@@ -64,7 +64,7 @@ RelType SBF::getDynRel(RelType type) const {
         // the symbol isn't preemptible, we emit a _RELATIVE relocation instead
         // and skip emitting the symbol.
         //
-        // See https://github.com/solana-labs/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
+        // See https://github.com/anza-xyz/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
         return R_SBF_64_64;
     default:
         return type;
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index 55a33e741029b..c21693ba908a8 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -65,7 +65,7 @@ bool SBFAsmPrinter::doInitialization(Module &M) {
 
   // Only emit BTF when debuginfo available.
   // Unsupported for Solana:
-  // https://github.com/solana-labs/llvm-project/issues/37
+  // https://github.com/anza-xyz/llvm-project/issues/37
   if (MAI->doesSupportDebugInformation() && !M.debug_compile_units().empty() &&
       SBFEnableBTFEmission) {
     BTF = new BTFX::BTFDebug(this);
diff --git a/llvm/test/CodeGen/SBF/pqr-class.ll b/llvm/test/CodeGen/SBF/pqr-class.ll
index 7c8e01093a4ed..d0d4851984ea9 100644
--- a/llvm/test/CodeGen/SBF/pqr-class.ll
+++ b/llvm/test/CodeGen/SBF/pqr-class.ll
@@ -193,4 +193,4 @@ attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn memor
 
 !0 = !{i32 1, !"wchar_size", i32 4}
 !1 = !{i32 7, !"frame-pointer", i32 2}
-!2 = !{!"clang version 16.0.5 (https://github.com/solana-labs/llvm-project.git abdbb6e4ef63f7b5b4ee40d2770ed0fca909c2dc)"}
+!2 = !{!"clang version 16.0.5 (https://github.com/anza-xyz/llvm-project.git abdbb6e4ef63f7b5b4ee40d2770ed0fca909c2dc)"}

From 8313603ca06aab68d82db2bf03fb6289068490a9 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:42:01 -0300
Subject: [PATCH 036/114] [SOL] Enable mod instruction (#87)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp    |  1 -
 llvm/lib/Target/SBF/SBFInstrFormats.td     |  1 +
 llvm/lib/Target/SBF/SBFInstrInfo.td        |  1 +
 llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll | 26 ++++++++++++++++++++++
 llvm/test/CodeGen/SBF/mod-64.ll            | 17 ++++++++++++++
 llvm/test/CodeGen/SBF/pqr-class.ll         | 15 +++++--------
 llvm/test/MC/Disassembler/SBF/sbf-alu.txt  | 14 ++++++++++++
 llvm/test/MC/SBF/sbf-alu.s                 | 17 ++++++++++++++
 8 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/mod-64.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index f87cb9d28230a..70663966d7ad3 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -123,7 +123,6 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     if (Subtarget->isSolana() && !STI.getHasPqrClass()) {
       setOperationAction(ISD::SDIV, VT, Expand);
       setOperationAction(ISD::SREM, VT, Expand);
-      setOperationAction(ISD::UREM, VT, Expand);
       setOperationAction(ISD::MULHU, VT, Expand);
       setOperationAction(ISD::MULHS, VT, Expand);
     }
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
index 2bc92f939dde4..8a772e3bf1cc6 100644
--- a/llvm/lib/Target/SBF/SBFInstrFormats.td
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -39,6 +39,7 @@ def SBF_AND  : SBFArithOp<0x5>;
 def SBF_LSH  : SBFArithOp<0x6>;
 def SBF_RSH  : SBFArithOp<0x7>;
 def SBF_NEG  : SBFArithOp<0x8>;
+def SBF_MOD  : SBFArithOp<0x9>;
 def SBF_XOR  : SBFArithOp<0xa>;
 def SBF_MOV  : SBFArithOp<0xb>;
 def SBF_ARSH : SBFArithOp<0xc>;
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 84cdf3aa1a55d..4bc620a97e81b 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -324,6 +324,7 @@ let Constraints = "$dst = $src2" in {
     let Predicates = [SBFNoPqrInstr] in {
         defm MUL : ALU<SBF_MUL, "mul", mul>;
         defm DIV : ALU<SBF_DIV, "div", udiv>;
+        defm MOD : ALU<SBF_MOD, "mod", urem>;
     }
 
     let Predicates = [SBFPqrInstr] in {
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
index 17c13fa3215f1..91183a6a09ead 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
@@ -51,6 +51,16 @@
 ;   return a / 0xf;
 ; }
 ;
+; unsigned rem(unsigned a, unsigned b)
+; {
+;   return a % b;
+; }
+;
+; unsigned rem_i(unsigned a)
+; {
+;   return a % 0xf;
+; }
+;
 ; int or(int a, int b)
 ; {
 ;   return a | b;
@@ -194,6 +204,22 @@ entry:
   ret i32 %div
 }
 
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @rem(i32 %a, i32 %b) local_unnamed_addr #0 {
+entry:
+  %rem = urem i32 %a, %b
+; CHECK: mod32 w{{[0-9]+}}, w{{[0-9]+}}
+  ret i32 %rem
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i32 @rem_i(i32 %a) local_unnamed_addr #0 {
+entry:
+  %rem = urem i32 %a, 15
+; CHECK: mod32 w{{[0-9]+}}, 15
+  ret i32 %rem
+}
+
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @or(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
diff --git a/llvm/test/CodeGen/SBF/mod-64.ll b/llvm/test/CodeGen/SBF/mod-64.ll
new file mode 100644
index 0000000000000..5a8ec18c6e3b9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/mod-64.ll
@@ -0,0 +1,17 @@
+; RUN: llc -O2 -march=sbf < %s | FileCheck %s
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @rem(i64 %a, i64 %b) local_unnamed_addr #0 {
+entry:
+  %rem = urem i64 %a, %b
+; CHECK: mod64 r{{[0-9]+}}, r{{[0-9]+}}
+  ret i64 %rem
+}
+
+; Function Attrs: norecurse nounwind readnone
+define dso_local i64 @rem_i(i64 %a) local_unnamed_addr #0 {
+entry:
+  %rem = urem i64 %a, 15
+; CHECK: mod64 r{{[0-9]+}}, 15
+  ret i64 %rem
+}
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/pqr-class.ll b/llvm/test/CodeGen/SBF/pqr-class.ll
index d0d4851984ea9..5e43b15b84c2a 100644
--- a/llvm/test/CodeGen/SBF/pqr-class.ll
+++ b/llvm/test/CodeGen/SBF/pqr-class.ll
@@ -16,15 +16,13 @@ entry:
 ; CHECK-v2: lmul64 r{{[0-9]+}}, r2
 ; CHECK-V2: lmul64 r{{[0-9]+}}, 7
 
+; CHECK-v1: mod64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-v1: div64 r{{[0-9]+}}, r{{[0-9]+}}
-; CHECK-v1: mul64 r{{[0-9]+}}, r{{[0-9]+}}
-; CHECK-v1: sub64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-v1: add64 r{{[0-9]+}}, r{{[0-9]+}}
-; CHECK-v1: div64 r{{[0-9]+}}, 17
-; CHECK-v1: mul64 r{{[0-9]+}}, 17
 ; CHECK-v1: mov64 r{{[0-9]+}}, r{{[0-9]+}}
-; CHECK-v1: sub64 r{{[0-9]+}}, r{{[0-9]+}}
+; CHECK-v1: mod64 r{{[0-9]+}}, 17
 ; CHECK-v1: div64 r{{[0-9]+}}, 7
+; CHECK-v1: add64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-v1: mul64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-v1: mul64 r{{[0-9]+}}, 7
 
@@ -79,14 +77,11 @@ entry:
 ; CHECK-v2: lmul32 w{{[0-9]+}}, w{{[0-9]+}}
 ; CHECK-v2: lmul32 w{{[0-9]+}}, 7
 
+; CHECK-v1: mod32 w{{[0-9]+}}, w{{[0-9]+}}
 ; CHECK-v1: div32 w{{[0-9]+}}, w{{[0-9]+}}
-; CHECK-v1: mul32 w{{[0-9]+}}, w{{[0-9]+}}
-; CHECK-v1: sub32 w{{[0-9]+}}, w{{[0-9]+}}
 ; CHECK-v1: add32 w{{[0-9]+}}, w{{[0-9]+}}
-; CHECK-v1: div32 w{{[0-9]+}}, 17
-; CHECK-v1: mul32 w{{[0-9]+}}, 17
 ; CHECK-v1: mov32 w{{[0-9]+}}, w{{[0-9]+}}
-; CHECK-v1: sub32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-v1: mod32 w{{[0-9]+}}, 17
 ; CHECK-v1: div32 w{{[0-9]+}}, 7
 ; CHECK-v1: add32 w{{[0-9]+}}, w{{[0-9]+}}
 ; CHECK-v1: mul32 w{{[0-9]+}}, w{{[0-9]+}}
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
index 20e3f701c0d8f..58dc229c7cdc9 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-alu.txt
@@ -241,3 +241,17 @@
 0xdc,0x00,0x00,0x00,0x10,0x00,0x00,0x00
 0xdc,0x01,0x00,0x00,0x20,0x00,0x00,0x00
 0xdc,0x02,0x00,0x00,0x40,0x00,0x00,0x00
+
+
+# CHECK-NEW: mod64 r3, r1
+0x9f,0x13,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mod64 r3, 123
+0x97,0x03,0x00,0x00,0x7b,0x00,0x00,0x00
+
+# CHECK-NEW: mod32 w6, w2
+0x9c,0x26,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: mod32 w5, -12
+0x94,0x05,0x00,0x00,0x85,0xff,0xff,0xff
+
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index eb0d5da9de041..7e29513cbf2da 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -318,3 +318,20 @@ mov32 w5, -123
 be16 r0
 be32 r1
 be64 r2
+
+
+# CHECK-OBJ-NEW: mod64 r3, r1
+# CHECK-ASM-NEW: encoding: [0x9f,0x13,0x00,0x00,0x00,0x00,0x00,0x00]
+mod64 r3, r1
+
+# CHECK-OBJ-NEW: mod64 r3, 0x7b
+# CHECK-ASM-NEW: encoding: [0x97,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
+mod64 r3, 123
+
+# CHECK-OBJ-NEW: mod32 w6, w2
+# CHECK-ASM-NEW: encoding: [0x9c,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+mod32 w6, w2
+
+# CHECK-OBJ-NEW: mod32 w5, -0x7b
+# CHECK-ASM-NEW: encoding: [0x94,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
+mod32 w5, -123
\ No newline at end of file

From 5f7758f1d77350928bdc07aad715aa07cf6d80d8 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 4 Mar 2024 17:38:30 -0300
Subject: [PATCH 037/114] [SOL] Workaround sccache failure (#93)

---
 .github/workflows/llvm-project-tests.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 240dd1ead773e..609b5333a0416 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -78,6 +78,11 @@ jobs:
           # We're using a specific version of macOS due to:
           # https://github.com/actions/virtual-environments/issues/5900
           - macOS-latest
+        include:
+          - compile_cache: sccache
+
+          - compile_cache: ccache
+            os: macos-latest
     steps:
       - name: Setup Windows
         if: startsWith(matrix.os, 'windows')
@@ -101,7 +106,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 250
-      - name: Setup ccache
+      - name: Setup ${{ matrix.compile_cache }}
         uses: hendrikmuhs/ccache-action@v1
         with:
           # A full build of llvm, clang, lld, and lldb takes about 250MB
@@ -113,8 +118,8 @@ jobs:
           # fit under the 10 GB limit.
           # Default to 2G to workaround: https://github.com/hendrikmuhs/ccache-action/issues/174
           max-size: 2G
-          key: ${{ matrix.os }}
-          variant: sccache
+          key: ${{ matrix.compile_cache }}-${{ matrix.os }}
+          variant: ${{ matrix.compile_cache }}
       - name: Build and Test
         if: "!startsWith(matrix.os, 'windows')"
         uses: llvm/actions/build-test-llvm-project@main

From 52577499254a01304f9ae18633e05ca5bc043d5d Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:14:03 -0300
Subject: [PATCH 038/114] [SOL] Remove cpu probe (#91)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp  | 2 +-
 llvm/lib/Target/SBF/SBFSubtarget.cpp     | 7 -------
 llvm/lib/Target/SBF/SBFTargetFeatures.td | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 70663966d7ad3..3ee4fca066c78 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -78,7 +78,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
 
   setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::Other, Custom);
 
-  for (auto VT : {MVT::i8, MVT::i16, MVT::i32, MVT::i32, MVT::i64}) {
+  for (auto VT : {MVT::i8, MVT::i16, MVT::i32, MVT::i64}) {
     if (Subtarget->isSolana()) {
       // Implement custom lowering for all atomic operations
       setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 3d44332bf2938..5f4c4593f32f2 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -50,13 +50,6 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
-  // TODO: jle: This invokes an x86 linux kernel call to probe the eBPF ISA
-  // revision in use. This doesn't seem to make much sense for SBF where we
-  // execute on a VM inside of the Solana runtime, not the VM in the linux
-  // kernel.
-  if (CPU == "probe")
-    CPU = sys::detail::getHostCPUNameForBPF();
-
   ParseSubtargetFeatures(CPU, /*TuneCPU*/ CPU, FS);
 
   if (CPU == "v2") {
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index e4e65004b8a83..2a6d1186836df 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -53,7 +53,6 @@ def : Proc<"generic", []>;
 def : Proc<"v1", []>;
 def : Proc<"v2", []>;
 def : Proc<"v3", [ALU32]>;
-def : Proc<"probe", []>;
 def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
                         FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
                           FeaturePqrInstr]>;
\ No newline at end of file

From c33266792fefae0761fd38dd032a58b8b510b08f Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:59:27 -0300
Subject: [PATCH 039/114] [SOL] Optimize call convention in SBFv2 (#94)

---
 llvm/lib/Target/SBF/CMakeLists.txt          |   1 +
 llvm/lib/Target/SBF/SBFFunctionInfo.cpp     |  28 +++++
 llvm/lib/Target/SBF/SBFFunctionInfo.h       |  32 ++++++
 llvm/lib/Target/SBF/SBFISelLowering.cpp     |  78 +++++++++----
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp     |  25 ++++-
 llvm/lib/Target/SBF/SBFRegisterInfo.h       |   4 +
 llvm/lib/Target/SBF/SBFSubtarget.cpp        |   1 +
 llvm/lib/Target/SBF/SBFSubtarget.h          |   7 +-
 llvm/lib/Target/SBF/SBFTargetFeatures.td    |   5 +-
 llvm/lib/Target/SBF/SBFTargetMachine.cpp    |  10 +-
 llvm/lib/Target/SBF/SBFTargetMachine.h      |   4 +
 llvm/test/CodeGen/SBF/many_args_new_conv.ll | 115 ++++++++++++++++++++
 llvm/test/CodeGen/SBF/stack_args_v2.ll      |   2 +-
 13 files changed, 284 insertions(+), 28 deletions(-)
 create mode 100644 llvm/lib/Target/SBF/SBFFunctionInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/SBFFunctionInfo.h
 create mode 100644 llvm/test/CodeGen/SBF/many_args_new_conv.ll

diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index 2f0147a5476f1..9e1111d368afb 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -34,6 +34,7 @@ add_llvm_target(SBFCodeGen
   SBFMIChecking.cpp
   SBFMISimplifyPatchable.cpp
   BTFDebug.cpp
+  SBFFunctionInfo.cpp
 
   LINK_COMPONENTS
   Analysis
diff --git a/llvm/lib/Target/SBF/SBFFunctionInfo.cpp b/llvm/lib/Target/SBF/SBFFunctionInfo.cpp
new file mode 100644
index 0000000000000..d3c494ae2f347
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFFunctionInfo.cpp
@@ -0,0 +1,28 @@
+//=- SBFFunctionInfo.cpp - SBF Machine Function Info ---------=//
+
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file implements SBF-specific per-machine-function
+/// information.
+///
+//===----------------------------------------------------------------------===//
+
+#include "SBFFunctionInfo.h"
+
+namespace llvm {
+
+void SBFFunctionInfo::storeFrameIndexArgument(int FI) {
+  frameIndexes.insert(FI);
+}
+
+bool SBFFunctionInfo::containsFrameIndex(int FI) const {
+  return frameIndexes.find(FI) != frameIndexes.end();
+}
+
+} // namespace llvm
\ No newline at end of file
diff --git a/llvm/lib/Target/SBF/SBFFunctionInfo.h b/llvm/lib/Target/SBF/SBFFunctionInfo.h
new file mode 100644
index 0000000000000..2316d965366b7
--- /dev/null
+++ b/llvm/lib/Target/SBF/SBFFunctionInfo.h
@@ -0,0 +1,32 @@
+//=- SBFFunctionInfo.h - SBF machine function info -*- C++ -*-=//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file declares SBF-specific per-machine-function information.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SBFFUNCTIONINFO_H
+#define LLVM_SBFFUNCTIONINFO_H
+
+#include "SBFSubtarget.h"
+#include <unordered_set>
+
+namespace llvm {
+
+class SBFFunctionInfo final : public MachineFunctionInfo {
+  std::unordered_set<int> frameIndexes;
+
+public:
+  SBFFunctionInfo(const Function &F, const SBFSubtarget *STI){};
+
+  void storeFrameIndexArgument(int FI);
+  bool containsFrameIndex(int FI) const;
+};
+} // namespace llvm
+
+#endif // LLVM_SBFFUNCTIONINFO_H
\ No newline at end of file
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 3ee4fca066c78..4e7051b960a5a 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "SBFFunctionInfo.h"
 #include "SBFRegisterInfo.h"
 #include "SBFSubtarget.h"
 #include "llvm/CodeGen/CallingConvLower.h"
@@ -413,8 +414,15 @@ SDValue SBFTargetLowering::LowerFormalArguments(
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
   if (Subtarget->isSolana() && Ins.size() > MaxArgs) {
-    // Pass args 1-4 via registers, remaining args via stack, referenced via SBF::R5
-    CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
+    if (Subtarget->getEnableNewCallConvention()) {
+      // Pass args 1-5 via registers, remaining args via stack.
+      CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32 : CC_SBF64);
+    } else {
+      // Pass args 1-4 via registers, remaining args via stack, referenced via
+      // SBF::R5
+      CCInfo.AnalyzeFormalArguments(Ins,
+                                    getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
+    }
   } else {
     // Pass all args via registers
     CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32 : CC_SBF64);
@@ -461,20 +469,37 @@ SDValue SBFTargetLowering::LowerFormalArguments(
       EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
       EVT LocVT = VA.getLocVT();
 
-      unsigned Offset;
-      if (Subtarget->getHasDynamicFrames()) {
-        // In SBFv2, the arguments are stored on the start of the frame.
-        Offset = VA.getLocMemOffset() + PtrVT.getFixedSizeInBits() / 8;
+      SDValue SDV;
+      if (Subtarget->getEnableNewCallConvention()) {
+        // In the new convention, arguments are in at the start
+        // of the callee frame
+        uint64_t Size = PtrVT.getFixedSizeInBits() / 8;
+        int64_t Offset = -static_cast<int64_t>(VA.getLocMemOffset() + Size);
+        int FrameIndex =
+            MF.getFrameInfo().CreateFixedObject(Size, Offset, false);
+        SDValue DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
+        MachinePointerInfo DstInfo =
+            MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
+        SDV = DAG.getLoad(LocVT, DL, Chain, DstAddr, DstInfo);
       } else {
-        Offset = SBFRegisterInfo::FrameLength - VA.getLocMemOffset();
+        unsigned Offset;
+        if (Subtarget->getHasDynamicFrames()) {
+          // In the old convention, the arguments are stored on
+          // the start of caller the frame.
+          Offset = VA.getLocMemOffset() + PtrVT.getFixedSizeInBits() / 8;
+        } else {
+          Offset = SBFRegisterInfo::FrameLength - VA.getLocMemOffset();
+        }
+
+        // Arguments relative to SBF::R5
+        unsigned reg = MF.addLiveIn(SBF::R5, &SBF::GPRRegClass);
+        SDValue Const = DAG.getConstant(Offset, DL, MVT::i64);
+        SDV = DAG.getCopyFromReg(Chain, DL, reg,
+                                 getPointerTy(MF.getDataLayout()));
+        SDV = DAG.getNode(ISD::SUB, DL, PtrVT, SDV, Const);
+        SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo());
       }
 
-      // Arguments relative to SBF::R5
-      unsigned reg = MF.addLiveIn(SBF::R5, &SBF::GPRRegClass);
-      SDValue Const = DAG.getConstant(Offset, DL, MVT::i64);
-      SDValue SDV = DAG.getCopyFromReg(Chain, DL, reg, getPointerTy(MF.getDataLayout()));
-      SDV = DAG.getNode(ISD::SUB, DL, PtrVT, SDV, Const);
-      SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo());
       InVals.push_back(SDV);
     } else {
       fail(DL, DAG, "defined with too many args");
@@ -524,8 +549,14 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
   if (Subtarget->isSolana() && Outs.size() > MaxArgs) {
-    // Pass args 1-4 via registers, remaining args via stack, referenced via SBF::R5
-    CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
+    if (Subtarget->getEnableNewCallConvention()) {
+      // Pass args 1-5 via registers, remaining args via stack
+      CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32 : CC_SBF64);
+    } else {
+      // Pass args 1-4 via registers, remaining args via stack, referenced via
+      // SBF::R5
+      CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
+    }
   } else {
     // Pass all args via registers
     CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32 : CC_SBF64);
@@ -595,6 +626,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
                                           Subtarget->getRegisterInfo()->getFrameRegister(MF),
                                           getPointerTy(MF.getDataLayout()));
 
+    SBFFunctionInfo * SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
     // Stack arguments have to be walked in reverse order by inserting
     // chained stores, this ensures their order is not changed by the scheduler
     // and that the push instruction sequence generated is correct, otherwise they
@@ -610,13 +642,19 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       SDValue DstAddr;
       MachinePointerInfo DstInfo;
       if (Subtarget->getHasDynamicFrames()) {
-        // When dynamic frames are enabled, the frame size is only calculated
-        // after lowering instructions, so we must place arguments at the start
-        // of the frame.
-        int64_t Offset = -static_cast<int64_t>(VA.getLocMemOffset() +
-                                               PtrVT.getFixedSizeInBits() / 8);
+        // In the new call convention, arguments are stored in the callee frame
+        // The positive offset signals that the variable does not occupy space
+        // in the caller frame.
+        int64_t Offset = static_cast<int64_t>(VA.getLocMemOffset() +
+                                              PtrVT.getFixedSizeInBits() / 8);
+        if (!Subtarget->getEnableNewCallConvention())
+          // In the old call convention, we place argument at the start of the
+          // frame in a fixed stack offset.
+          Offset = -Offset;
+
         int FrameIndex = MF.getFrameInfo().CreateFixedObject(
             VA.getLocVT().getFixedSizeInBits() / 8, Offset, false);
+        SBFFuncInfo->storeFrameIndexArgument(FrameIndex);
         DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
         DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
       } else {
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 15164c37c7121..9e183ca62cedc 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "SBFFunctionInfo.h"
 #include "SBFRegisterInfo.h"
-#include "SBF.h"
 #include "SBFSubtarget.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
@@ -102,7 +102,7 @@ bool SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
   const TargetInstrInfo &TII = *MF.getSubtarget().getInstrInfo();
 
   if (MI.getOpcode() == SBF::MOV_rr) {
-    int Offset = MF.getFrameInfo().getObjectOffset(FrameIndex);
+    int Offset = resolveInternalFrameIndex(MF, FrameIndex, std::nullopt);
 
     if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
       WarnSize(Offset, MF, DL);
@@ -115,8 +115,9 @@ bool SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
     return false;
   }
 
-  int Offset = MF.getFrameInfo().getObjectOffset(FrameIndex) +
-               MI.getOperand(i + 1).getImm();
+  int Offset =
+      resolveInternalFrameIndex(MF, FrameIndex, MI.getOperand(i + 1).getImm());
+
 
   if (!isInt<32>(Offset))
     llvm_unreachable("bug in frame offset");
@@ -146,6 +147,22 @@ bool SBFRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
   return false;
 }
 
+int SBFRegisterInfo::resolveInternalFrameIndex(
+    const llvm::MachineFunction &MF, int FI, std::optional<int64_t> Imm) const {
+  const MachineFrameInfo &MFI = MF.getFrameInfo();
+  const SBFFunctionInfo *SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
+  int Offset = MFI.getObjectOffset(FI);
+  if (MF.getSubtarget<SBFSubtarget>().getEnableNewCallConvention() &&
+      SBFFuncInfo->containsFrameIndex(FI)) {
+    uint64_t StackSize = MFI.getStackSize();
+    Offset = -static_cast<int>(StackSize) - Offset;
+  } else if (Imm.has_value()) {
+    Offset += Imm.value();
+  }
+
+  return Offset;
+}
+
 Register SBFRegisterInfo::getFrameRegister(const MachineFunction &MF) const {
   return SBF::R10;
 }
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.h b/llvm/lib/Target/SBF/SBFRegisterInfo.h
index a58586905b9fa..ee5b9f99c5fea 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.h
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.h
@@ -14,6 +14,7 @@
 #define LLVM_LIB_TARGET_SBF_SBFREGISTERINFO_H
 
 #include "llvm/CodeGen/TargetRegisterInfo.h"
+#include <optional>
 
 #define GET_REGINFO_HEADER
 #include "SBFGenRegisterInfo.inc"
@@ -34,6 +35,9 @@ struct SBFRegisterInfo : public SBFGenRegisterInfo {
                            RegScavenger *RS = nullptr) const override;
 
   Register getFrameRegister(const MachineFunction &MF) const override;
+
+  int resolveInternalFrameIndex(const MachineFunction &MF, int FI,
+                                std::optional<int64_t> Imm) const;
 };
 }
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 5f4c4593f32f2..e3474791ddc32 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -47,6 +47,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   NoLddw = false;
   CallxRegSrc = false;
   HasPqrClass = false;
+  NewCallConvention = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 935fde7ea2ffa..a21eca0f82da5 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -80,6 +80,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether we have the PQR instruction class
   bool HasPqrClass;
 
+  // Whether to use the new call convention in SBFv2
+  bool NewCallConvention;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -102,7 +105,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getNoLddw() const { return NoLddw; }
   bool getCallXRegSrc() const { return CallxRegSrc; }
   bool getHasPqrClass() const { return HasPqrClass; }
-
+  bool getEnableNewCallConvention() const {
+    return HasDynamicFrames && NewCallConvention;
+  }
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
     return &FrameLowering;
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 2a6d1186836df..3644dbfdd0a1f 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -46,6 +46,9 @@ def FeatureCallxRegSrc : SubtargetFeature<"callx-reg-src", "CallxRegSrc", "true"
 def FeaturePqrInstr : SubtargetFeature<"pqr-instr", "HasPqrClass", "true",
                                     "Enable the PQR instruction class">;
 
+def FeatureCallConv : SubtargetFeature<"new-call-conv", "NewCallConvention", "true",
+                                    "Enable new call convetion for SBFv2">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
@@ -55,4 +58,4 @@ def : Proc<"v2", []>;
 def : Proc<"v3", [ALU32]>;
 def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
                         FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
-                          FeaturePqrInstr]>;
\ No newline at end of file
+                          FeaturePqrInstr, FeatureCallConv]>;
\ No newline at end of file
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 3b338d74db486..f83954cefc0a1 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -10,9 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SBFTargetMachine.h"
 #include "SBF.h"
+#include "SBFTargetMachine.h"
 #include "SBFTargetTransformInfo.h"
+#include "SBFFunctionInfo.h"
 #include "MCTargetDesc/SBFMCAsmInfo.h"
 #include "TargetInfo/SBFTargetInfo.h"
 #include "llvm/CodeGen/Passes.h"
@@ -134,6 +135,13 @@ SBFTargetMachine::getTargetTransformInfo(const Function &F) const {
   return TargetTransformInfo(SBFTTIImpl(this, F));
 }
 
+MachineFunctionInfo *SBFTargetMachine::createMachineFunctionInfo(
+    llvm::BumpPtrAllocator &Allocator, const llvm::Function &F,
+    const llvm::TargetSubtargetInfo *STI) const {
+  return SBFFunctionInfo::create<SBFFunctionInfo>(
+      Allocator, F, static_cast<const SBFSubtarget *>(STI));
+}
+
 // Install an instruction selector pass using
 // the ISelDag to gen SBF code.
 bool SBFPassConfig::addInstSelector() {
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
index cd03b3473b36a..20637687dfe9a 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.h
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -42,6 +42,10 @@ class SBFTargetMachine : public LLVMTargetMachine {
   }
 
   void registerPassBuilderCallbacks(PassBuilder &PB) override;
+
+  MachineFunctionInfo *
+  createMachineFunctionInfo(BumpPtrAllocator &Allocator, const Function &F,
+                            const TargetSubtargetInfo *STI) const override;
 };
 }
 
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
new file mode 100644
index 0000000000000..a21a00d60613f
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -0,0 +1,115 @@
+; RUN: llc -O2 -march=sbf -mcpu=sbfv2 < %s | FileCheck %s
+
+; Function Attrs: nounwind uwtable
+define i32 @caller_no_alloca(i32 %a, i32 %b, i32 %c) #0 {
+entry:
+; CHECK-LABEL: caller_no_alloca
+
+; No changes to the stack pointer
+; CHECK-NOT: add64 r11
+
+; Saving arguments on the stack
+; CHECK: mov64 r4, 55
+; CHECK: stxdw [r10 - 32], r4
+; CHECK: mov64 r4, 60
+; CHECK: stxdw [r10 - 40], r4
+; CHECK: mov64 r4, 50
+; CHECK: stxdw [r10 - 24], r4
+; CHECK: mov64 r4, 4
+; CHECK: stxdw [r10 - 16], r4
+; CHECK: mov64 r4, 3
+; CHECK: stxdw [r10 - 8], r4
+; CHECK: mov64 r4, 1
+; CHECK: mov64 r5, 2
+; CHECK: call callee_alloca
+
+  %call = tail call i32 @callee_alloca(i32 %a, i32 %b, i32 %c, i32 1, i32 2, i32 3, i32 4, i32 50, i32 55, i32 60) #3
+  ret i32 %call
+}
+
+; Function Attrs: nounwind uwtable
+define i32 @caller_alloca(i32 %a, i32 %b, i32 %c) #0 {
+; CHECK-LABEL: caller_alloca
+; CHECK: add64 r11, -24
+; CHECK: ldxw r1, [r10 - 4]
+
+; Saving arguments in the stack
+; CHECK: mov64 r4, 55
+
+; Offset in the callee: (-56) - (-24) = -32
+; CHECK: stxdw [r10 - 56], r4
+; CHECK: mov64 r4, 60
+; Offset in the callee: (-64) - (-24) = -40
+; CHECK: stxdw [r10 - 64], r4
+; CHECK: mov64 r4, 50
+; Offset in the callee: (-48) - (-24) = -24
+; CHECK: stxdw [r10 - 48], r4
+; CHECK: mov64 r4, 4
+; Offset in the callee: (-40) - (-24) = -16
+; CHECK: stxdw [r10 - 40], r4
+; CHECK: mov64 r4, 3
+; Offset in the callee: (-32) - (-24) = -8
+; CHECK: stxdw [r10 - 32], r4
+; CHECK: mov64 r4, 1
+; CHECK: mov64 r5, 2
+; CHECK: call callee_no_alloca
+
+entry:
+  %g = alloca i32
+  %g1 = load i32, ptr %g
+  %call = tail call i32 @callee_no_alloca(i32 %g1, i32 %b, i32 %c, i32 1, i32 2, i32 3, i32 4, i32 50, i32 55, i32 60) #3
+  %h = alloca i128
+  %h1 = load i32, ptr %h
+  %res = sub i32 %call, %h1
+  ret i32 %res
+}
+
+; Function Attrs: nounwind uwtable
+define i32 @callee_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %p, i32 %y, i32 %a1, i32 %a2) #1 {
+; CHECK-LABEL: callee_alloca
+; Loading arguments
+; CHECK: ldxdw r2, [r10 - 8]
+; CHECK: ldxdw r2, [r10 - 16]
+; CHECK: ldxdw r2, [r10 - 24]
+; CHECK: ldxdw r2, [r10 - 32]
+; CHECK: ldxdw r2, [r10 - 40]
+; Loading allocated i32
+; CHECK: ldxw r0, [r10 - 44]
+
+entry:
+  %o = alloca i32
+  %g = add i32 %a, %b
+  %h = sub i32 %g, %c
+  %i = add i32 %h, %d
+  %j = sub i32 %i, %e
+  %k = add i32 %j, %f
+  %l = add i32 %k, %p
+  %m = add i32 %l, %y
+  %n = add i32 %m, %a1
+  %q = add i32 %n, %a2
+  %r = load i32, ptr %o
+  %s = add i32 %r, %q
+  ret i32 %s
+}
+
+; Function Attrs: nounwind uwtable
+define i32 @callee_no_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %p, i32 %y, i32 %a1, i32 %a2) #1 {
+; CHECK-LABEL: callee_no_alloca
+; Loading arguments
+; CHECK: ldxdw r1, [r10 - 8]
+; CHECK: ldxdw r1, [r10 - 16]
+; CHECK: ldxdw r1, [r10 - 24]
+; CHECK: ldxdw r1, [r10 - 32]
+; CHECK: ldxdw r1, [r10 - 40]
+entry:
+  %g = add i32 %a, %b
+  %h = sub i32 %g, %c
+  %i = add i32 %h, %d
+  %j = sub i32 %i, %e
+  %k = add i32 %j, %f
+  %l = add i32 %k, %p
+  %m = add i32 %l, %y
+  %n = add i32 %m, %a1
+  %q = add i32 %n, %a2
+  ret i32 %q
+}
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/stack_args_v2.ll b/llvm/test/CodeGen/SBF/stack_args_v2.ll
index 4a13de3771ecc..942bc06756216 100644
--- a/llvm/test/CodeGen/SBF/stack_args_v2.ll
+++ b/llvm/test/CodeGen/SBF/stack_args_v2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=sbf -mcpu=sbfv2 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mattr=+dynamic-frames < %s | FileCheck %s
 
 ; Function Attrs: nounwind uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {

From d4a6de6f59fc6213f2ee73876f3fd73798da9be8 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:02:16 -0300
Subject: [PATCH 040/114] [SOL] Remove icmp BPF builtin (#95)

---
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp        | 64 +---------------
 llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp | 49 +-----------
 llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll   | 85 ---------------------
 llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll   | 85 ---------------------
 4 files changed, 2 insertions(+), 281 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll

diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
index 27ebb79f8c3f6..f41c56d427380 100644
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -15,13 +15,11 @@
 #include "SBFTargetMachine.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/IntrinsicsBPF.h" // TODO: jle.
 #include "llvm/IR/Module.h"
 #include "llvm/IR/PatternMatch.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
-#include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 
 #define DEBUG_TYPE "sbf-adjust-opt"
@@ -59,7 +57,6 @@ class SBFAdjustOptImpl {
   Module *M;
   SmallVector<PassThroughInfo, 16> PassThroughs;
 
-  bool adjustICmpToBuiltin();
   void adjustBasicBlock(BasicBlock &BB);
   bool serializeICMPCrossBB(BasicBlock &BB);
   void adjustInst(Instruction &I);
@@ -71,72 +68,13 @@ class SBFAdjustOptImpl {
 } // End anonymous namespace
 
 bool SBFAdjustOptImpl::run() {
-  bool Changed = adjustICmpToBuiltin();
-
   for (Function &F : *M)
     for (auto &BB : F) {
       adjustBasicBlock(BB);
       for (auto &I : BB)
         adjustInst(I);
     }
-  return insertPassThrough() || Changed;
-}
-
-// Commit acabad9ff6bf ("[InstCombine] try to canonicalize icmp with
-// trunc op into mask and cmp") added a transformation to
-// convert "(conv)a < power_2_const" to "a & <const>" in certain
-// cases and bpf kernel verifier has to handle the resulted code
-// conservatively and this may reject otherwise legitimate program.
-// Here, we change related icmp code to a builtin which will
-// be restored to original icmp code later to prevent that
-// InstCombine transformatin.
-bool SBFAdjustOptImpl::adjustICmpToBuiltin() {
-  bool Changed = false;
-  ICmpInst *ToBeDeleted = nullptr;
-  for (Function &F : *M)
-    for (auto &BB : F)
-      for (auto &I : BB) {
-        if (ToBeDeleted) {
-          ToBeDeleted->eraseFromParent();
-          ToBeDeleted = nullptr;
-        }
-
-        auto *Icmp = dyn_cast<ICmpInst>(&I);
-        if (!Icmp)
-          continue;
-
-        Value *Op0 = Icmp->getOperand(0);
-        if (!isa<TruncInst>(Op0))
-          continue;
-
-        auto ConstOp1 = dyn_cast<ConstantInt>(Icmp->getOperand(1));
-        if (!ConstOp1)
-          continue;
-
-        auto ConstOp1Val = ConstOp1->getValue().getZExtValue();
-        auto Op = Icmp->getPredicate();
-        if (Op == ICmpInst::ICMP_ULT || Op == ICmpInst::ICMP_UGE) {
-          if ((ConstOp1Val - 1) & ConstOp1Val)
-            continue;
-        } else if (Op == ICmpInst::ICMP_ULE || Op == ICmpInst::ICMP_UGT) {
-          if (ConstOp1Val & (ConstOp1Val + 1))
-            continue;
-        } else {
-          continue;
-        }
-
-        Constant *Opcode =
-            ConstantInt::get(Type::getInt32Ty(BB.getContext()), Op);
-        Function *Fn = Intrinsic::getDeclaration(
-            M, Intrinsic::bpf_compare, {Op0->getType(), ConstOp1->getType()});
-        auto *NewInst = CallInst::Create(Fn, {Opcode, Op0, ConstOp1});
-        NewInst->insertBefore(&I);
-        Icmp->replaceAllUsesWith(NewInst);
-        Changed = true;
-        ToBeDeleted = Icmp;
-      }
-
-  return Changed;
+  return insertPassThrough();
 }
 
 bool SBFAdjustOptImpl::insertPassThrough() {
diff --git a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
index ab00cefcead9d..05f55a1ced384 100644
--- a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
+++ b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
@@ -20,14 +20,10 @@
 #include "SBFTargetMachine.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
 
 #define DEBUG_TYPE "sbf-check-and-opt-ir"
 
@@ -46,7 +42,6 @@ class SBFCheckAndAdjustIR final : public ModulePass {
   void checkIR(Module &M);
   bool adjustIR(Module &M);
   bool removePassThroughBuiltin(Module &M);
-  bool removeCompareBuiltin(Module &M);
 };
 } // End anonymous namespace
 
@@ -121,50 +116,8 @@ bool SBFCheckAndAdjustIR::removePassThroughBuiltin(Module &M) {
   return Changed;
 }
 
-bool SBFCheckAndAdjustIR::removeCompareBuiltin(Module &M) {
-  // Remove __builtin_bpf_compare()'s which are used to prevent
-  // certain IR optimizations. Now major IR optimizations are done,
-  // remove them.
-  bool Changed = false;
-  CallInst *ToBeDeleted = nullptr;
-  for (Function &F : M)
-    for (auto &BB : F)
-      for (auto &I : BB) {
-        if (ToBeDeleted) {
-          ToBeDeleted->eraseFromParent();
-          ToBeDeleted = nullptr;
-        }
-
-        auto *Call = dyn_cast<CallInst>(&I);
-        if (!Call)
-          continue;
-        auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
-        if (!GV)
-          continue;
-        if (!GV->getName().startswith("llvm.bpf.compare"))
-          continue;
-
-        Changed = true;
-        Value *Arg0 = Call->getArgOperand(0);
-        Value *Arg1 = Call->getArgOperand(1);
-        Value *Arg2 = Call->getArgOperand(2);
-
-        auto OpVal = cast<ConstantInt>(Arg0)->getValue().getZExtValue();
-        CmpInst::Predicate Opcode = (CmpInst::Predicate)OpVal;
-
-        auto *ICmp = new ICmpInst(Opcode, Arg1, Arg2);
-        ICmp->insertBefore(Call);
-
-        Call->replaceAllUsesWith(ICmp);
-        ToBeDeleted = Call;
-      }
-  return Changed;
-}
-
 bool SBFCheckAndAdjustIR::adjustIR(Module &M) {
-  bool Changed = removePassThroughBuiltin(M);
-  Changed = removeCompareBuiltin(M) || Changed;
-  return Changed;
+  return removePassThroughBuiltin(M);
 }
 
 bool SBFCheckAndAdjustIR::runOnModule(Module &M) {
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
deleted file mode 100644
index 049ec7115325a..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp3.ll
+++ /dev/null
@@ -1,85 +0,0 @@
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
-;
-; Source:
-;   int test1(unsigned long a) {
-;     if ((unsigned)a <= 3) return 2;
-;     return 3;
-;   }
-;   int test2(unsigned long a) {
-;     if ((unsigned)a < 4) return 2;
-;     return 3;
-;   }
-; Compilation flag:
-;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i32 @test1(i64 %a) #0 {
-entry:
-  %retval = alloca i32, align 4
-  %a.addr = alloca i64, align 8
-  store i64 %a, i64* %a.addr, align 8, !tbaa !3
-  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
-  %conv = trunc i64 %0 to i32
-  %cmp = icmp ule i32 %conv, 3
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  store i32 2, i32* %retval, align 4
-  br label %return
-
-if.end:                                           ; preds = %entry
-  store i32 3, i32* %retval, align 4
-  br label %return
-
-return:                                           ; preds = %if.end, %if.then
-  %1 = load i32, i32* %retval, align 4
-  ret i32 %1
-}
-
-; CHECK-LABEL: test1
-; CHECK-V1:    jgt r[[#]], r[[#]],
-; CHECK-V3:    jlt r[[#]], 4,
-
-; Function Attrs: nounwind
-define dso_local i32 @test2(i64 %a) #0 {
-entry:
-  %retval = alloca i32, align 4
-  %a.addr = alloca i64, align 8
-  store i64 %a, i64* %a.addr, align 8, !tbaa !3
-  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
-  %conv = trunc i64 %0 to i32
-  %cmp = icmp ult i32 %conv, 4
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  store i32 2, i32* %retval, align 4
-  br label %return
-
-if.end:                                           ; preds = %entry
-  store i32 3, i32* %retval, align 4
-  br label %return
-
-return:                                           ; preds = %if.end, %if.then
-  %1 = load i32, i32* %retval, align 4
-  ret i32 %1
-}
-
-; CHECK-LABEL: test2
-; CHECK-V1:    jgt r[[#]], r[[#]],
-; CHECK-V3:    jlt r[[#]], 4,
-
-attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"frame-pointer", i32 2}
-!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git b7892f95881c891032742e0cd81861b845512653)"}
-!3 = !{!4, !4, i64 0}
-!4 = !{!"long", !5, i64 0}
-!5 = !{!"omnipotent char", !6, i64 0}
-!6 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
deleted file mode 100644
index 16f300a8ba845..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp4.ll
+++ /dev/null
@@ -1,85 +0,0 @@
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
-;
-; Source:
-;   int test1(unsigned long a) {
-;     if ((unsigned)a > 3) return 2;
-;     return 3;
-;   }
-;   int test2(unsigned long a) {
-;     if ((unsigned)a >= 4) return 2;
-;     return 3;
-;   }
-; Compilation flag:
-;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i32 @test1(i64 %a) #0 {
-entry:
-  %retval = alloca i32, align 4
-  %a.addr = alloca i64, align 8
-  store i64 %a, i64* %a.addr, align 8, !tbaa !3
-  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
-  %conv = trunc i64 %0 to i32
-  %cmp = icmp ugt i32 %conv, 3
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  store i32 2, i32* %retval, align 4
-  br label %return
-
-if.end:                                           ; preds = %entry
-  store i32 3, i32* %retval, align 4
-  br label %return
-
-return:                                           ; preds = %if.end, %if.then
-  %1 = load i32, i32* %retval, align 4
-  ret i32 %1
-}
-
-; CHECK-LABEL: test1
-; CHECK-V1:    jgt r[[#]], 3,
-; CHECK-V3:    jgt r[[#]], 3,
-
-; Function Attrs: nounwind
-define dso_local i32 @test2(i64 %a) #0 {
-entry:
-  %retval = alloca i32, align 4
-  %a.addr = alloca i64, align 8
-  store i64 %a, i64* %a.addr, align 8, !tbaa !3
-  %0 = load i64, i64* %a.addr, align 8, !tbaa !3
-  %conv = trunc i64 %0 to i32
-  %cmp = icmp uge i32 %conv, 4
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  store i32 2, i32* %retval, align 4
-  br label %return
-
-if.end:                                           ; preds = %entry
-  store i32 3, i32* %retval, align 4
-  br label %return
-
-return:                                           ; preds = %if.end, %if.then
-  %1 = load i32, i32* %retval, align 4
-  ret i32 %1
-}
-
-; CHECK-LABEL: test2
-; CHECK-V1:    jgt r[[#]], 3,
-; CHECK-V3:    jgt r[[#]], 3,
-
-attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"frame-pointer", i32 2}
-!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 930ccf0191b4a33332d924522e5676fff583f083)"}
-!3 = !{!4, !4, i64 0}
-!4 = !{!"long", !5, i64 0}
-!5 = !{!"omnipotent char", !6, i64 0}
-!6 = !{!"Simple C/C++ TBAA"}

From 3fd99f26e5c3d99bfe9a738bdc1c386470cda07b Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 6 May 2024 09:30:01 -0300
Subject: [PATCH 041/114] [SOL] Remove load builtins (#96)

---
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp |  57 --------------
 llvm/lib/Target/SBF/SBFISelLowering.cpp |  18 +----
 llvm/test/CodeGen/SBF/intrinsics.ll     | 100 ------------------------
 3 files changed, 1 insertion(+), 174 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SBF/intrinsics.ll

diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index 16d09b5b31684..0b48b818e5236 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -24,7 +24,6 @@
 #include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/IntrinsicsBPF.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -77,7 +76,6 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
 
   // Node preprocessing cases
   void PreprocessLoad(SDNode *Node, SelectionDAG::allnodes_iterator &I);
-  void PreprocessTrunc(SDNode *Node, SelectionDAG::allnodes_iterator &I);
 
   // Find constants from a constant structure
   typedef std::vector<unsigned char> val_vec_type;
@@ -206,26 +204,6 @@ void SBFDAGToDAGISel::Select(SDNode *Node) {
     }
     break;
   }
-  case ISD::INTRINSIC_W_CHAIN: {
-    unsigned IntNo = cast<ConstantSDNode>(Node->getOperand(1))->getZExtValue();
-    switch (IntNo) {
-    case Intrinsic::bpf_load_byte:
-    case Intrinsic::bpf_load_half:
-    case Intrinsic::bpf_load_word: {
-      SDLoc DL(Node);
-      SDValue Chain = Node->getOperand(0);
-      SDValue N1 = Node->getOperand(1);
-      SDValue Skb = Node->getOperand(2);
-      SDValue N3 = Node->getOperand(3);
-
-      SDValue R6Reg = CurDAG->getRegister(SBF::R6, MVT::i64);
-      Chain = CurDAG->getCopyToReg(Chain, DL, R6Reg, Skb, SDValue());
-      Node = CurDAG->UpdateNodeOperands(Node, Chain, N1, R6Reg, N3);
-      break;
-    }
-    }
-    break;
-  }
 
   case ISD::FrameIndex: {
     int FI = cast<FrameIndexSDNode>(Node)->getIndex();
@@ -377,8 +355,6 @@ void SBFDAGToDAGISel::PreprocessISelDAG() {
     unsigned Opcode = Node->getOpcode();
     if (Opcode == ISD::LOAD)
       PreprocessLoad(Node, I);
-    else if (Opcode == ISD::AND)
-      PreprocessTrunc(Node, I);
   }
 }
 
@@ -508,39 +484,6 @@ bool SBFDAGToDAGISel::fillConstantStruct(const DataLayout &DL,
   return true;
 }
 
-void SBFDAGToDAGISel::PreprocessTrunc(SDNode *Node,
-                                      SelectionDAG::allnodes_iterator &I) {
-  ConstantSDNode *MaskN = dyn_cast<ConstantSDNode>(Node->getOperand(1));
-  if (!MaskN)
-    return;
-
-  // The Reg operand should be a virtual register, which is defined
-  // outside the current basic block. DAG combiner has done a pretty
-  // good job in removing truncating inside a single basic block except
-  // when the Reg operand comes from bpf_load_[byte | half | word] for
-  // which the generic optimizer doesn't understand their results are
-  // zero extended.
-  SDValue BaseV = Node->getOperand(0);
-  if (BaseV.getOpcode() != ISD::INTRINSIC_W_CHAIN)
-    return;
-
-  unsigned IntNo = cast<ConstantSDNode>(BaseV->getOperand(1))->getZExtValue();
-  uint64_t MaskV = MaskN->getZExtValue();
-
-  if (!((IntNo == Intrinsic::bpf_load_byte && MaskV == 0xFF) ||
-        (IntNo == Intrinsic::bpf_load_half && MaskV == 0xFFFF) ||
-        (IntNo == Intrinsic::bpf_load_word && MaskV == 0xFFFFFFFF)))
-    return;
-
-  LLVM_DEBUG(dbgs() << "Remove the redundant AND operation in: ";
-             Node->dump(); dbgs() << '\n');
-
-  I--;
-  CurDAG->ReplaceAllUsesWith(SDValue(Node, 0), BaseV);
-  I++;
-  CurDAG->DeleteNode(Node);
-}
-
 FunctionPass *llvm::createSBFISelDag(SBFTargetMachine &TM) {
   return new SBFDAGToDAGISel(TM);
 }
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 4e7051b960a5a..e744795cf5753 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -23,7 +23,6 @@
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/DiagnosticPrinter.h"
-#include "llvm/IR/IntrinsicsBPF.h" // TODO: jle.
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
@@ -367,24 +366,9 @@ SDValue SBFTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
   case ISD::ATOMIC_LOAD_UMIN:
   case ISD::ATOMIC_LOAD_XOR:
     return LowerATOMICRMW(Op, DAG);
-  case ISD::INTRINSIC_W_CHAIN: {
-    unsigned IntNo = cast<ConstantSDNode>(Op->getOperand(1))->getZExtValue();
-    switch (IntNo) {
-    case Intrinsic::bpf_load_byte:
-    case Intrinsic::bpf_load_half:
-    case Intrinsic::bpf_load_word:
-      if (Subtarget->isSolana()) {
-        report_fatal_error(
-            "llvm.bpf.load.* intrinsics are not supported in SBF", false);
-      }
-      break;
-    default:
-      break;
-    }
-
+  case ISD::INTRINSIC_W_CHAIN:
     // continue the expansion as defined with tablegen
     return SDValue();
-  }
   case ISD::DYNAMIC_STACKALLOC:
     report_fatal_error("Unsupported dynamic stack allocation");
   default:
diff --git a/llvm/test/CodeGen/SBF/intrinsics.ll b/llvm/test/CodeGen/SBF/intrinsics.ll
deleted file mode 100644
index 4e22c8ebb3770..0000000000000
--- a/llvm/test/CodeGen/SBF/intrinsics.ll
+++ /dev/null
@@ -1,100 +0,0 @@
-; RUN: not llc < %s -march=sbf 2>&1 | FileCheck --check-prefix=CHECK-SBF %s
-
-; CHECK-SBF: LLVM ERROR: llvm.bpf.load.* intrinsics are not supported in SBF
-
-; Function Attrs: nounwind uwtable
-define i32 @ld_b(i64 %foo, i64* nocapture %bar, i8* %ctx, i8* %ctx2) #0 {
-  %1 = tail call i64 @llvm.bpf.load.byte(i8* %ctx, i64 123) #2
-  %2 = add i64 %1, %foo
-  %3 = load volatile i64, i64* %bar, align 8
-  %4 = add i64 %2, %3
-  %5 = tail call i64 @llvm.bpf.load.byte(i8* %ctx2, i64 %foo) #2
-  %6 = add i64 %4, %5
-  %7 = load volatile i64, i64* %bar, align 8
-  %8 = add i64 %6, %7
-  %9 = trunc i64 %8 to i32
-  ret i32 %9
-; CHECK-LABEL: ld_b:
-; CHECK-EL: r0 = *(u8 *)skb[123]
-; CHECK-EL: r0 = *(u8 *)skb[r
-; CHECK-EB: r0 = *(u8 *)skb[123]
-; CHECK-EB: r0 = *(u8 *)skb[r
-}
-
-declare i64 @llvm.bpf.load.byte(i8*, i64) #1
-
-; Function Attrs: nounwind uwtable
-define i32 @ld_h(i8* %ctx, i8* %ctx2, i32 %foo) #0 {
-  %1 = tail call i64 @llvm.bpf.load.half(i8* %ctx, i64 123) #2
-  %2 = sext i32 %foo to i64
-  %3 = tail call i64 @llvm.bpf.load.half(i8* %ctx2, i64 %2) #2
-  %4 = add i64 %3, %1
-  %5 = trunc i64 %4 to i32
-  ret i32 %5
-; CHECK-LABEL: ld_h:
-; CHECK-EL: r0 = *(u16 *)skb[r
-; CHECK-EL: r0 = *(u16 *)skb[123]
-; CHECK-EB: r0 = *(u16 *)skb[r
-; CHECK-EB: r0 = *(u16 *)skb[123]
-}
-
-declare i64 @llvm.bpf.load.half(i8*, i64) #1
-
-; Function Attrs: nounwind uwtable
-define i32 @ld_w(i8* %ctx, i8* %ctx2, i32 %foo) #0 {
-  %1 = tail call i64 @llvm.bpf.load.word(i8* %ctx, i64 123) #2
-  %2 = sext i32 %foo to i64
-  %3 = tail call i64 @llvm.bpf.load.word(i8* %ctx2, i64 %2) #2
-  %4 = add i64 %3, %1
-  %5 = trunc i64 %4 to i32
-  ret i32 %5
-; CHECK-LABEL: ld_w:
-; CHECK-EL: r0 = *(u32 *)skb[r
-; CHECK-EL: r0 = *(u32 *)skb[123]
-; CHECK-EB: r0 = *(u32 *)skb[r
-; CHECK-EB: r0 = *(u32 *)skb[123]
-}
-
-declare i64 @llvm.bpf.load.word(i8*, i64) #1
-
-define i32 @ld_pseudo() #0 {
-entry:
-  %call = tail call i64 @llvm.bpf.pseudo(i64 2, i64 3)
-  tail call void inttoptr (i64 4 to void (i64, i32)*)(i64 %call, i32 4) #2
-  ret i32 0
-; CHECK-LABEL: ld_pseudo:
-; CHECK-EL: ld_pseudo r1, 2, 3 # encoding: [0x18,0x21,0x00,0x00,0x03,0x00,0x00,0x00
-; CHECK-EB: ld_pseudo r1, 2, 3 # encoding: [0x18,0x12,0x00,0x00,0x00,0x00,0x00,0x03
-}
-
-declare i64 @llvm.bpf.pseudo(i64, i64) #2
-
-define i32 @bswap(i64 %a, i64 %b, i64 %c) #0 {
-entry:
-  %0 = tail call i64 @llvm.bswap.i64(i64 %a)
-  %conv = trunc i64 %b to i32
-  %1 = tail call i32 @llvm.bswap.i32(i32 %conv)
-  %conv1 = zext i32 %1 to i64
-  %add = add i64 %conv1, %0
-  %conv2 = trunc i64 %c to i16
-  %2 = tail call i16 @llvm.bswap.i16(i16 %conv2)
-  %conv3 = zext i16 %2 to i64
-  %add4 = add i64 %add, %conv3
-  %conv5 = trunc i64 %add4 to i32
-  ret i32 %conv5
-; CHECK-LABEL: bswap:
-; CHECK-EL: r1 = be64 r1     # encoding: [0xdc,0x01,0x00,0x00,0x40,0x00,0x00,0x00]
-; CHECK-EL: r0 = be32 r0     # encoding: [0xdc,0x00,0x00,0x00,0x20,0x00,0x00,0x00]
-; CHECK-EL: r0 += r1 # encoding: [0x0f,0x10,0x00,0x00,0x00,0x00,0x00,0x00]
-; CHECK-EL: r3 = be16 r3     # encoding: [0xdc,0x03,0x00,0x00,0x10,0x00,0x00,0x00]
-; CHECK-EL: r0 += r3 # encoding: [0x0f,0x30,0x00,0x00,0x00,0x00,0x00,0x00]
-; CHECK-EB: r1 = le64 r1     # encoding: [0xd4,0x10,0x00,0x00,0x00,0x00,0x00,0x40]
-; CHECK-EB: r0 = le32 r0     # encoding: [0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x20]
-; CHECK-EB: r0 += r1 # encoding: [0x0f,0x01,0x00,0x00,0x00,0x00,0x00,0x00]
-; CHECK-EB: r3 = le16 r3     # encoding: [0xd4,0x30,0x00,0x00,0x00,0x00,0x00,0x10]
-; CHECK-EB: r0 += r3 # encoding: [0x0f,0x03,0x00,0x00,0x00,0x00,0x00,0x00]
-}
-
-declare i64 @llvm.bswap.i64(i64) #1
-declare i32 @llvm.bswap.i32(i32) #1
-declare i16 @llvm.bswap.i16(i16) #1

From 12bc46fe3e88051be943917aad5d92535eea616e Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:59:05 -0300
Subject: [PATCH 042/114] [SOL] Remove code adjustment (#98)

---
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp      | 88 --------------------
 llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll | 98 -----------------------
 llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll | 71 ----------------
 llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll | 71 ----------------
 4 files changed, 328 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll

diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
index f41c56d427380..b7e77c3397045 100644
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -57,8 +57,6 @@ class SBFAdjustOptImpl {
   Module *M;
   SmallVector<PassThroughInfo, 16> PassThroughs;
 
-  void adjustBasicBlock(BasicBlock &BB);
-  bool serializeICMPCrossBB(BasicBlock &BB);
   void adjustInst(Instruction &I);
   bool serializeICMPInBB(Instruction &I);
   bool avoidSpeculation(Instruction &I);
@@ -70,7 +68,6 @@ class SBFAdjustOptImpl {
 bool SBFAdjustOptImpl::run() {
   for (Function &F : *M)
     for (auto &BB : F) {
-      adjustBasicBlock(BB);
       for (auto &I : BB)
         adjustInst(I);
     }
@@ -122,86 +119,6 @@ bool SBFAdjustOptImpl::serializeICMPInBB(Instruction &I) {
   return true;
 }
 
-// To avoid combining conditionals in the same basic block by
-// instrcombine optimization.
-bool SBFAdjustOptImpl::serializeICMPCrossBB(BasicBlock &BB) {
-  // For:
-  //   B1:
-  //     comp1 = icmp <opcode> ...;
-  //     if (comp1) goto B2 else B3;
-  //   B2:
-  //     comp2 = icmp <opcode> ...;
-  //     if (comp2) goto B4 else B5;
-  //   B4:
-  //     ...
-  // changed to:
-  //   B1:
-  //     comp1 = icmp <opcode> ...;
-  //     comp1 = __builtin_bpf_passthrough(seq_num, comp1);
-  //     if (comp1) goto B2 else B3;
-  //   B2:
-  //     comp2 = icmp <opcode> ...;
-  //     if (comp2) goto B4 else B5;
-  //   B4:
-  //     ...
-
-  // Check basic predecessors, if two of them (say B1, B2) are using
-  // icmp instructions to generate conditions and one is the predesessor
-  // of another (e.g., B1 is the predecessor of B2). Add a passthrough
-  // barrier after icmp inst of block B1.
-  BasicBlock *B2 = BB.getSinglePredecessor();
-  if (!B2)
-    return false;
-
-  BasicBlock *B1 = B2->getSinglePredecessor();
-  if (!B1)
-    return false;
-
-  Instruction *TI = B2->getTerminator();
-  auto *BI = dyn_cast<BranchInst>(TI);
-  if (!BI || !BI->isConditional())
-    return false;
-  auto *Cond = dyn_cast<ICmpInst>(BI->getCondition());
-  if (!Cond || B2->getFirstNonPHI() != Cond)
-    return false;
-  Value *B2Op0 = Cond->getOperand(0);
-  auto Cond2Op = Cond->getPredicate();
-
-  TI = B1->getTerminator();
-  BI = dyn_cast<BranchInst>(TI);
-  if (!BI || !BI->isConditional())
-    return false;
-  Cond = dyn_cast<ICmpInst>(BI->getCondition());
-  if (!Cond)
-    return false;
-  Value *B1Op0 = Cond->getOperand(0);
-  auto Cond1Op = Cond->getPredicate();
-
-  if (B1Op0 != B2Op0)
-    return false;
-
-  if (Cond1Op == ICmpInst::ICMP_SGT || Cond1Op == ICmpInst::ICMP_SGE) {
-    if (Cond2Op != ICmpInst::ICMP_SLT && Cond2Op != ICmpInst::ICMP_SLE)
-      return false;
-  } else if (Cond1Op == ICmpInst::ICMP_SLT || Cond1Op == ICmpInst::ICMP_SLE) {
-    if (Cond2Op != ICmpInst::ICMP_SGT && Cond2Op != ICmpInst::ICMP_SGE)
-      return false;
-  } else if (Cond1Op == ICmpInst::ICMP_ULT || Cond1Op == ICmpInst::ICMP_ULE) {
-    if (Cond2Op != ICmpInst::ICMP_UGT && Cond2Op != ICmpInst::ICMP_UGE)
-      return false;
-  } else if (Cond1Op == ICmpInst::ICMP_UGT || Cond1Op == ICmpInst::ICMP_UGE) {
-    if (Cond2Op != ICmpInst::ICMP_ULT && Cond2Op != ICmpInst::ICMP_ULE)
-      return false;
-  } else {
-    return false;
-  }
-
-  PassThroughInfo Info(Cond, BI, 0);
-  PassThroughs.push_back(Info);
-
-  return true;
-}
-
 // To avoid speculative hoisting certain computations out of
 // a basic block.
 bool SBFAdjustOptImpl::avoidSpeculation(Instruction &I) {
@@ -297,11 +214,6 @@ bool SBFAdjustOptImpl::avoidSpeculation(Instruction &I) {
   return true;
 }
 
-void SBFAdjustOptImpl::adjustBasicBlock(BasicBlock &BB) {
-  if (!DisableSBFserializeICMP && serializeICMPCrossBB(BB))
-    return;
-}
-
 void SBFAdjustOptImpl::adjustInst(Instruction &I) {
   if (!DisableSBFserializeICMP && serializeICMPInBB(I))
     return;
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
deleted file mode 100644
index b78c18365ad81..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp2.ll
+++ /dev/null
@@ -1,98 +0,0 @@
-; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK %s
-; RUN: opt -O2 -mtriple=sbf -sbf-disable-serialize-icmp %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-DISABLE %s
-;
-; Source:
-;   int foo();
-;   int bar(int);
-;   int test() {
-;     int ret = foo();
-;     if (ret <= 0)
-;       return 0;
-;     if (ret > 7)
-;       return 0;
-;     return bar(ret);
-;   }
-; Compilation flag:
-;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i32 @test() #0 {
-entry:
-  %retval = alloca i32, align 4
-  %ret = alloca i32, align 4
-  %cleanup.dest.slot = alloca i32, align 4
-  %0 = bitcast i32* %ret to i8*
-  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #3
-  %call = call i32 bitcast (i32 (...)* @foo to i32 ()*)()
-  store i32 %call, i32* %ret, align 4, !tbaa !2
-  %1 = load i32, i32* %ret, align 4, !tbaa !2
-  %cmp = icmp sle i32 %1, 0
-  br i1 %cmp, label %if.then, label %if.end
-
-; CHECK:         lsh64 [[REG1:r[0-9]+]], 32
-; CHECK:         arsh64 [[REG1]], 32
-; CHECK:         mov64 [[REG2:r[0-9]+]], 1
-; CHECK:         jsgt [[REG2]], [[REG1]],
-; CHECK:         jsgt [[REG1]], 7,
-
-; CHECK-DISABLE: add64 [[REG1:r[0-9]+]], -8
-; CHECK-DISABLE: lsh64 [[REG1]], 32
-; CHECK-DISABLE: rsh64 [[REG1]], 32
-; CHECK-DISABLE: lddw [[REG2:r[0-9]+]], 4294967289
-; CHECK-DISABLE: jgt [[REG2]], [[REG1]],
-
-if.then:                                          ; preds = %entry
-  store i32 0, i32* %retval, align 4
-  store i32 1, i32* %cleanup.dest.slot, align 4
-  br label %cleanup
-
-if.end:                                           ; preds = %entry
-  %2 = load i32, i32* %ret, align 4, !tbaa !2
-  %cmp1 = icmp sgt i32 %2, 7
-  br i1 %cmp1, label %if.then2, label %if.end3
-
-if.then2:                                         ; preds = %if.end
-  store i32 0, i32* %retval, align 4
-  store i32 1, i32* %cleanup.dest.slot, align 4
-  br label %cleanup
-
-if.end3:                                          ; preds = %if.end
-  %3 = load i32, i32* %ret, align 4, !tbaa !2
-  %call4 = call i32 @bar(i32 %3)
-  store i32 %call4, i32* %retval, align 4
-  store i32 1, i32* %cleanup.dest.slot, align 4
-  br label %cleanup
-
-cleanup:                                          ; preds = %if.end3, %if.then2, %if.then
-  %4 = bitcast i32* %ret to i8*
-  call void @llvm.lifetime.end.p0i8(i64 4, i8* %4) #3
-  %5 = load i32, i32* %retval, align 4
-  ret i32 %5
-}
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
-
-declare dso_local i32 @foo(...) #2
-
-declare dso_local i32 @bar(i32) #2
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
-
-attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind willreturn }
-attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nounwind }
-
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
-!2 = !{!3, !3, i64 0}
-!3 = !{!"int", !4, i64 0}
-!4 = !{!"omnipotent char", !5, i64 0}
-!5 = !{!"Simple C/C++ TBAA"}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
deleted file mode 100644
index 5b88384b788f2..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp5.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
-;
-; Source:
-;   int bar(int);
-;   int test(int *p) {
-;     if (*p <= 0 || *p >= 7)
-;       return 0;
-;     return bar(*p);
-;   }
-; Compilation flag:
-;   clang -target bpf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i32 @test(i32* noundef %p) #0 {
-entry:
-  %retval = alloca i32, align 4
-  %p.addr = alloca i32*, align 8
-  store i32* %p, i32** %p.addr, align 8, !tbaa !3
-  %0 = load i32*, i32** %p.addr, align 8, !tbaa !3
-  %1 = load i32, i32* %0, align 4, !tbaa !7
-  %cmp = icmp sle i32 %1, 0
-  br i1 %cmp, label %if.then, label %lor.lhs.false
-
-lor.lhs.false:                                    ; preds = %entry
-  %2 = load i32*, i32** %p.addr, align 8, !tbaa !3
-  %3 = load i32, i32* %2, align 4, !tbaa !7
-  %cmp1 = icmp sge i32 %3, 7
-  br i1 %cmp1, label %if.then, label %if.end
-
-if.then:                                          ; preds = %lor.lhs.false, %entry
-  store i32 0, i32* %retval, align 4
-  br label %return
-
-if.end:                                           ; preds = %lor.lhs.false
-  %4 = load i32*, i32** %p.addr, align 8, !tbaa !3
-  %5 = load i32, i32* %4, align 4, !tbaa !7
-  %call = call i32 @bar(i32 noundef %5)
-  store i32 %call, i32* %retval, align 4
-  br label %return
-
-return:                                           ; preds = %if.end, %if.then
-  %6 = load i32, i32* %retval, align 4
-  ret i32 %6
-}
-
-; CHECK-LABEL: test
-; CHECK-V1:    jsgt r[[#]], r[[#]],
-; CHECK-V1:    jsgt r[[#]], 6,
-; CHECK-V3:    jslt r[[#]], 1,
-; CHECK-V3:    jsgt r[[#]], 6,
-
-declare dso_local i32 @bar(i32 noundef) #1
-
-attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"frame-pointer", i32 2}
-!2 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 0d37a76d31c05372908908ff2f01fc58bbf575e8)"}
-!3 = !{!4, !4, i64 0}
-!4 = !{!"any pointer", !5, i64 0}
-!5 = !{!"omnipotent char", !6, i64 0}
-!6 = !{!"Simple C/C++ TBAA"}
-!7 = !{!8, !8, i64 0}
-!8 = !{!"int", !5, i64 0}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
deleted file mode 100644
index 210beca0acfa9..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp6.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK,CHECK-V1 %s
-; RUN: opt -O2 -S -mtriple=sbf %s -o %t1
-; RUN: llc %t1 -mcpu=v3 -o - | FileCheck -check-prefixes=CHECK,CHECK-V3 %s
-;
-; Source:
-;   unsigned bar(unsigned);
-;   unsigned int test(unsigned *p) {
-;     if (*p <= 1 || *p >= 7)
-;       return 0;
-;     return bar(*p);
-;   }
-; Compilation flag:
-;   clang -target bpf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i32 @test(i32* noundef %p) #0 {
-entry:
-  %retval = alloca i32, align 4
-  %p.addr = alloca i32*, align 8
-  store i32* %p, i32** %p.addr, align 8, !tbaa !3
-  %0 = load i32*, i32** %p.addr, align 8, !tbaa !3
-  %1 = load i32, i32* %0, align 4, !tbaa !7
-  %cmp = icmp ule i32 %1, 1
-  br i1 %cmp, label %if.then, label %lor.lhs.false
-
-lor.lhs.false:                                    ; preds = %entry
-  %2 = load i32*, i32** %p.addr, align 8, !tbaa !3
-  %3 = load i32, i32* %2, align 4, !tbaa !7
-  %cmp1 = icmp uge i32 %3, 7
-  br i1 %cmp1, label %if.then, label %if.end
-
-if.then:                                          ; preds = %lor.lhs.false, %entry
-  store i32 0, i32* %retval, align 4
-  br label %return
-
-if.end:                                           ; preds = %lor.lhs.false
-  %4 = load i32*, i32** %p.addr, align 8, !tbaa !3
-  %5 = load i32, i32* %4, align 4, !tbaa !7
-  %call = call i32 @bar(i32 noundef %5)
-  store i32 %call, i32* %retval, align 4
-  br label %return
-
-return:                                           ; preds = %if.end, %if.then
-  %6 = load i32, i32* %retval, align 4
-  ret i32 %6
-}
-
-; CHECK-LABEL: test
-; CHECK-V1:    jgt r[[#]], r[[#]],
-; CHECK-V1:    jgt r[[#]], 6,
-; CHECK-V3:    jlt r[[#]], 2,
-; CHECK-V3:    jgt r[[#]], 6,
-
-declare dso_local i32 @bar(i32 noundef) #1
-
-attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-attributes #1 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"frame-pointer", i32 2}
-!2 = !{!"clang version 15.0.0 (https://github.com/llvm/llvm-project.git 2a25e1af85f3138f70888c4c3f359c6a09e3cfe5)"}
-!3 = !{!4, !4, i64 0}
-!4 = !{!"any pointer", !5, i64 0}
-!5 = !{!"omnipotent char", !6, i64 0}
-!6 = !{!"Simple C/C++ TBAA"}
-!7 = !{!8, !8, i64 0}
-!8 = !{!"int", !5, i64 0}

From 61033a19d94f799185a020f4d33c2eb42578e50c Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:59:35 -0300
Subject: [PATCH 043/114] [SOL] Do not miss stack size errors (#99)

---
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 9e183ca62cedc..d86edf70a3dc7 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -46,12 +46,14 @@ BitVector SBFRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
 static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
 {
   static Function *OldMF = nullptr;
-  if (&(MF.getFunction()) == OldMF) {
-    return;
-  }
-  OldMF = &(MF.getFunction());
   int MaxOffset = -1 * SBFRegisterInfo::FrameLength;
   if (Offset <= MaxOffset) {
+
+    if (&(MF.getFunction()) == OldMF) {
+      return;
+    }
+    OldMF = &(MF.getFunction());
+
     if (MF.getSubtarget<SBFSubtarget>().isSolana()) {
       dbgs() << "Error:";
       if (DL) {

From 822d095f08178a4258fbe8e4296b5b18f8135c53 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:59:56 -0300
Subject: [PATCH 044/114] [SOL] Correctly copy 16-byte aligned memory (#97)

* Fix issue with copying 16-byte aligned memory
---
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          | 72 +++++++++------
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp   |  6 +-
 .../CodeGen/SBF/memcpy-expand-in-order.ll     |  6 +-
 llvm/test/CodeGen/SBF/memcpy_16.ll            | 92 +++++++++++++++++++
 4 files changed, 142 insertions(+), 34 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/memcpy_16.ll

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index c0047291f4398..b222513ae2f11 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -52,6 +52,7 @@ void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
   DebugLoc dl = MI->getDebugLoc();
   unsigned LdOpc, StOpc;
 
+  unsigned BytesPerOp = std::min(static_cast<unsigned>(Alignment), 8u);
   switch (Alignment) {
   case 1:
     LdOpc = SBF::LDB;
@@ -66,6 +67,7 @@ void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
     StOpc = SBF::STW;
     break;
   case 8:
+  case 16:
     LdOpc = SBF::LDD;
     StOpc = SBF::STD;
     break;
@@ -73,42 +75,54 @@ void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
     llvm_unreachable("unsupported memcpy alignment");
   }
 
-  unsigned IterationNum = CopyLen >> Log2_64(Alignment);
-  for(unsigned I = 0; I < IterationNum; ++I) {
+  unsigned IterationNum = (CopyLen >> Log2_64(BytesPerOp));
+  for (unsigned I = 0; I < IterationNum; ++I) {
     BuildMI(*BB, MI, dl, get(LdOpc))
-            .addReg(ScratchReg, RegState::Define).addReg(SrcReg)
-            .addImm(I * Alignment);
+        .addReg(ScratchReg, RegState::Define)
+        .addReg(SrcReg)
+        .addImm(I * BytesPerOp);
     BuildMI(*BB, MI, dl, get(StOpc))
-            .addReg(ScratchReg, RegState::Kill).addReg(DstReg)
-            .addImm(I * Alignment);
+        .addReg(ScratchReg, RegState::Kill)
+        .addReg(DstReg)
+        .addImm(I * BytesPerOp);
   }
 
-  unsigned BytesLeft = CopyLen & (Alignment - 1);
-  unsigned Offset = IterationNum * Alignment;
-  bool Hanging4Byte = BytesLeft & 0x4;
-  bool Hanging2Byte = BytesLeft & 0x2;
-  bool Hanging1Byte = BytesLeft & 0x1;
-  if (Hanging4Byte) {
-    BuildMI(*BB, MI, dl, get(SBF::LDW))
-            .addReg(ScratchReg, RegState::Define).addReg(SrcReg).addImm(Offset);
-    BuildMI(*BB, MI, dl, get(SBF::STW))
-            .addReg(ScratchReg, RegState::Kill).addReg(DstReg).addImm(Offset);
-    Offset += 4;
+  unsigned BytesLeft = CopyLen - IterationNum * BytesPerOp;
+  unsigned Offset;
+  if (BytesLeft == 0) {
+    BB->erase(MI);
+    return;
   }
-  if (Hanging2Byte) {
-    BuildMI(*BB, MI, dl, get(SBF::LDH))
-            .addReg(ScratchReg, RegState::Define).addReg(SrcReg).addImm(Offset);
-    BuildMI(*BB, MI, dl, get(SBF::STH))
-            .addReg(ScratchReg, RegState::Kill).addReg(DstReg).addImm(Offset);
-    Offset += 2;
-  }
-  if (Hanging1Byte) {
-    BuildMI(*BB, MI, dl, get(SBF::LDB))
-            .addReg(ScratchReg, RegState::Define).addReg(SrcReg).addImm(Offset);
-    BuildMI(*BB, MI, dl, get(SBF::STB))
-            .addReg(ScratchReg, RegState::Kill).addReg(DstReg).addImm(Offset);
+
+  if (BytesLeft < 2) {
+    Offset = CopyLen - 1;
+    LdOpc = SBF::LDB;
+    StOpc = SBF::STB;
+  } else if (BytesLeft <= 2) {
+    Offset = CopyLen - 2;
+    LdOpc = SBF::LDH;
+    StOpc = SBF::STH;
+  } else if (BytesLeft <= 4) {
+    Offset = CopyLen - 4;
+    LdOpc = SBF::LDW;
+    StOpc = SBF::STW;
+  } else if (BytesLeft <= 8) {
+    Offset = CopyLen - 8;
+    LdOpc = SBF::LDD;
+    StOpc = SBF::STD;
+  } else {
+    llvm_unreachable("There cannot be more than 8 bytes left");
   }
 
+  BuildMI(*BB, MI, dl, get(LdOpc))
+      .addReg(ScratchReg, RegState::Define)
+      .addReg(SrcReg)
+      .addImm(Offset);
+  BuildMI(*BB, MI, dl, get(StOpc))
+      .addReg(ScratchReg, RegState::Kill)
+      .addReg(DstReg)
+      .addImm(Offset);
+
   BB->erase(MI);
 }
 
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
index 0a5d3aab10462..53f4e42b25e12 100644
--- a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
@@ -27,7 +27,11 @@ SDValue SBFSelectionDAGInfo::EmitTargetCodeForMemcpy(
     return SDValue();
 
   unsigned CopyLen = ConstantSize->getZExtValue();
-  unsigned StoresNumEstimate = alignTo(CopyLen, Alignment) >> Log2(Alignment);
+  // If the alignment is greater than 8, we can only store and load 8 bytes at a
+  // time.
+  uint64_t BytesPerOp = std::min(Alignment.value(), static_cast<uint64_t>(8));
+  unsigned StoresNumEstimate =
+      alignTo(CopyLen, Alignment) >> Log2_64(BytesPerOp);
   // Impose the same copy length limit as MaxStoresPerMemcpy.
   if (StoresNumEstimate > getCommonMaxStoresPerMemFunc())
     return SDValue();
diff --git a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
index 2c59a27aab596..e081396d3fc49 100644
--- a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
+++ b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
@@ -72,7 +72,5 @@ entry:
 ; CHECK: stxdw [[[DST_REG]] + 8], [[SCRATCH_REG]]
 ; CHECK: ldxdw [[SCRATCH_REG]], [[[SRC_REG]] + 16]
 ; CHECK: stxdw [[[DST_REG]] + 16], [[SCRATCH_REG]]
-; CHECK: ldxh [[SCRATCH_REG]], [[[SRC_REG]] + 24]
-; CHECK: stxh [[[DST_REG]] + 24], [[SCRATCH_REG]]
-; CHECK: ldxb [[SCRATCH_REG]], [[[SRC_REG]] + 26]
-; CHECK: stxb [[[DST_REG]] + 26], [[SCRATCH_REG]]
+; CHECK: ldxw [[SCRATCH_REG]], [[[SRC_REG]] + 23]
+; CHECK: stxw [[[DST_REG]] + 23], [[SCRATCH_REG]]
diff --git a/llvm/test/CodeGen/SBF/memcpy_16.ll b/llvm/test/CodeGen/SBF/memcpy_16.ll
new file mode 100644
index 0000000000000..4cfa911aab191
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/memcpy_16.ll
@@ -0,0 +1,92 @@
+; RUN: llc < %s -march=sbf -sbf-expand-memcpy-in-order | FileCheck %s
+
+; Function Attrs: mustprogress nocallback nofree nounwind willreturn memory(argmem: readwrite)
+declare void @llvm.memcpy.p0.p0.i64(ptr noalias nocapture writeonly, ptr noalias nocapture readonly, i64, i1 immarg) #1
+
+define void @memcpy_test_1(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
+entry:
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 32, i1 0)
+
+;  4 pairs of loads and stores
+; CHECK: memcpy_test_1
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 16]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 16], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 24]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 24], [[SCRATCH_REG:r[0-9]]]
+  ret void
+}
+
+define void @memcpy_test_2(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
+entry:
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 17, i1 0)
+
+; 2 pairs of loads and stores + 1 pair for the byte
+; CHECK: memcpy_test_2
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxb [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 16]
+; CHECK: stxb [[[DST_REG:r[0-9]]] + 16], [[SCRATCH_REG:r[0-9]]]
+  ret void
+}
+
+define void @memcpy_test_3(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
+entry:
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 18, i1 0)
+
+; 2 pairs of loads and stores + 1 pair for the 2 bytes
+; CHECK: memcpy_test_3
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxh [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 16]
+; CHECK: stxh [[[DST_REG:r[0-9]]] + 16], [[SCRATCH_REG:r[0-9]]]
+  ret void
+}
+
+define void @memcpy_test_4(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
+entry:
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 19, i1 0)
+
+; 2 pairs of loads and stores + 1 pair for the 3 bytes
+; CHECK: memcpy_test_4
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 15]
+; CHECK: stxw [[[DST_REG:r[0-9]]] + 15], [[SCRATCH_REG:r[0-9]]]
+  ret void
+}
+
+define void @memcpy_test_5(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
+entry:
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 21, i1 0)
+
+; 2 pairs of loads and stores + 1 pair for the 5 bytes
+; CHECK: memcpy_test_5
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
+; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 13]
+; CHECK: stxdw [[[DST_REG:r[0-9]]] + 13], [[SCRATCH_REG:r[0-9]]]
+  ret void
+}
+
+define void @memcpy_test_6(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
+entry:
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 33, i1 0)
+
+; More than 32 bytes, call memcpy
+; CHECK: memcpy_test_6
+; CHECK: mov64 r3, 33
+; CHECK: call memcpy
+  ret void
+}
\ No newline at end of file

From 56f02cf916a2fe980a6cda0b71330a3040a88b1e Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:04:08 -0300
Subject: [PATCH 045/114] [SOL] Inform stack size in error message (#100)

---
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index d86edf70a3dc7..918aab88c9612 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -60,10 +60,12 @@ static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
         dbgs() << " ";
         DL.print(dbgs());
       }
+      uint64_t StackSize = MF.getFrameInfo().getStackSize();
       dbgs() << " Function " << MF.getFunction().getName()
              << " Stack offset of " << -Offset << " exceeded max offset of "
              << -MaxOffset << " by " << MaxOffset - Offset
-             << " bytes, please minimize large stack variables\n";
+             << " bytes, please minimize large stack variables. "
+             << "Estimated function frame size: " << StackSize << " bytes.\n\n";
     } else {
       DiagnosticInfoUnsupported DiagStackSize(
           MF.getFunction(),

From 27178604e0d6b6609ddfed1d7118c18c5ccf0d9d Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 9 Jul 2024 16:36:20 -0300
Subject: [PATCH 046/114] [SOL] Error when we overwrite data on the stack
 (#106)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp  | 32 +++++++++--------
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp  | 17 +++++++--
 llvm/test/CodeGen/SBF/func_call_error.ll | 46 ++++++++++++++++++++++++
 llvm/test/CodeGen/SBF/warn-stack.ll      |  6 ++--
 4 files changed, 81 insertions(+), 20 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/func_call_error.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index e744795cf5753..fec02b91b153f 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -625,37 +625,39 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
       SDValue DstAddr;
       MachinePointerInfo DstInfo;
+      int FrameIndex;
+      int64_t Offset;
       if (Subtarget->getHasDynamicFrames()) {
         // In the new call convention, arguments are stored in the callee frame
         // The positive offset signals that the variable does not occupy space
         // in the caller frame.
-        int64_t Offset = static_cast<int64_t>(VA.getLocMemOffset() +
-                                              PtrVT.getFixedSizeInBits() / 8);
+        Offset = static_cast<int64_t>(VA.getLocMemOffset() +
+                                      PtrVT.getFixedSizeInBits() / 8);
         if (!Subtarget->getEnableNewCallConvention())
           // In the old call convention, we place argument at the start of the
           // frame in a fixed stack offset.
           Offset = -Offset;
 
-        int FrameIndex = MF.getFrameInfo().CreateFixedObject(
+        FrameIndex = MF.getFrameInfo().CreateFixedObject(
             VA.getLocVT().getFixedSizeInBits() / 8, Offset, false);
-        SBFFuncInfo->storeFrameIndexArgument(FrameIndex);
-        DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
-        DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
       } else {
-        SDValue Const =
-            DAG.getConstant(SBFRegisterInfo::FrameLength - VA.getLocMemOffset(),
-                            CLI.DL, MVT::i64);
-        DstAddr = DAG.getNode(ISD::SUB, CLI.DL, PtrVT, FramePtr, Const);
-        DstInfo = MachinePointerInfo();
+        Offset = static_cast<int64_t>(VA.getLocMemOffset());
+        FrameIndex = MF.getFrameInfo().CreateFixedObject(
+            VA.getLocVT().getFixedSizeInBits() / 8, Offset, false);
       }
 
+      SBFFuncInfo->storeFrameIndexArgument(FrameIndex);
+      DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
+      DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
       Chain = DAG.getStore(Chain, CLI.DL, Arg, DstAddr, DstInfo);
     }
 
-    // Pass the current stack frame pointer via SBF::R5, gluing the
-    // instruction to instructions passing the first 4 arguments in
-    // registers below.
-    Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InGlue);
+    if (!Subtarget->getEnableNewCallConvention())
+      // Pass the current stack frame pointer via SBF::R5, gluing the
+      // instruction to instructions passing the first 4 arguments in
+      // registers below.
+      Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InGlue);
+
     InGlue = Chain.getValue(1);
   }
 
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 918aab88c9612..e9874db680416 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -47,7 +47,7 @@ static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
 {
   static Function *OldMF = nullptr;
   int MaxOffset = -1 * SBFRegisterInfo::FrameLength;
-  if (Offset <= MaxOffset) {
+  if (Offset < MaxOffset) {
 
     if (&(MF.getFunction()) == OldMF) {
       return;
@@ -156,8 +156,21 @@ int SBFRegisterInfo::resolveInternalFrameIndex(
   const MachineFrameInfo &MFI = MF.getFrameInfo();
   const SBFFunctionInfo *SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
   int Offset = MFI.getObjectOffset(FI);
-  if (MF.getSubtarget<SBFSubtarget>().getEnableNewCallConvention() &&
+
+  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames() &&
       SBFFuncInfo->containsFrameIndex(FI)) {
+    Offset = SBFRegisterInfo::FrameLength - Offset;
+    if (static_cast<uint64_t>(Offset) < MFI.getStackSize()) {
+      dbgs() << "Error: A function call in method "
+             << MF.getFunction().getName()
+             << " overwrites values in the frame. Please, decrease stack usage "
+             << "or remove parameters from the call.\n\n";
+      report_fatal_error(
+          "The function call may cause undefined behavior during execution.");
+    }
+    Offset = -Offset;
+  } else if (MF.getSubtarget<SBFSubtarget>().getEnableNewCallConvention() &&
+             SBFFuncInfo->containsFrameIndex(FI)) {
     uint64_t StackSize = MFI.getStackSize();
     Offset = -static_cast<int>(StackSize) - Offset;
   } else if (Imm.has_value()) {
diff --git a/llvm/test/CodeGen/SBF/func_call_error.ll b/llvm/test/CodeGen/SBF/func_call_error.ll
new file mode 100644
index 0000000000000..fcde3e5c1f27c
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/func_call_error.ll
@@ -0,0 +1,46 @@
+; RUN: not --crash llc < %s -march=sbf 2>&1 | FileCheck %s
+
+; Function Attrs: noinline nounwind optnone ssp uwtable(sync)
+define i32 @func(i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3, i32 noundef %4, i32 noundef %5) #0 {
+  ret i32 %2
+}
+
+; Function Attrs: noinline nounwind optnone ssp uwtable(sync)
+define i32 @func1(i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3) #0 {
+  %5 = alloca i32, align 4
+  %6 = alloca i32, align 4
+  %7 = alloca i32, align 4
+  %8 = alloca i32, align 4
+  %9 = alloca [4070 x i8], align 1
+  store i32 %0, ptr %5, align 4
+  store i32 %1, ptr %6, align 4
+  store i32 %2, ptr %7, align 4
+  store i32 %3, ptr %8, align 4
+  %10 = load i32, ptr %5, align 4
+  %11 = load i32, ptr %6, align 4
+  %12 = load i32, ptr %7, align 4
+  %13 = load i32, ptr %8, align 4
+  %14 = getelementptr inbounds [4070 x i8], ptr %9, i64 0, i64 5
+  %15 = load i8, ptr %14, align 1
+  %16 = sext i8 %15 to i32
+  %17 = getelementptr inbounds [4070 x i8], ptr %9, i64 0, i64 9
+  %18 = load i8, ptr %17, align 1
+  %19 = sext i8 %18 to i32
+  %20 = call i32 @func(i32 noundef %10, i32 noundef %11, i32 noundef %12, i32 noundef %13, i32 noundef %16, i32 noundef %19)
+  ret i32 %20
+
+; CHECK: A function call in method func1 overwrites values in the frame.
+; CHECK: Please, decrease stack usage or remove parameters from the call.
+; CHECK: The function call may cause undefined behavior during execution.
+}
+
+
+attributes #0 = { noinline nounwind optnone ssp uwtable(sync) "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.1a,+v8.2a,+v8.3a,+v8.4a,+v8.5a,+v8a,+zcm,+zcz" }
+
+!llvm.module.flags = !{!0, !1, !2, !3, !4}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 14, i32 4]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 8, !"PIC Level", i32 2}
+!3 = !{i32 7, !"uwtable", i32 1}
+!4 = !{i32 7, !"frame-pointer", i32 1}
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/warn-stack.ll b/llvm/test/CodeGen/SBF/warn-stack.ll
index 3daf8c7dbefcc..cada2f52738b5 100644
--- a/llvm/test/CodeGen/SBF/warn-stack.ll
+++ b/llvm/test/CodeGen/SBF/warn-stack.ll
@@ -24,10 +24,10 @@ declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
 ; CHECK: Error: warn_stack.c
 ; CHECK: please minimize large stack variables 
 define void @warn() local_unnamed_addr #0 !dbg !20 {
-  %1 = alloca [512 x i8], align 1
-  %2 = getelementptr inbounds [512 x i8], [512 x i8]* %1, i64 0, i64 0, !dbg !26
+  %1 = alloca [4124 x i8], align 1
+  %2 = getelementptr inbounds [4124 x i8], [4124 x i8]* %1, i64 0, i64 0, !dbg !26
   call void @llvm.lifetime.start.p0i8(i64 512, i8* nonnull %2) #4, !dbg !26
-  tail call void @llvm.dbg.declare(metadata [512 x i8]* %1, metadata !22, metadata !16), !dbg !27
+  tail call void @llvm.dbg.declare(metadata [4124 x i8]* %1, metadata !22, metadata !16), !dbg !27
   call void @doit(i8* nonnull %2) #4, !dbg !28
   call void @llvm.lifetime.end.p0i8(i64 512, i8* nonnull %2) #4, !dbg !29
   ret void, !dbg !29

From dbead1073892c3898ec2bfaf442698458cf2c7d1 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 9 Jul 2024 21:29:09 -0300
Subject: [PATCH 047/114] [SOL] Error out when a function access an invalid
 offset (#107)

---
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp | 2 ++
 llvm/test/CodeGen/SBF/warn-stack.ll     | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index e9874db680416..1a050a6816c35 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -66,6 +66,8 @@ static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
              << -MaxOffset << " by " << MaxOffset - Offset
              << " bytes, please minimize large stack variables. "
              << "Estimated function frame size: " << StackSize << " bytes.\n\n";
+      report_fatal_error("Exceeding the maximum stack offset may cause "
+                         "undefined behavior, including the loss of funds.");
     } else {
       DiagnosticInfoUnsupported DiagStackSize(
           MF.getFunction(),
diff --git a/llvm/test/CodeGen/SBF/warn-stack.ll b/llvm/test/CodeGen/SBF/warn-stack.ll
index cada2f52738b5..0f8e63a4cb893 100644
--- a/llvm/test/CodeGen/SBF/warn-stack.ll
+++ b/llvm/test/CodeGen/SBF/warn-stack.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not --crash llc -march=sbf < %s 2>&1 >/dev/null | FileCheck %s
 
 define void @nowarn() local_unnamed_addr #0 !dbg !6 {
   %1 = alloca [4096 x i8], align 1
@@ -22,7 +22,8 @@ declare void @doit(i8*) local_unnamed_addr #3
 declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
 
 ; CHECK: Error: warn_stack.c
-; CHECK: please minimize large stack variables 
+; CHECK: please minimize large stack variables
+; CHECK: Exceeding the maximum stack offset may cause undefined behavior, including the loss of funds.
 define void @warn() local_unnamed_addr #0 !dbg !20 {
   %1 = alloca [4124 x i8], align 1
   %2 = getelementptr inbounds [4124 x i8], [4124 x i8]* %1, i64 0, i64 0, !dbg !26

From 868e64d34ee31c13e352fce11549000a556007ad Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:46:12 -0300
Subject: [PATCH 048/114] [SOL] Do not crash for stack errors (#108)

---
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp  | 12 ++++++------
 llvm/test/CodeGen/SBF/func_call_error.ll |  2 +-
 llvm/test/CodeGen/SBF/warn-stack.ll      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 1a050a6816c35..699d2d0f98f07 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -65,9 +65,9 @@ static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
              << " Stack offset of " << -Offset << " exceeded max offset of "
              << -MaxOffset << " by " << MaxOffset - Offset
              << " bytes, please minimize large stack variables. "
-             << "Estimated function frame size: " << StackSize << " bytes.\n\n";
-      report_fatal_error("Exceeding the maximum stack offset may cause "
-                         "undefined behavior, including the loss of funds.");
+             << "Estimated function frame size: " << StackSize << " bytes."
+             << " Exceeding the maximum stack offset may cause "
+                "undefined behavior during execution.\n\n";
     } else {
       DiagnosticInfoUnsupported DiagStackSize(
           MF.getFunction(),
@@ -166,9 +166,9 @@ int SBFRegisterInfo::resolveInternalFrameIndex(
       dbgs() << "Error: A function call in method "
              << MF.getFunction().getName()
              << " overwrites values in the frame. Please, decrease stack usage "
-             << "or remove parameters from the call.\n\n";
-      report_fatal_error(
-          "The function call may cause undefined behavior during execution.");
+             << "or remove parameters from the call."
+             << "The function call may cause undefined behavior "
+                "during execution.\n\n";
     }
     Offset = -Offset;
   } else if (MF.getSubtarget<SBFSubtarget>().getEnableNewCallConvention() &&
diff --git a/llvm/test/CodeGen/SBF/func_call_error.ll b/llvm/test/CodeGen/SBF/func_call_error.ll
index fcde3e5c1f27c..b4d49e6ec1f87 100644
--- a/llvm/test/CodeGen/SBF/func_call_error.ll
+++ b/llvm/test/CodeGen/SBF/func_call_error.ll
@@ -1,4 +1,4 @@
-; RUN: not --crash llc < %s -march=sbf 2>&1 | FileCheck %s
+; RUN: llc < %s -march=sbf 2>&1 | FileCheck %s
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable(sync)
 define i32 @func(i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3, i32 noundef %4, i32 noundef %5) #0 {
diff --git a/llvm/test/CodeGen/SBF/warn-stack.ll b/llvm/test/CodeGen/SBF/warn-stack.ll
index 0f8e63a4cb893..4458853e856dd 100644
--- a/llvm/test/CodeGen/SBF/warn-stack.ll
+++ b/llvm/test/CodeGen/SBF/warn-stack.ll
@@ -1,4 +1,4 @@
-; RUN: not --crash llc -march=sbf < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: llc -march=sbf < %s 2>&1 >/dev/null | FileCheck %s
 
 define void @nowarn() local_unnamed_addr #0 !dbg !6 {
   %1 = alloca [4096 x i8], align 1
@@ -23,7 +23,7 @@ declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) #1
 
 ; CHECK: Error: warn_stack.c
 ; CHECK: please minimize large stack variables
-; CHECK: Exceeding the maximum stack offset may cause undefined behavior, including the loss of funds.
+; CHECK: Exceeding the maximum stack offset may cause undefined behavior during execution.
 define void @warn() local_unnamed_addr #0 !dbg !20 {
   %1 = alloca [4124 x i8], align 1
   %2 = getelementptr inbounds [4124 x i8], [4124 x i8]* %1, i64 0, i64 0, !dbg !26

From 057b39cd8aad15f8c19c33a2e83a56fcbd3fe355 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:56:27 -0300
Subject: [PATCH 049/114] [SOL] Fix misposiotioned InGlue (#109)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index fec02b91b153f..5b51a8c692b81 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -605,11 +605,6 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   SDValue InGlue;
 
   if (HasStackArgs) {
-    SDValue FramePtr = DAG.getCopyFromReg(Chain,
-                                          CLI.DL,
-                                          Subtarget->getRegisterInfo()->getFrameRegister(MF),
-                                          getPointerTy(MF.getDataLayout()));
-
     SBFFunctionInfo * SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
     // Stack arguments have to be walked in reverse order by inserting
     // chained stores, this ensures their order is not changed by the scheduler
@@ -652,13 +647,17 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       Chain = DAG.getStore(Chain, CLI.DL, Arg, DstAddr, DstInfo);
     }
 
-    if (!Subtarget->getEnableNewCallConvention())
+    if (!Subtarget->getEnableNewCallConvention()) {
       // Pass the current stack frame pointer via SBF::R5, gluing the
       // instruction to instructions passing the first 4 arguments in
       // registers below.
+      SDValue FramePtr = DAG.getCopyFromReg(
+          Chain, CLI.DL, Subtarget->getRegisterInfo()->getFrameRegister(MF),
+          getPointerTy(MF.getDataLayout()));
       Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InGlue);
+      InGlue = Chain.getValue(1);
+    }
 
-    InGlue = Chain.getValue(1);
   }
 
   // Build a sequence of copy-to-reg nodes chained together with token chain and

From 2199a3c9fbb7d2edc248b22597ab51d740f1d2d5 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Sat, 29 Jun 2024 21:07:19 -0300
Subject: [PATCH 050/114] [SOL] Adjust backend after upgrade to LLVM 18

---
 clang/lib/Basic/Targets/BPF.cpp               |   4 +-
 clang/test/CodeGen/ext-int-cc.c               |   2 +
 clang/test/CodeGen/target-data.c              |   4 +
 lld/ELF/InputSection.cpp                      |  10 +-
 lld/tools/lld/lld.cpp                         |   1 +
 llvm/lib/Target/BPF/BPFISelLowering.cpp       |   6 +-
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp |  10 +-
 llvm/lib/Target/SBF/BTFDebug.cpp              |   6 +-
 .../SBF/Disassembler/SBFDisassembler.cpp      |   1 +
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |   8 +-
 .../SBF/MCTargetDesc/SBFELFObjectWriter.cpp   |   5 +-
 .../SBF/MCTargetDesc/SBFMCCodeEmitter.cpp     |   2 +-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |   2 +-
 .../Target/SBF/SBFAbstractMemberAccess.cpp    |  16 ++-
 llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp   |   2 +-
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |   8 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp       |  10 --
 llvm/lib/Target/SBF/SBFISelLowering.h         |   3 -
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |   7 +-
 llvm/lib/Target/SBF/SBFTargetMachine.h        |   4 +-
 llvm/test/CodeGen/BPF/many_args1.ll           |   2 +-
 .../SBF/CORE/field-reloc-bitfield-1.ll        |   6 +-
 llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll  |   6 +-
 llvm/test/CodeGen/SBF/loop-exit-cond.ll       | 134 ------------------
 llvm/tools/llvm-objdump/llvm-objdump.cpp      |   3 +-
 25 files changed, 60 insertions(+), 202 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SBF/loop-exit-cond.ll

diff --git a/clang/lib/Basic/Targets/BPF.cpp b/clang/lib/Basic/Targets/BPF.cpp
index 354f879eaa87c..a710c399562f8 100644
--- a/clang/lib/Basic/Targets/BPF.cpp
+++ b/clang/lib/Basic/Targets/BPF.cpp
@@ -69,11 +69,13 @@ void BPFTargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__BPF_FEATURE_SDIV_SMOD");
     Builder.defineMacro("__BPF_FEATURE_GOTOL");
     Builder.defineMacro("__BPF_FEATURE_ST");
-
+  }
+  
   if (HasSolanaFeature) {
     Builder.defineMacro("__ELF__");
   }
 }
+                                    
 
 static constexpr llvm::StringLiteral ValidCPUNames[] = {"generic", "v1", "v2",
                                                         "v3", "v4", "probe"};
diff --git a/clang/test/CodeGen/ext-int-cc.c b/clang/test/CodeGen/ext-int-cc.c
index e8e7fa7998b67..3c4f2bef132bd 100644
--- a/clang/test/CodeGen/ext-int-cc.c
+++ b/clang/test/CodeGen/ext-int-cc.c
@@ -62,6 +62,7 @@ void ParamPassing(_BitInt(128) b, _BitInt(64) c) {}
 // ARM: define{{.*}} arm_aapcscc void @ParamPassing(ptr byval(i128) align 8 %{{.+}}, i64 %{{.+}})
 // LA64: define{{.*}} void @ParamPassing(i128 %{{.+}}, i64 %{{.+}})
 // LA32: define{{.*}} void @ParamPassing(ptr %{{.+}}, i64 %{{.+}})
+// SBF: define{{.*}} void @ParamPassing(i128 %{{.+}}, i64 %{{.+}})
 
 void ParamPassing2(_BitInt(127) b, _BitInt(63) c) {}
 // LIN64: define{{.*}} void @ParamPassing2(i64 %{{.+}}, i64 %{{.+}}, i64 %{{.+}})
@@ -257,6 +258,7 @@ _BitInt(127) ReturnPassing3(void) { return 0; }
 // ARM: define{{.*}} arm_aapcscc void @ReturnPassing3(ptr dead_on_unwind noalias writable sret
 // LA64: define{{.*}} i127 @ReturnPassing3(
 // LA32: define{{.*}} void @ReturnPassing3(ptr dead_on_unwind noalias writable sret
+// SBF: define{{.*}} i127 @ReturnPassing3(
 
 _BitInt(128) ReturnPassing4(void) { return 0; }
 // LIN64: define{{.*}} { i64, i64 } @ReturnPassing4(
diff --git a/clang/test/CodeGen/target-data.c b/clang/test/CodeGen/target-data.c
index 71eb849433ed4..4d784710044af 100644
--- a/clang/test/CodeGen/target-data.c
+++ b/clang/test/CodeGen/target-data.c
@@ -265,6 +265,10 @@
 // RUN: FileCheck %s -check-prefix=BPFEB
 // BPFEB: target datalayout = "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
 
+// RUN: %clang_cc1 -triple sbf -o - -emit-llvm %s | \
+// RUN: FileCheck %s -check-prefix=SBF
+// SBF: target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+
 // RUN: %clang_cc1 -triple ve -o - -emit-llvm %s | \
 // RUN: FileCheck %s -check-prefix=VE
 // VE: target datalayout = "e-m:e-i64:64-n32:64-S128-v64:64:64-v128:64:64-v256:64:64-v512:64:64-v1024:64:64-v2048:64:64-v4096:64:64-v8192:64:64-v16384:64:64"
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 3fc4e5189bda6..53b475af13534 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -1039,21 +1039,13 @@ void InputSection::relocateNonAlloc(Ctx &ctx, uint8_t *buf,
   const InputFile *f = this->file;
   for (auto it = rels.begin(), end = rels.end(); it != end; ++it) {
     const RelTy &rel = *it;
-    const RelType type = rel.getType(ctx.arg.isMips64EL);
+    RelType type = rel.getType(ctx.arg.isMips64EL);
     const uint64_t offset = rel.r_offset;
 
     // FIX: Temporary remap BPF_64_64 relocations in debug sections.
     if (config->emachine == EM_BPF && type == R_BPF_64_64 && isDebug)
       type = R_BPF_64_ABS64;
 
-    // GCC 8.0 or earlier have a bug that they emit R_386_GOTPC relocations
-    // against _GLOBAL_OFFSET_TABLE_ for .debug_info. The bug has been fixed
-    // in 2017 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82630), but we
-    // need to keep this bug-compatible code for a while.
-    if (config->emachine == EM_386 && type == R_386_GOTPC)
-      continue;
-
-    uint64_t offset = rel.r_offset;
     uint8_t *bufLoc = buf + offset;
     int64_t addend = getAddend<ELFT>(rel);
     if (!RelTy::HasAddend)
diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp
index d6800fa1eea4b..9e2d9265aaa2f 100644
--- a/lld/tools/lld/lld.cpp
+++ b/lld/tools/lld/lld.cpp
@@ -73,6 +73,7 @@ LLD_HAS_DRIVER(macho)
 LLD_HAS_DRIVER(wasm)
 
 int lld_main(int argc, char **argv, const llvm::ToolContext &) {
+  initLLVM();
   sys::Process::UseANSIEscapeCodes(true);
 
   if (::getenv("FORCE_LLD_DIAGNOSTICS_CRASH")) {
diff --git a/llvm/lib/Target/BPF/BPFISelLowering.cpp b/llvm/lib/Target/BPF/BPFISelLowering.cpp
index 1f5cadf37ab58..456f5a672c2cc 100644
--- a/llvm/lib/Target/BPF/BPFISelLowering.cpp
+++ b/llvm/lib/Target/BPF/BPFISelLowering.cpp
@@ -98,7 +98,7 @@ BPFTargetLowering::BPFTargetLowering(const TargetMachine &TM,
 
     setOperationAction(ISD::SDIVREM, VT, Expand);
     setOperationAction(ISD::UDIVREM, VT, Expand);
-    if (!STI.hasSdivSmod()) {
+    if (!STI.hasSdivSmod() && !Subtarget->isSolana()) {
       setOperationAction(ISD::SDIV, VT, Custom);
       setOperationAction(ISD::SREM, VT, Custom);
     }
@@ -279,10 +279,6 @@ void BPFTargetLowering::ReplaceNodeResults(
   switch (Opcode) {
   default:
     report_fatal_error("unhandled custom legalization: " + Twine(Opcode));
-  case ISD::ATOMIC_LOAD_ADD:
-  case ISD::ATOMIC_LOAD_AND:
-  case ISD::ATOMIC_LOAD_OR:
-  case ISD::ATOMIC_LOAD_XOR:
   case ISD::ATOMIC_SWAP:
   case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
     if (HasAlu32 || Opcode == ISD::ATOMIC_LOAD_ADD)
diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index 76c08a5d46f6e..8e65f07b97987 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -40,7 +40,7 @@ class SBFAsmParser : public MCTargetAsmParser {
 
   bool parseRegister(MCRegister &Reg, SMLoc &StartLoc,
                      SMLoc &EndLoc) override;
-  OperandMatchResultTy tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
+  ParseStatus tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
                                         SMLoc &EndLoc) override;
 
   bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
@@ -300,12 +300,12 @@ bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
 
 bool SBFAsmParser::parseRegister(MCRegister &Reg, SMLoc &StartLoc,
                                  SMLoc &EndLoc) {
-  if (tryParseRegister(Reg, StartLoc, EndLoc) != MatchOperand_Success)
+  if (!tryParseRegister(Reg, StartLoc, EndLoc).isSuccess())
     return Error(StartLoc, "invalid register name");
   return false;
 }
 
-OperandMatchResultTy SBFAsmParser::tryParseRegister(MCRegister &Reg,
+ParseStatus SBFAsmParser::tryParseRegister(MCRegister &Reg,
                                                     SMLoc &StartLoc,
                                                     SMLoc &EndLoc) {
   const AsmToken &Tok = getParser().getTok();
@@ -316,10 +316,10 @@ OperandMatchResultTy SBFAsmParser::tryParseRegister(MCRegister &Reg,
 
   if (!MatchRegisterName(Name)) {
     getParser().Lex(); // Eat identifier token.
-    return MatchOperand_Success;
+    return ParseStatus::Success;
   }
 
-  return MatchOperand_NoMatch;
+  return ParseStatus::NoMatch;
 }
 
 OperandMatchResultTy SBFAsmParser::parseRegister(OperandVector &Operands) {
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index 22edaa0e55846..c6726d2f8a030 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -977,7 +977,7 @@ std::string BTFDebug::populateFileContent(const DISubprogram *SP) {
   auto File = SP->getFile();
   std::string FileName;
 
-  if (!File->getFilename().startswith("/") && File->getDirectory().size())
+  if (!File->getFilename().starts_with("/") && File->getDirectory().size())
     FileName = File->getDirectory().str() + "/" + File->getFilename().str();
   else
     FileName = std::string(File->getFilename());
@@ -1411,7 +1411,7 @@ void BTFDebug::processGlobals(bool ProcessingMapDef) {
       SecName = Sec->getName();
     }
 
-    if (ProcessingMapDef != SecName.startswith(".maps"))
+    if (ProcessingMapDef != SecName.starts_with(".maps"))
       continue;
 
     // Create a .rodata datasec if the global variable is an initialized
@@ -1437,7 +1437,7 @@ void BTFDebug::processGlobals(bool ProcessingMapDef) {
     DIGlobalVariable *DIGlobal = nullptr;
     for (auto *GVE : GVs) {
       DIGlobal = GVE->getVariable();
-      if (SecName.startswith(".maps"))
+      if (SecName.starts_with(".maps"))
         visitMapDefType(DIGlobal->getType(), GVTypeId);
       else
         visitTypeEntry(DIGlobal->getType(), GVTypeId, false, false);
diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 33d32dca68406..d3cad4bc32321 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -170,6 +170,7 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
 
   uint8_t InstClass = getInstClass(Insn);
   uint8_t InstMode = getInstMode(Insn);
+
   if ((InstClass == SBF_LDX || InstClass == SBF_STX) &&
       getInstSize(Insn) != SBF_DW &&
       (InstMode == SBF_MEM || InstMode == SBF_ATOMIC) &&
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 0297f8ba5c932..62aa7f700d414 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -24,7 +24,7 @@ namespace {
 
 class SBFAsmBackend : public MCAsmBackend {
 public:
-  SBFAsmBackend(support::endianness Endian, const MCSubtargetInfo &STI)
+  SBFAsmBackend(endianness Endian, const MCSubtargetInfo &STI)
       : MCAsmBackend(Endian),
         isSBFv2(STI.getCPU() == "sbfv2"),
         isSolana(STI.hasFeature(SBF::FeatureSolana) ||
@@ -88,7 +88,7 @@ void SBFAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
     support::endian::write<uint64_t>(&Data[Fixup.getOffset()], Value, Endian);
   } else if (Fixup.getKind() == FK_PCRel_4) {
     Value = (uint32_t)((Value - 8) / 8);
-    if (Endian == support::little) {
+    if (Endian == endianness::little) {
       Data[Fixup.getOffset() + 1] = 0x10;
       support::endian::write32le(&Data[Fixup.getOffset() + 4], Value);
     } else {
@@ -117,12 +117,12 @@ MCAsmBackend *llvm::createSBFAsmBackend(const Target &T,
                                         const MCSubtargetInfo &STI,
                                         const MCRegisterInfo &MRI,
                                         const MCTargetOptions &) {
-  return new SBFAsmBackend(support::little, STI);
+  return new SBFAsmBackend(endianness::little, STI);
 }
 
 MCAsmBackend *llvm::createSBFbeAsmBackend(const Target &T,
                                           const MCSubtargetInfo &STI,
                                           const MCRegisterInfo &MRI,
                                           const MCTargetOptions &) {
-  return new SBFAsmBackend(support::big, STI);
+  return new SBFAsmBackend(endianness::big, STI);
 }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
index 1cf954a00f46c..8e5b7353119b2 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
@@ -29,7 +29,7 @@ class SBFELFObjectWriter : public MCELFObjectTargetWriter {
   unsigned getRelocType(MCContext &Ctx, const MCValue &Target,
                         const MCFixup &Fixup, bool IsPCRel) const override;
 
-  bool needsRelocateWithSymbol(const MCSymbol &Sym,
+  bool needsRelocateWithSymbol(const MCValue &Val, const MCSymbol &Sym,
                                unsigned Type) const override;
 private:
   bool isSolana;
@@ -42,7 +42,8 @@ class SBFELFObjectWriter : public MCELFObjectTargetWriter {
 // section relocations with values (offset into the section containing
 // the symbol being relocated).  Forcing a relocation with a symbol
 // will result in the symbol's index being used in the .o file instead.
-bool SBFELFObjectWriter::needsRelocateWithSymbol(const MCSymbol &Sym,
+bool SBFELFObjectWriter::needsRelocateWithSymbol(const MCValue &Val,
+                                                 const MCSymbol &Sym,
                                                  unsigned Type) const {
   return isSolana;
 }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
index baf49bf109909..d790b9877c1b7 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCCodeEmitter.cpp
@@ -118,7 +118,7 @@ void SBFMCCodeEmitter::encodeInstruction(const MCInst &MI,
   unsigned Opcode = MI.getOpcode();
   raw_svector_ostream OS(CB);
   support::endian::Writer OSE(OS,
-                              IsLittleEndian ? support::little : support::big);
+                              IsLittleEndian ? endianness::little : endianness::big);
 
   if (Opcode == SBF::LD_imm64 || Opcode == SBF::LD_pseudo) {
     uint64_t Value = getBinaryCodeForInstr(MI, Fixups, STI);
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index e4ef970115274..99af4aa9b19bb 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -26,7 +26,7 @@
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/TargetRegistry.h"
-#include "llvm/Support/Host.h"
+#include "llvm/TargetParser/Host.h"
 
 #define GET_INSTRINFO_MC_DESC
 #define ENABLE_INSTR_PREDICATE_VERIFIER
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
index 28189161f61e5..6a85738742e64 100644
--- a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -87,6 +87,7 @@
 #include "llvm/IR/Type.h"
 #include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
+#include "llvm/IR/ValueHandle.h"
 #include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include <stack>
@@ -333,7 +334,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
   const auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
   if (!GV)
     return false;
-  if (GV->getName().startswith("llvm.preserve.array.access.index")) {
+  if (GV->getName().starts_with("llvm.preserve.array.access.index")) {
     CInfo.Kind = SBFPreserveArrayAI;
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
@@ -343,7 +344,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
     CInfo.RecordAlignment = DL->getABITypeAlign(getBaseElementType(Call));
     return true;
   }
-  if (GV->getName().startswith("llvm.preserve.union.access.index")) {
+  if (GV->getName().starts_with("llvm.preserve.union.access.index")) {
     CInfo.Kind = SBFPreserveUnionAI;
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
@@ -353,7 +354,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
     CInfo.Base = Call->getArgOperand(0);
     return true;
   }
-  if (GV->getName().startswith("llvm.preserve.struct.access.index")) {
+  if (GV->getName().starts_with("llvm.preserve.struct.access.index")) {
     CInfo.Kind = SBFPreserveStructAI;
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
@@ -364,7 +365,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
     CInfo.RecordAlignment = DL->getABITypeAlign(getBaseElementType(Call));
     return true;
   }
-  if (GV->getName().startswith("llvm.bpf.preserve.field.info")) {
+  if (GV->getName().starts_with("llvm.bpf.preserve.field.info")) {
     CInfo.Kind = SBFPreserveFieldInfoAI;
     CInfo.Metadata = nullptr;
     // Check validity of info_kind as clang did not check this.
@@ -374,7 +375,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
     CInfo.AccessIndex = InfoKind;
     return true;
   }
-  if (GV->getName().startswith("llvm.bpf.preserve.type.info")) {
+  if (GV->getName().starts_with("llvm.bpf.preserve.type.info")) {
     CInfo.Kind = SBFPreserveFieldInfoAI;
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
@@ -390,7 +391,7 @@ bool SBFAbstractMemberAccess::IsPreserveDIAccessIndexCall(const CallInst *Call,
       CInfo.AccessIndex = SBFCoreSharedInfo::TYPE_SIZE;
     return true;
   }
-  if (GV->getName().startswith("llvm.bpf.preserve.enum.value")) {
+  if (GV->getName().starts_with("llvm.bpf.preserve.enum.value")) {
     CInfo.Kind = SBFPreserveFieldInfoAI;
     CInfo.Metadata = Call->getMetadata(LLVMContext::MD_preserve_access_index);
     if (!CInfo.Metadata)
@@ -1107,7 +1108,8 @@ bool SBFAbstractMemberAccess::transformGEPChain(CallInst *Call,
   auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
 
   // Generate a BitCast
-  auto *BCInst = new BitCastInst(Base, Type::getInt8PtrTy(BB->getContext()));
+  auto *BCInst =
+      new BitCastInst(Base, PointerType::getUnqual(BB->getContext()));
   BCInst->insertBefore(Call);
 
   // Generate a GetElementPtr
diff --git a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
index 05f55a1ced384..7a7b30ae78d17 100644
--- a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
+++ b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
@@ -106,7 +106,7 @@ bool SBFCheckAndAdjustIR::removePassThroughBuiltin(Module &M) {
         auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
         if (!GV)
           continue;
-        if (!GV->getName().startswith("llvm.bpf.passthrough"))
+        if (!GV->getName().starts_with("llvm.bpf.passthrough"))
           continue;
         Changed = true;
         Value *Arg = Call->getArgOperand(1);
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index 0b48b818e5236..6363d8d4ec0d4 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -60,7 +60,8 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
 
   void PreprocessISelDAG() override;
 
-  bool SelectInlineAsmMemoryOperand(const SDValue &Op, unsigned ConstraintCode,
+  bool SelectInlineAsmMemoryOperand(const SDValue &Op,
+                                    InlineAsm::ConstraintCode ConstraintCode,
                                     std::vector<SDValue> &OutOps) override;
 
 
@@ -157,12 +158,13 @@ bool SBFDAGToDAGISel::SelectFIAddr(SDValue Addr, SDValue &Base,
 }
 
 bool SBFDAGToDAGISel::SelectInlineAsmMemoryOperand(
-    const SDValue &Op, unsigned ConstraintCode, std::vector<SDValue> &OutOps) {
+    const SDValue &Op, InlineAsm::ConstraintCode ConstraintCode,
+    std::vector<SDValue> &OutOps) {
   SDValue Op0, Op1;
   switch (ConstraintCode) {
   default:
     return true;
-  case InlineAsm::Constraint_m: // memory
+  case InlineAsm::ConstraintCode::m: // memory
     if (!SelectAddr(Op, Op0, Op1))
       return true;
     break;
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 5b51a8c692b81..a2d1b2f2745c4 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -229,15 +229,6 @@ bool SBFTargetLowering::allowsMisalignedMemoryAccesses(
   return isSolana;
 }
 
-bool SBFTargetLowering::lowerAtomicStoreAsStoreSDNode(
-    const StoreInst &SI) const {
-  return Subtarget->isSolana();
-}
-
-bool SBFTargetLowering::lowerAtomicLoadAsLoadSDNode(const LoadInst &LI) const {
-  return Subtarget->isSolana();
-}
-
 bool SBFTargetLowering::isOffsetFoldingLegal(
     const GlobalAddressSDNode *GA) const {
   return false;
@@ -494,7 +485,6 @@ SDValue SBFTargetLowering::LowerFormalArguments(
   if (Subtarget->isSolana()) {
     if (IsVarArg) {
       fail(DL, DAG, "Functions with VarArgs are not supported");
-      assert(false);
     }
   } else if (IsVarArg || MF.getFunction().hasStructRetAttr()) {
     fail(DL, DAG, "functions with VarArgs or StructRet are not supported");
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index 74f377cf0d715..ef4449bada44b 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -70,9 +70,6 @@ class SBFTargetLowering : public TargetLowering {
 
   MVT getScalarShiftAmountTy(const DataLayout &, EVT) const override;
 
-  bool lowerAtomicStoreAsStoreSDNode(const StoreInst &SI) const override;
-  bool lowerAtomicLoadAsLoadSDNode(const LoadInst &LI) const override;
-
 private:
   // Control Instruction Selection Features
   bool HasAlu32;
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index f83954cefc0a1..20f1de30d04f4 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -61,7 +61,7 @@ SBFTargetMachine::SBFTargetMachine(const Target &T, const Triple &TT,
                                    const TargetOptions &Options,
                                    std::optional<Reloc::Model> RM,
                                    std::optional<CodeModel::Model> CM,
-                                   CodeGenOpt::Level OL, bool JIT)
+                                   CodeGenOptLevel OL, bool JIT)
     : LLVMTargetMachine(T, computeDataLayout(TT, FS), TT, CPU, FS, Options,
                         getEffectiveRelocModel(RM),
                         getEffectiveCodeModel(CM, CodeModel::Small), OL),
@@ -97,7 +97,8 @@ TargetPassConfig *SBFTargetMachine::createPassConfig(PassManagerBase &PM) {
   return new SBFPassConfig(*this, PM);
 }
 
-void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+void SBFTargetMachine::registerPassBuilderCallbacks(
+    PassBuilder &PB, bool PopulateClassToPassNames) {
   PB.registerPipelineParsingCallback(
       [](StringRef PassName, FunctionPassManager &FPM,
          ArrayRef<PassBuilder::PipelineElement>) {
@@ -167,7 +168,7 @@ void SBFPassConfig::addMachineSSAOptimization() {
 
 void SBFPassConfig::addPreEmitPass() {
   addPass(createSBFMIPreEmitCheckingPass());
-  if (getOptLevel() != CodeGenOpt::None)
+  if (getOptLevel() != CodeGenOptLevel::None)
     if (!DisableMIPeephole)
       addPass(createSBFMIPreEmitPeepholePass());
 }
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
index 20637687dfe9a..d079c867417a0 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.h
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -25,7 +25,7 @@ class SBFTargetMachine : public LLVMTargetMachine {
   SBFTargetMachine(const Target &T, const Triple &TT, StringRef CPU,
                    StringRef FS, const TargetOptions &Options,
                    std::optional<Reloc::Model> RM,
-                   std::optional<CodeModel::Model> CM, CodeGenOpt::Level OL,
+                   std::optional<CodeModel::Model> CM, CodeGenOptLevel OL,
                    bool JIT);
 
   const SBFSubtarget *getSubtargetImpl() const { return &Subtarget; }
@@ -41,7 +41,7 @@ class SBFTargetMachine : public LLVMTargetMachine {
     return TLOF.get();
   }
 
-  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB, bool PopulateClassToPassNames) override;
 
   MachineFunctionInfo *
   createMachineFunctionInfo(BumpPtrAllocator &Allocator, const Function &F,
diff --git a/llvm/test/CodeGen/BPF/many_args1.ll b/llvm/test/CodeGen/BPF/many_args1.ll
index 0e2ff1af06e55..b14d7421050a9 100644
--- a/llvm/test/CodeGen/BPF/many_args1.ll
+++ b/llvm/test/CodeGen/BPF/many_args1.ll
@@ -1,6 +1,6 @@
 ; RUN: not llc -mtriple=bpf -mcpu=v1 < %s 2> %t1
 ; RUN: FileCheck %s < %t1
-; CHECK: error: <unknown>:0:0: in function foo i32 (i32, i32, i32): {{t10|0x[0-f]+}}: i64 = GlobalAddress<ptr @bar> 0 too many arguments
+; CHECK: error: <unknown>:0:0: in function foo i32 (i32, i32, i32): too many args to {{t10|0x[0-f]+}}: i64 = GlobalAddress<ptr @bar> 0
 
 ; Function Attrs: nounwind uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll
index af61a51ca2119..5d4d12d25353c 100644
--- a/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-bitfield-1.ll
@@ -37,11 +37,11 @@ entry:
   ret i32 %add1, !dbg !38
 }
 
-; CHECK:             mov64 r1, 20
-; CHECK:             mov64 r0, 4
+; CHECK:             mov64 r1, 16
+; CHECK:             mov64 r0, 8
 ; CHECK-ALU64:       add64 r0, r1
 ; CHECK-ALU32:       add32 w0, w1
-; CHECK-EL:          mov64 r1, 50
+; CHECK-EL:          mov64 r1, 18
 ; CHECK-ALU64:       add64 r0, r1
 ; CHECK-ALU32:       add32 w0, w1
 ; CHECK:             exit
diff --git a/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll b/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll
index 602db2ce103dc..957fb0956065d 100644
--- a/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll
+++ b/llvm/test/CodeGen/SBF/CORE/no-narrow-load.ll
@@ -70,9 +70,9 @@ lor.end:                                          ; preds = %lor.end.critedge, %
 }
 
 ; CHECK: ldxw r[[LOAD1:[0-9]+]], [r{{[0-9]+}} + 4]
-; CHECK: and64 r[[LOAD1]], 65536
-; CHECK: ldxw r[[LOAD2:[0-9]+]], [r{{[0-9]+}} + 4]
-; CHECK: and64 r[[LOAD2]], 32768
+; CHECK: mov64 r[[LOAD2:[0-9]+]], r[[LOAD1:[0-9]+]]
+; CHECK: and64 r[[LOAD2]], 65536
+; CHECK: and64 r[[LOAD1]], 32768
 
 ; Function Attrs: nounwind readnone speculatable willreturn
 declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
diff --git a/llvm/test/CodeGen/SBF/loop-exit-cond.ll b/llvm/test/CodeGen/SBF/loop-exit-cond.ll
deleted file mode 100644
index 9d422664232b0..0000000000000
--- a/llvm/test/CodeGen/SBF/loop-exit-cond.ll
+++ /dev/null
@@ -1,134 +0,0 @@
-; RUN: opt -O2 -S -o %t1 < %s
-; RUN: llc -march=sbf -mcpu=v3 %t1 -o - | FileCheck %s
-;
-; Source code:
-;   typedef unsigned long u64;
-;   void foo(char *data, int idx, u64 *);
-;   int test(int len, char *data) {
-;     if (len < 100) {
-;       for (int i = 1; i < len; i++) {
-;         u64 d[1];
-;         d[0] = data[0] ?: '0';
-;         foo("%c", i, d);
-;       }
-;     }
-;   return 0;
-; }
-; Compilation flag:
-;   clang -target bpf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; ModuleID = 'test.c'
-source_filename = "test.c"
-target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128"
-target triple = "sbf"
-
-@.str = private unnamed_addr constant [3 x i8] c"%c\00", align 1
-
-; Function Attrs: nounwind
-define dso_local i32 @test(i32 %len, i8* %data) #0 {
-entry:
-  %len.addr = alloca i32, align 4
-  %data.addr = alloca i8*, align 8
-  %i = alloca i32, align 4
-  %d = alloca [1 x i64], align 8
-  store i32 %len, i32* %len.addr, align 4, !tbaa !3
-  store i8* %data, i8** %data.addr, align 8, !tbaa !7
-  %0 = load i32, i32* %len.addr, align 4, !tbaa !3
-  %cmp = icmp slt i32 %0, 100
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  %1 = bitcast i32* %i to i8*
-  call void @llvm.lifetime.start.p0i8(i64 4, i8* %1) #3
-  store i32 1, i32* %i, align 4, !tbaa !3
-  br label %for.cond
-
-for.cond:                                         ; preds = %for.inc, %if.then
-  %2 = load i32, i32* %i, align 4, !tbaa !3
-  %3 = load i32, i32* %len.addr, align 4, !tbaa !3
-  %cmp1 = icmp slt i32 %2, %3
-  br i1 %cmp1, label %for.body, label %for.cond.cleanup
-
-; CHECK:      mov32 r[[LEN:[0-9]+]], w1
-; CHECK:      add32 w[[IDX32:[0-9]+]], 1
-; CHECK:      mov64 r[[IDX:[0-9]+]], r[[IDX32:[0-9]+]]
-; CHECK:      lsh64 r[[IDX:[0-9]+]], 32
-; CHECK:      arsh64 r[[IDX:[0-9]+]], 32
-; CHECK-NEXT: jslt r[[IDX]], r[[LEN]],
-
-for.cond.cleanup:                                 ; preds = %for.cond
-  %4 = bitcast i32* %i to i8*
-  call void @llvm.lifetime.end.p0i8(i64 4, i8* %4) #3
-  br label %for.end
-
-for.body:                                         ; preds = %for.cond
-  %5 = bitcast [1 x i64]* %d to i8*
-  call void @llvm.lifetime.start.p0i8(i64 8, i8* %5) #3
-  %6 = load i8*, i8** %data.addr, align 8, !tbaa !7
-  %arrayidx = getelementptr inbounds i8, i8* %6, i64 0
-  %7 = load i8, i8* %arrayidx, align 1, !tbaa !9
-  %conv = sext i8 %7 to i32
-  %tobool = icmp ne i32 %conv, 0
-  br i1 %tobool, label %cond.true, label %cond.false
-
-cond.true:                                        ; preds = %for.body
-  br label %cond.end
-
-cond.false:                                       ; preds = %for.body
-  br label %cond.end
-
-cond.end:                                         ; preds = %cond.false, %cond.true
-  %cond = phi i32 [ %conv, %cond.true ], [ 48, %cond.false ]
-  %conv2 = sext i32 %cond to i64
-  %arrayidx3 = getelementptr inbounds [1 x i64], [1 x i64]* %d, i64 0, i64 0
-  store i64 %conv2, i64* %arrayidx3, align 8, !tbaa !10
-  %8 = load i32, i32* %i, align 4, !tbaa !3
-  %arraydecay = getelementptr inbounds [1 x i64], [1 x i64]* %d, i64 0, i64 0
-  call void @foo(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i64 0, i64 0), i32 %8, i64* %arraydecay)
-  %9 = bitcast [1 x i64]* %d to i8*
-  call void @llvm.lifetime.end.p0i8(i64 8, i8* %9) #3
-  br label %for.inc
-
-for.inc:                                          ; preds = %cond.end
-  %10 = load i32, i32* %i, align 4, !tbaa !3
-  %inc = add nsw i32 %10, 1
-  store i32 %inc, i32* %i, align 4, !tbaa !3
-  br label %for.cond, !llvm.loop !12
-
-for.end:                                          ; preds = %for.cond.cleanup
-  br label %if.end
-
-if.end:                                           ; preds = %for.end, %entry
-  ret i32 0
-}
-
-; Function Attrs: argmemonly nofree nosync nounwind willreturn
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
-
-declare dso_local void @foo(i8*, i32, i64*) #2
-
-; Function Attrs: argmemonly nofree nosync nounwind willreturn
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
-
-attributes #0 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-attributes #1 = { argmemonly nofree nosync nounwind willreturn }
-attributes #2 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-attributes #3 = { nounwind }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"frame-pointer", i32 2}
-!2 = !{!"clang version 14.0.0 (https://github.com/llvm/llvm-project.git 8385de118443144518c9fba8b3d831d9076e746b)"}
-!3 = !{!4, !4, i64 0}
-!4 = !{!"int", !5, i64 0}
-!5 = !{!"omnipotent char", !6, i64 0}
-!6 = !{!"Simple C/C++ TBAA"}
-!7 = !{!8, !8, i64 0}
-!8 = !{!"any pointer", !5, i64 0}
-!9 = !{!5, !5, i64 0}
-!10 = !{!11, !11, i64 0}
-!11 = !{!"long", !5, i64 0}
-!12 = distinct !{!12, !13}
-!13 = !{!"llvm.loop.mustprogress"}
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index f0ec439a0657e..98937d99f9c53 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -2587,7 +2587,6 @@ static void disassembleObject(ObjectFile *Obj, bool InlineRelocs) {
     }
   }
 
-  DisassemblerTarget PrimaryTarget(TheTarget, *Obj, TripleName, MCPU, Features);
   // The SBF target specifies the cpu type as an ELF flag, which is not parsed automatically in LLVM objdump.
   // We must set the CPU type here so that the disassembler can decode the SBFv2 features correctly.
   if (MCPU.empty() && Obj->isELF() && Obj->getArch() == Triple::sbf) {
@@ -2597,6 +2596,8 @@ static void disassembleObject(ObjectFile *Obj, bool InlineRelocs) {
     }
   }
 
+  DisassemblerTarget PrimaryTarget(TheTarget, *Obj, TripleName, MCPU, Features);
+
   // If we have an ARM object file, we need a second disassembler, because
   // ARM CPUs have two different instruction sets: ARM mode, and Thumb mode.
   // We use mapping symbols to switch between the two assemblers, where

From 55e3630f51501f4a58eb04786ea4978a358df484 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Tue, 23 Jul 2024 19:18:58 -0300
Subject: [PATCH 051/114] [SOL] Expand atomic load and store

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp |  2 ++
 llvm/test/CodeGen/SBF/atomics_sbf.ll    | 42 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index a2d1b2f2745c4..65a20ad285111 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -93,6 +93,8 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::ATOMIC_LOAD_UMAX, VT, Custom);
       setOperationAction(ISD::ATOMIC_LOAD_UMIN, VT, Custom);
       setOperationAction(ISD::ATOMIC_LOAD_XOR, VT, Custom);
+      setOperationAction(ISD::ATOMIC_LOAD, VT, Expand);
+      setOperationAction(ISD::ATOMIC_STORE, VT, Expand);
       continue;
     }
 
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
index 88e3e7c80ba9b..d1836df154955 100644
--- a/llvm/test/CodeGen/SBF/atomics_sbf.ll
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -288,3 +288,45 @@ entry:
   %0 = atomicrmw umax i64* %ptr, i64 %v release, align 1
   ret i64 %0
 }
+
+; CHECK-LABEL: test_load_64
+; CHECK: ldxdw r0, [r1 + 0]
+; CHECK: mov64 r2, 0
+; CHECK: jeq r0, 0, LBB24_2
+; CHECK: mov64 r2, r0
+; CHECK: LBB24_2:
+; CHECK: stxdw [r1 + 0], r2
+define dso_local i64 @test_load_64(ptr nocapture %p) local_unnamed_addr {
+entry:
+  %0 = load atomic i64, ptr %p seq_cst, align 8
+  ret i64 %0
+}
+
+; CHECK-LABEL: test_load_32
+; CHECK: ldxw w0, [r1 + 0]
+; CHECK: mov32 w2, 0
+; CHECK: jeq r0, 0, LBB25_2
+; CHECK: mov32 w2, w0
+; CHECK: LBB25_2:
+; CHECK: stxw [r1 + 0], w2
+define dso_local i32 @test_load_32(ptr nocapture %p) local_unnamed_addr {
+entry:
+  %0 = load atomic i32, ptr %p seq_cst, align 8
+  ret i32 %0
+}
+
+; CHECK-LABEL: test_store_64
+; CHECK: stxdw [r1 + 0], r2
+define dso_local void @test_store_64(ptr nocapture %p, i64 %val) local_unnamed_addr {
+entry:
+  store atomic i64 %val, ptr %p seq_cst, align 8
+  ret void
+}
+
+; CHECK-LABEL: test_store_32
+; CHECK: stxw [r1 + 0], w2
+define dso_local void @test_store_32(ptr nocapture %p, i32 %val) local_unnamed_addr {
+entry:
+  store atomic i32 %val, ptr %p seq_cst, align 8
+  ret void
+}
\ No newline at end of file

From ba150ff847b32722e7c1747bf462201fcadbeba6 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Wed, 24 Jul 2024 11:41:20 -0300
Subject: [PATCH 052/114] [SOL] Implement atomic swap

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp |  6 ++++++
 llvm/test/CodeGen/SBF/atomics_sbf.ll    | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 65a20ad285111..7c2a2b75f59b9 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -83,6 +83,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
       // Implement custom lowering for all atomic operations
       setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
       setOperationAction(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS, VT, Custom);
+      setOperationAction(ISD::ATOMIC_CMP_SWAP, VT, Custom);
       setOperationAction(ISD::ATOMIC_LOAD_ADD, VT, Custom);
       setOperationAction(ISD::ATOMIC_LOAD_AND, VT, Custom);
       setOperationAction(ISD::ATOMIC_LOAD_MAX, VT, Custom);
@@ -312,6 +313,7 @@ void SBFTargetLowering::ReplaceNodeResults(SDNode *N,
     report_fatal_error("Unhandled custom legalization");
   case ISD::ATOMIC_SWAP:
   case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
+  case ISD::ATOMIC_CMP_SWAP:
   case ISD::ATOMIC_LOAD_ADD:
   case ISD::ATOMIC_LOAD_AND:
   case ISD::ATOMIC_LOAD_MAX:
@@ -348,6 +350,7 @@ SDValue SBFTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
     return LowerSELECT_CC(Op, DAG);
   case ISD::ATOMIC_SWAP:
   case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
+  case ISD::ATOMIC_CMP_SWAP:
   case ISD::ATOMIC_LOAD_ADD:
   case ISD::ATOMIC_LOAD_AND:
   case ISD::ATOMIC_LOAD_MAX:
@@ -918,6 +921,9 @@ SDValue SBFTargetLowering::LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const {
         DAG.getBoolConstant(false, DL, RetFlagVT, RetFlagVT), ISD::SETEQ);
     break;
   }
+  case ISD::ATOMIC_CMP_SWAP:
+    NewVal = DAG.getSelectCC(DL, Load, Cmp, Val, Load, ISD::SETEQ);
+    break;
   case ISD::ATOMIC_LOAD_ADD:
     NewVal = DAG.getNode(ISD::ADD, DL, ValVT, Load, Val);
     break;
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
index d1836df154955..9e135c44664dd 100644
--- a/llvm/test/CodeGen/SBF/atomics_sbf.ll
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -329,4 +329,26 @@ define dso_local void @test_store_32(ptr nocapture %p, i32 %val) local_unnamed_a
 entry:
   store atomic i32 %val, ptr %p seq_cst, align 8
   ret void
+}
+
+; CHECK-LABEL: test_weak_cas_32
+; CHECK: ldxw w4, [r1 + 0]
+; CHECK: mov32 r2, w2
+; CHECK: jeq r4, r2,
+; CHECK: stxw [r1 + 0], w3
+define dso_local void @test_weak_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
+entry:
+  cmpxchg weak i32* %p, i32 %old, i32 %new seq_cst seq_cst
+  ret void
+}
+
+; CHECK-LABEL: test_weak_cas_64
+; CHECK: ldxdw r4, [r1 + 0]
+; CHECK: jeq r4, r2,
+; CHECK: mov64 r3, r4
+; CHECK: stxdw [r1 + 0], r3
+define dso_local void @test_weak_cas_64(i64* nocapture %p, i64 %old, i64 %new) local_unnamed_addr {
+entry:
+  cmpxchg weak i64* %p, i64 %old, i64 %new seq_cst seq_cst
+  ret void
 }
\ No newline at end of file

From f48fc871298e42b778c6bbbaf34591052a845f85 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.tnagel@gmail.com>
Date: Fri, 9 Aug 2024 12:31:51 -0300
Subject: [PATCH 053/114] [SOL] Register target

---
 llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
index 0edc2cc2ae612..45c2f38e21fd3 100644
--- a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
+++ b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
@@ -17,6 +17,10 @@ Target &llvm::getTheSBFXTarget() {
 }
 
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTargetInfo() {
+  TargetRegistry::RegisterTarget(
+      getTheSBFXTarget(), "sbf", "SBF new (little endian)", "SBF",
+      [](Triple::ArchType Aarch) { return Aarch == Triple::ArchType::sbf; },
+      true);
   RegisterTarget<Triple::sbf, /*HasJIT=*/true> XX(
       getTheSBFXTarget(), "sbf", "SBF new (little endian)", "SBF");
 }

From af520b230dd3c76e435767c89449b8d35949eb47 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Mon, 12 Aug 2024 18:04:02 -0300
Subject: [PATCH 054/114] [SOL] Do not check relocs for SBF

---
 lld/ELF/Driver.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index a1e9ecae08557..ba3fbd2608474 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -1876,7 +1876,8 @@ static void setConfigs(Ctx &ctx, opt::InputArgList &args) {
   // builds and disabled otherwise. This check is enabled when writeAddends is
   // true.
 #ifndef NDEBUG
-  bool checkDynamicRelocsDefault = true;
+  // The SBF and BPF target for Solana do not support checking dynamic relocs.
+  bool checkDynamicRelocsDefault = m != EM_BPF && m != EM_SBF;
 #else
   bool checkDynamicRelocsDefault = false;
 #endif

From 55176e5c9bfb0d6f0e117e14f88175bc8fb04129 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 19 Nov 2024 18:40:34 -0300
Subject: [PATCH 055/114] [SOL] Allow LLD to process bitcode for SBF (#111)

* Allow LLD to process bitcode for SBF

* Enable lld in CI
---
 lld/ELF/InputFiles.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index d43de8ce6dfef..53025e664e7fd 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1681,6 +1681,8 @@ static uint16_t getBitcodeMachineKind(Ctx &ctx, StringRef path,
     return t.isOSIAMCU() ? EM_IAMCU : EM_386;
   case Triple::x86_64:
     return EM_X86_64;
+  case Triple::sbf:
+    return EM_SBF;
   default:
     ErrAlways(ctx) << path
                    << ": could not infer e_machine from bitcode target triple "

From b70641bb9885c40dc50f483c38355af892d2e836 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:04:05 -0300
Subject: [PATCH 056/114] [SOL] Allow instruction combine (#112)

---
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp      | 42 ----------
 llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll | 95 -----------------------
 2 files changed, 137 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll

diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
index b7e77c3397045..d86fcbb93053f 100644
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
@@ -27,11 +27,6 @@
 using namespace llvm;
 using namespace llvm::PatternMatch;
 
-static cl::opt<bool>
-    DisableSBFserializeICMP("sbf-disable-serialize-icmp", cl::Hidden,
-                            cl::desc("SBF: Disable Serializing ICMP insns."),
-                            cl::init(false));
-
 static cl::opt<bool> DisableSBFavoidSpeculation(
     "sbf-disable-avoid-speculation", cl::Hidden,
     cl::desc("SBF: Disable Avoiding Speculative Code Motion."),
@@ -58,7 +53,6 @@ class SBFAdjustOptImpl {
   SmallVector<PassThroughInfo, 16> PassThroughs;
 
   void adjustInst(Instruction &I);
-  bool serializeICMPInBB(Instruction &I);
   bool avoidSpeculation(Instruction &I);
   bool insertPassThrough();
 };
@@ -84,40 +78,6 @@ bool SBFAdjustOptImpl::insertPassThrough() {
   return !PassThroughs.empty();
 }
 
-// To avoid combining conditionals in the same basic block by
-// instrcombine optimization.
-bool SBFAdjustOptImpl::serializeICMPInBB(Instruction &I) {
-  // For:
-  //   comp1 = icmp <opcode> ...;
-  //   comp2 = icmp <opcode> ...;
-  //   ... or comp1 comp2 ...
-  // changed to:
-  //   comp1 = icmp <opcode> ...;
-  //   comp2 = icmp <opcode> ...;
-  //   new_comp1 = __builtin_bpf_passthrough(seq_num, comp1)
-  //   ... or new_comp1 comp2 ...
-  Value *Op0, *Op1;
-  // Use LogicalOr (accept `or i1` as well as `select i1 Op0, true, Op1`)
-  if (!match(&I, m_LogicalOr(m_Value(Op0), m_Value(Op1))))
-    return false;
-  auto *Icmp1 = dyn_cast<ICmpInst>(Op0);
-  if (!Icmp1)
-    return false;
-  auto *Icmp2 = dyn_cast<ICmpInst>(Op1);
-  if (!Icmp2)
-    return false;
-
-  Value *Icmp1Op0 = Icmp1->getOperand(0);
-  Value *Icmp2Op0 = Icmp2->getOperand(0);
-  if (Icmp1Op0 != Icmp2Op0)
-    return false;
-
-  // Now we got two icmp instructions which feed into
-  // an "or" instruction.
-  PassThroughInfo Info(Icmp1, &I, 0);
-  PassThroughs.push_back(Info);
-  return true;
-}
 
 // To avoid speculative hoisting certain computations out of
 // a basic block.
@@ -215,8 +175,6 @@ bool SBFAdjustOptImpl::avoidSpeculation(Instruction &I) {
 }
 
 void SBFAdjustOptImpl::adjustInst(Instruction &I) {
-  if (!DisableSBFserializeICMP && serializeICMPInBB(I))
-    return;
   if (!DisableSBFavoidSpeculation && avoidSpeculation(I))
     return;
 }
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll b/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
deleted file mode 100644
index c71172f5872e6..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-icmp1.ll
+++ /dev/null
@@ -1,95 +0,0 @@
-; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK %s
-; RUN: opt -passes='default<O2>' -mtriple=sbf %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK %s
-; RUN: opt -O2 -mtriple=sbf -sbf-disable-serialize-icmp %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-DISABLE %s
-; RUN: opt -passes='default<O2>' -mtriple=sbf -sbf-disable-serialize-icmp %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-DISABLE %s
-;
-; Source:
-;   int foo();
-;   int bar(int);
-;   int test() {
-;     int ret = foo();
-;     if (ret <= 0 || ret > 7)
-;       return 0;
-;     return bar(ret);
-;   }
-; Compilation flag:
-;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i32 @test() #0 {
-entry:
-  %retval = alloca i32, align 4
-  %ret = alloca i32, align 4
-  %cleanup.dest.slot = alloca i32, align 4
-  %0 = bitcast i32* %ret to i8*
-  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #3
-  %call = call i32 bitcast (i32 (...)* @foo to i32 ()*)()
-  store i32 %call, i32* %ret, align 4, !tbaa !2
-  %1 = load i32, i32* %ret, align 4, !tbaa !2
-  %cmp = icmp sle i32 %1, 0
-  br i1 %cmp, label %if.then, label %lor.lhs.false
-
-; CHECK:         lsh64 [[REG1:r[0-9]+]], 32
-; CHECK:         arsh64 [[REG1]], 32
-; CHECK:         mov64 [[REG2:r[0-9]+]], 1
-; CHECK:         jsgt [[REG2]], [[REG1]],
-; CHECK:         jsgt [[REG1]], 7,
-
-; CHECK-DISABLE: add64 [[REG1:r[0-9]+]], -8
-; CHECK-DISABLE: lsh64 [[REG1]], 32
-; CHECK-DISABLE: rsh64 [[REG1]], 32
-; CHECK-DISABLE: lddw [[REG2:r[0-9]+]], 4294967289
-; CHECK-DISABLE: jgt [[REG2]], [[REG1]],
-
-lor.lhs.false:                                    ; preds = %entry
-  %2 = load i32, i32* %ret, align 4, !tbaa !2
-  %cmp1 = icmp sgt i32 %2, 7
-  br i1 %cmp1, label %if.then, label %if.end
-
-if.then:                                          ; preds = %lor.lhs.false, %entry
-  store i32 0, i32* %retval, align 4
-  store i32 1, i32* %cleanup.dest.slot, align 4
-  br label %cleanup
-
-if.end:                                           ; preds = %lor.lhs.false
-  %3 = load i32, i32* %ret, align 4, !tbaa !2
-  %call2 = call i32 @bar(i32 %3)
-  store i32 %call2, i32* %retval, align 4
-  store i32 1, i32* %cleanup.dest.slot, align 4
-  br label %cleanup
-
-cleanup:                                          ; preds = %if.end, %if.then
-  %4 = bitcast i32* %ret to i8*
-  call void @llvm.lifetime.end.p0i8(i64 4, i8* %4) #3
-  %5 = load i32, i32* %retval, align 4
-  ret i32 %5
-}
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
-
-declare dso_local i32 @foo(...) #2
-
-declare dso_local i32 @bar(i32) #2
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
-
-attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind willreturn }
-attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nounwind }
-
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
-!2 = !{!3, !3, i64 0}
-!3 = !{!"int", !4, i64 0}
-!4 = !{!"omnipotent char", !5, i64 0}
-!5 = !{!"Simple C/C++ TBAA"}

From a07ea09b6b6865d4abbc468f22d029c414224895 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:55:10 -0300
Subject: [PATCH 057/114] [SOL] Remove isSolana flag (#113)

---
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |   5 +-
 .../SBF/MCTargetDesc/SBFELFObjectWriter.cpp   |  17 +-
 .../Target/SBF/MCTargetDesc/SBFMCTargetDesc.h |   2 +-
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |  17 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 154 +++++-------------
 llvm/lib/Target/SBF/SBFInstrInfo.td           |   3 +-
 llvm/lib/Target/SBF/SBFPreserveDIType.cpp     |   2 +-
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp       |  33 ++--
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp   |   2 +
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.h     |  11 +-
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |   3 -
 llvm/lib/Target/SBF/SBFSubtarget.h            |   7 -
 llvm/lib/Target/SBF/SBFTargetFeatures.td      |   8 +-
 13 files changed, 68 insertions(+), 196 deletions(-)

diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 62aa7f700d414..2090878d20c1b 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -27,8 +27,6 @@ class SBFAsmBackend : public MCAsmBackend {
   SBFAsmBackend(endianness Endian, const MCSubtargetInfo &STI)
       : MCAsmBackend(Endian),
         isSBFv2(STI.getCPU() == "sbfv2"),
-        isSolana(STI.hasFeature(SBF::FeatureSolana) ||
-                 STI.getTargetTriple().getArch() == Triple::sbf),
         relocAbs64(STI.hasFeature(SBF::FeatureRelocAbs64)) {}
   ~SBFAsmBackend() override = default;
 
@@ -53,7 +51,6 @@ class SBFAsmBackend : public MCAsmBackend {
                     const MCSubtargetInfo *STI) const override;
 private:
   bool isSBFv2;
-  bool isSolana;
   bool relocAbs64;
 };
 
@@ -110,7 +107,7 @@ void SBFAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
 
 std::unique_ptr<MCObjectTargetWriter>
 SBFAsmBackend::createObjectTargetWriter() const {
-  return createSBFELFObjectWriter(0, isSolana, relocAbs64, isSBFv2);
+  return createSBFELFObjectWriter(0, relocAbs64, isSBFv2);
 }
 
 MCAsmBackend *llvm::createSBFAsmBackend(const Target &T,
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
index 8e5b7353119b2..ea5307ed13767 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
@@ -22,7 +22,7 @@ namespace {
 
 class SBFELFObjectWriter : public MCELFObjectTargetWriter {
 public:
-  SBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool relocAbs64, bool isSBFv2);
+  SBFELFObjectWriter(uint8_t OSABI, bool relocAbs64, bool isSBFv2);
   ~SBFELFObjectWriter() override = default;
 
 protected:
@@ -32,7 +32,6 @@ class SBFELFObjectWriter : public MCELFObjectTargetWriter {
   bool needsRelocateWithSymbol(const MCValue &Val, const MCSymbol &Sym,
                                unsigned Type) const override;
 private:
-  bool isSolana;
   bool relocAbs64;
 };
 
@@ -45,15 +44,15 @@ class SBFELFObjectWriter : public MCELFObjectTargetWriter {
 bool SBFELFObjectWriter::needsRelocateWithSymbol(const MCValue &Val,
                                                  const MCSymbol &Sym,
                                                  unsigned Type) const {
-  return isSolana;
+  return true;
 }
 
-SBFELFObjectWriter::SBFELFObjectWriter(uint8_t OSABI, bool isSolana,
+SBFELFObjectWriter::SBFELFObjectWriter(uint8_t OSABI,
                                        bool relocAbs64, bool isSBFv2)
   : MCELFObjectTargetWriter(/*Is64Bit*/ true, OSABI,
                             isSBFv2 ? ELF::EM_SBF : ELF::EM_BPF,
                             /*HasRelocationAddend*/ false),
-      isSolana(isSolana), relocAbs64(relocAbs64) {}
+      relocAbs64(relocAbs64) {}
 
 unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
                                           const MCFixup &Fixup,
@@ -73,7 +72,7 @@ unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
     Ctx.reportError(Fixup.getLoc(), "2-byte relocations not supported");
     return ELF::R_SBF_NONE;
   case FK_Data_8:
-    return (isSolana && !relocAbs64) ? ELF::R_SBF_64_64 : ELF::R_SBF_64_ABS64;
+    return relocAbs64 ? ELF::R_SBF_64_ABS64 : ELF::R_SBF_64_64;
   case FK_Data_4:
     if (const MCSymbolRefExpr *A = Target.getSymA()) {
       const MCSymbol &Sym = A->getSymbol();
@@ -106,11 +105,11 @@ unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
             return ELF::R_SBF_64_ABS32;
       }
     }
-    return isSolana ? ELF::R_SBF_64_32 : ELF::R_SBF_64_ABS32;
+    return ELF::R_SBF_64_32;
   }
 }
 
 std::unique_ptr<MCObjectTargetWriter>
-llvm::createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64, bool isSBFv2) {
-  return std::make_unique<SBFELFObjectWriter>(OSABI, isSolana, useRelocAbs64, isSBFv2);
+llvm::createSBFELFObjectWriter(uint8_t OSABI, bool useRelocAbs64, bool isSBFv2) {
+  return std::make_unique<SBFELFObjectWriter>(OSABI, useRelocAbs64, isSBFv2);
 }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
index 81b11b57b3a5a..f6cc55b67d247 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
@@ -43,7 +43,7 @@ MCAsmBackend *createSBFbeAsmBackend(const Target &T, const MCSubtargetInfo &STI,
                                     const MCTargetOptions &Options);
 
 std::unique_ptr<MCObjectTargetWriter>
-createSBFELFObjectWriter(uint8_t OSABI, bool isSolana, bool useRelocAbs64, bool isSBFv2);
+createSBFELFObjectWriter(uint8_t OSABI, bool useRelocAbs64, bool isSBFv2);
 } // namespace llvm
 
 // Defines symbolic names for SBF registers.  This defines a mapping from
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index 6363d8d4ec0d4..5375e317b174d 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -191,22 +191,7 @@ void SBFDAGToDAGISel::Select(SDNode *Node) {
   switch (Opcode) {
   default:
     break;
-
-  case ISD::SDIV: {
-    if (!Subtarget->isSolana()) {
-      DebugLoc Empty;
-      const DebugLoc &DL = Node->getDebugLoc();
-      if (DL != Empty)
-        errs() << "Error at line " << DL.getLine() << ": ";
-      else
-        errs() << "Error: ";
-      errs() << "Unsupport signed division for DAG: ";
-      Node->print(errs(), CurDAG);
-      errs() << "\nPlease convert to unsigned div/mod.\n";
-    }
-    break;
-  }
-
+    
   case ISD::FrameIndex: {
     int FI = cast<FrameIndexSDNode>(Node)->getIndex();
     EVT VT = Node->getValueType(0);
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 7c2a2b75f59b9..ab6837fb72167 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -79,51 +79,29 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::INTRINSIC_W_CHAIN, MVT::Other, Custom);
 
   for (auto VT : {MVT::i8, MVT::i16, MVT::i32, MVT::i64}) {
-    if (Subtarget->isSolana()) {
-      // Implement custom lowering for all atomic operations
-      setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
-      setOperationAction(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS, VT, Custom);
-      setOperationAction(ISD::ATOMIC_CMP_SWAP, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_ADD, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_AND, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_MAX, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_MIN, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_NAND, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_OR, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_SUB, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_UMAX, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_UMIN, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD_XOR, VT, Custom);
-      setOperationAction(ISD::ATOMIC_LOAD, VT, Expand);
-      setOperationAction(ISD::ATOMIC_STORE, VT, Expand);
-      continue;
-    }
-
-    if (VT == MVT::i64) {
-      continue;
-    }
-
-    // Set unsupported atomic operations as Custom so we can emit better error
-    // messages than fatal error from selectiondag.
-    if (VT == MVT::i32) {
-      if (STI.getHasAlu32())
-        continue;
-    } else {
-      setOperationAction(ISD::ATOMIC_LOAD_ADD, VT, Custom);
-    }
-
+    // Implement custom lowering for all atomic operations
+    setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
+    setOperationAction(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS, VT, Custom);
+    setOperationAction(ISD::ATOMIC_CMP_SWAP, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_ADD, VT, Custom);
     setOperationAction(ISD::ATOMIC_LOAD_AND, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_MAX, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_MIN, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_NAND, VT, Custom);
     setOperationAction(ISD::ATOMIC_LOAD_OR, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_SUB, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_UMAX, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD_UMIN, VT, Custom);
     setOperationAction(ISD::ATOMIC_LOAD_XOR, VT, Custom);
-    setOperationAction(ISD::ATOMIC_SWAP, VT, Custom);
-    setOperationAction(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS, VT, Custom);
+    setOperationAction(ISD::ATOMIC_LOAD, VT, Expand);
+    setOperationAction(ISD::ATOMIC_STORE, VT, Expand);
   }
 
   for (auto VT : { MVT::i32, MVT::i64 }) {
     if (VT == MVT::i32 && !STI.getHasAlu32())
       continue;
 
-    if (Subtarget->isSolana() && !STI.getHasPqrClass()) {
+    if (!STI.getHasPqrClass()) {
       setOperationAction(ISD::SDIV, VT, Expand);
       setOperationAction(ISD::SREM, VT, Expand);
       setOperationAction(ISD::MULHU, VT, Expand);
@@ -151,17 +129,10 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     setOperationAction(ISD::BR_CC, MVT::i32, Promote);
   }
 
-  if (Subtarget->isSolana()) {
-    setOperationAction(ISD::CTTZ, MVT::i64, Expand);
-    setOperationAction(ISD::CTLZ, MVT::i64, Expand);
-    setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i64, Expand);
-    setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i64, Expand);
-  } else {
-    setOperationAction(ISD::CTTZ, MVT::i64, Custom);
-    setOperationAction(ISD::CTLZ, MVT::i64, Custom);
-    setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i64, Custom);
-    setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i64, Custom);
-  }
+  setOperationAction(ISD::CTTZ, MVT::i64, Expand);
+  setOperationAction(ISD::CTLZ, MVT::i64, Expand);
+  setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i64, Expand);
+  setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i64, Expand);
 
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1, Expand);
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i8, Expand);
@@ -203,7 +174,6 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     MaxLoadsPerMemcmp = 0;
   } else {
     auto SelectionDAGInfo = STI.getSelectionDAGInfo();
-    SelectionDAGInfo->setSolanaFlag(STI.isSolana());
     // inline memcpy() for kernel to see explicit copy
     unsigned CommonMaxStores =
       SelectionDAGInfo->getCommonMaxStoresPerMemFunc();
@@ -217,7 +187,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
   // CPU/Feature control
   HasAlu32 = STI.getHasAlu32();
   HasJmpExt = STI.getHasJmpExt();
-  SBFRegisterInfo::FrameLength = STI.isSolana() ? 4096 : 512;
+  SBFRegisterInfo::FrameLength = 4096;
 }
 
 bool SBFTargetLowering::allowsMisalignedMemoryAccesses(
@@ -225,11 +195,11 @@ bool SBFTargetLowering::allowsMisalignedMemoryAccesses(
   if (!VT.isSimple()) {
     return false;
   }
-  bool isSolana = Subtarget->isSolana();
-  if (isSolana && Fast) {
+
+  if (Fast) {
     *Fast = 1;
   }
-  return isSolana;
+  return true;
 }
 
 bool SBFTargetLowering::isOffsetFoldingLegal(
@@ -324,16 +294,8 @@ void SBFTargetLowering::ReplaceNodeResults(SDNode *N,
   case ISD::ATOMIC_LOAD_UMAX:
   case ISD::ATOMIC_LOAD_UMIN:
   case ISD::ATOMIC_LOAD_XOR:
-    if (Subtarget->isSolana()) {
-      // We do lowering during legalization, see LowerOperation()
-      return;
-    }
-
-    if (HasAlu32 || Opcode == ISD::ATOMIC_LOAD_ADD)
-      err_msg = "Unsupported atomic operations, please use 32/64 bit version";
-    else
-      err_msg = "Unsupported atomic operations, please use 64 bit version";
-    break;
+    // We do lowering during legalization, see LowerOperation()
+    return;
   }
 
   SDLoc DL(N);
@@ -393,7 +355,7 @@ SDValue SBFTargetLowering::LowerFormalArguments(
   // Assign locations to all of the incoming arguments.
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
-  if (Subtarget->isSolana() && Ins.size() > MaxArgs) {
+  if (Ins.size() > MaxArgs) {
     if (Subtarget->getEnableNewCallConvention()) {
       // Pass args 1-5 via registers, remaining args via stack.
       CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32 : CC_SBF64);
@@ -442,7 +404,7 @@ SDValue SBFTargetLowering::LowerFormalArguments(
 
         break;
       }
-    } else if (Subtarget->isSolana()) {
+    } else {
       // Argument passed via stack
       assert(VA.isMemLoc() && "Should be isMemLoc");
 
@@ -481,18 +443,11 @@ SDValue SBFTargetLowering::LowerFormalArguments(
       }
 
       InVals.push_back(SDV);
-    } else {
-      fail(DL, DAG, "defined with too many args");
-      InVals.push_back(DAG.getConstant(0, DL, VA.getLocVT()));
     }
   }
 
-  if (Subtarget->isSolana()) {
-    if (IsVarArg) {
-      fail(DL, DAG, "Functions with VarArgs are not supported");
-    }
-  } else if (IsVarArg || MF.getFunction().hasStructRetAttr()) {
-    fail(DL, DAG, "functions with VarArgs or StructRet are not supported");
+  if (IsVarArg) {
+    fail(DL, DAG, "Functions with VarArgs are not supported");
   }
 
   return Chain;
@@ -527,7 +482,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // Analyze operands of the call, assigning locations to each operand.
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
-  if (Subtarget->isSolana() && Outs.size() > MaxArgs) {
+  if (Outs.size() > MaxArgs) {
     if (Subtarget->getEnableNewCallConvention()) {
       // Pass args 1-5 via registers, remaining args via stack
       CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32 : CC_SBF64);
@@ -543,18 +498,6 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
 
   unsigned NumBytes = CCInfo.getStackSize();
 
-  if (!Subtarget->isSolana()) {
-    if (Outs.size() > MaxArgs)
-      fail(CLI.DL, DAG, "too many args to ", Callee);
-
-    for (auto &Arg : Outs) {
-      ISD::ArgFlagsTy Flags = Arg.Flags;
-      if (!Flags.isByVal())
-        continue;
-
-      fail(CLI.DL, DAG, "pass by value not supported ", Callee);
-    }
-  }
 
   auto PtrVT = getPointerTy(MF.getDataLayout());
   Chain = DAG.getCALLSEQ_START(Chain, NumBytes, 0, CLI.DL);
@@ -564,7 +507,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // Walk arg assignments
   bool HasStackArgs = false;
   unsigned e, i, ae = ArgLocs.size();
-  for (i = 0, e = (Subtarget->isSolana()) ? ae : std::min(ae, MaxArgs); i != e; ++i) {
+  for (i = 0, e = ae; i != e; ++i) {
     CCValAssign &VA = ArgLocs[i];
     SDValue Arg = OutVals[i];
 
@@ -585,7 +528,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       break;
     }
 
-    if (Subtarget->isSolana() && VA.isMemLoc()) {
+    if (VA.isMemLoc()) {
       HasStackArgs = true;
       break;
     }
@@ -671,12 +614,6 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
                                         G->getOffset(), 0);
   } else if (ExternalSymbolSDNode *E = dyn_cast<ExternalSymbolSDNode>(Callee)) {
     Callee = DAG.getTargetExternalSymbol(E->getSymbol(), PtrVT, 0);
-    // This is not a warning but info, will be resolved on load
-    if (!Subtarget->isSolana()) {
-      fail(CLI.DL, DAG, Twine("A call to built-in function '"
-                              + StringRef(E->getSymbol())
-                              + "' remains unresolved"));
-    }
   }
 
   // Returns a chain & a flag for retval copy to use.
@@ -713,15 +650,12 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
 }
 
 bool SBFTargetLowering::shouldSignExtendTypeInLibCall(EVT Type, bool IsSigned) const {
-  return Subtarget->isSolana() && (IsSigned || Type == MVT::i32);
+  return IsSigned || Type == MVT::i32;
 }
 
 bool SBFTargetLowering::CanLowerReturn(
     CallingConv::ID CallConv, MachineFunction &MF, bool IsVarArg,
     const SmallVectorImpl<ISD::OutputArg> &Outs, LLVMContext &Context) const {
-  if (!Subtarget->isSolana()) {
-    return true;
-  }
   // At minimal return Outs.size() <= 1, or check valid types in CC.
   SmallVector<CCValAssign, 16> RVLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, Context);
@@ -743,14 +677,9 @@ SBFTargetLowering::LowerReturn(SDValue Chain, CallingConv::ID CallConv,
   // CCState - Info about the registers and stack slot.
   CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, *DAG.getContext());
 
-  if (Subtarget->isSolana()) {
-    if (Outs.size() > 1) {
-      fail(DL, DAG, "Only a single return supported");
-      assert(false);
-    }
-  } else if (MF.getFunction().getReturnType()->isAggregateType()) {
-    fail(DL, DAG, "only integer returns supported");
-    return DAG.getNode(Opc, DL, MVT::Other, Chain);
+  if (Outs.size() > 1) {
+    fail(DL, DAG, "Only a single return supported");
+    assert(false);
   }
 
   // Analize return values.
@@ -791,16 +720,9 @@ SDValue SBFTargetLowering::LowerCallResult(
   SmallVector<CCValAssign, 16> RVLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, *DAG.getContext());
 
-  if (Subtarget->isSolana()) {
-    if (Ins.size() > 1) {
-      fail(DL, DAG, "Only a single return supported");
-      assert(false);
-    }
-  } else if (Ins.size() >= 2) {
-    fail(DL, DAG, "only small returns supported");
-    for (unsigned i = 0, e = Ins.size(); i != e; ++i)
-      InVals.push_back(DAG.getConstant(0, DL, Ins[i].VT));
-    return DAG.getCopyFromReg(Chain, DL, 1, Ins[0].VT, InGlue).getValue(1);
+  if (Ins.size() > 1) {
+    fail(DL, DAG, "Only a single return supported");
+    assert(false);
   }
 
   CCInfo.AnalyzeCallResult(Ins, getHasAlu32() ? RetCC_SBF32 : RetCC_SBF64);
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 4bc620a97e81b..e61f7ff70515f 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -54,7 +54,6 @@ def SBFIsLittleEndian : Predicate<"CurDAG->getDataLayout().isLittleEndian()">;
 def SBFIsBigEndian    : Predicate<"!CurDAG->getDataLayout().isLittleEndian()">;
 def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
 def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
-def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
 def SBFHasLddw : Predicate<"!Subtarget->getNoLddw()">;
 def SBFNoLddw : Predicate<"Subtarget->getNoLddw()">;
 def SBFHasNeg : Predicate<"!Subtarget->getDisableNeg()">;
@@ -819,7 +818,7 @@ def : Pat<(atomic_load_sub_32 ADDRri:$addr, GPR32:$val),
 def : Pat<(atomic_load_sub_64 ADDRri:$addr, GPR:$val),
           (XFADDD ADDRri:$addr, (NEG_64 GPR:$val))>;
 
-let Predicates = [SBFSubtargetSolana], usesCustomInserter = 1, isCodeGenOnly = 1 in {
+let usesCustomInserter = 1, isCodeGenOnly = 1 in {
   def ATOMIC_FENCE : Pseudo<
     (outs),
     (ins),
diff --git a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
index ac21f37d109dd..de5b217fe549d 100644
--- a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
+++ b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
@@ -55,7 +55,7 @@ static bool SBFPreserveDITypeImpl(Function &F) {
       if (!GV)
         continue;
 
-      if (GV->getName().startswith("llvm.bpf.btf.type.id")) {
+      if (GV->getName().starts_with("llvm.bpf.btf.type.id")) {
         if (!Call->getMetadata(LLVMContext::MD_preserve_access_index))
           report_fatal_error(
               "Missing metadata for llvm.bpf.btf.type.id intrinsic");
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 699d2d0f98f07..de9659bf66f92 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -54,28 +54,19 @@ static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
     }
     OldMF = &(MF.getFunction());
 
-    if (MF.getSubtarget<SBFSubtarget>().isSolana()) {
-      dbgs() << "Error:";
-      if (DL) {
-        dbgs() << " ";
-        DL.print(dbgs());
-      }
-      uint64_t StackSize = MF.getFrameInfo().getStackSize();
-      dbgs() << " Function " << MF.getFunction().getName()
-             << " Stack offset of " << -Offset << " exceeded max offset of "
-             << -MaxOffset << " by " << MaxOffset - Offset
-             << " bytes, please minimize large stack variables. "
-             << "Estimated function frame size: " << StackSize << " bytes."
-             << " Exceeding the maximum stack offset may cause "
-                "undefined behavior during execution.\n\n";
-    } else {
-      DiagnosticInfoUnsupported DiagStackSize(
-          MF.getFunction(),
-          "SBF stack limit of 512 bytes is exceeded. "
-          "Please move large on stack variables into SBF per-cpu array map.\n",
-          DL, DiagnosticSeverity::DS_Error);
-      MF.getFunction().getContext().diagnose(DiagStackSize);
+    dbgs() << "Error:";
+    if (DL) {
+      dbgs() << " ";
+      DL.print(dbgs());
     }
+    uint64_t StackSize = MF.getFrameInfo().getStackSize();
+    dbgs() << " Function " << MF.getFunction().getName()
+           << " Stack offset of " << -Offset << " exceeded max offset of "
+           << -MaxOffset << " by " << MaxOffset - Offset
+           << " bytes, please minimize large stack variables. "
+           << "Estimated function frame size: " << StackSize << " bytes."
+           << " Exceeding the maximum stack offset may cause "
+              "undefined behavior during execution.\n\n";
   }
 }
 
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
index 53f4e42b25e12..5e2b14507baed 100644
--- a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
@@ -13,6 +13,8 @@
 #include "SBFTargetMachine.h"
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/IR/DerivedTypes.h"
+#include "SBFSelectionDAGInfo.h"
+
 using namespace llvm;
 
 #define DEBUG_TYPE "sbf-selectiondag-info"
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
index 104246c6718b8..8fc1638d49bb0 100644
--- a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
+++ b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
@@ -19,7 +19,7 @@ namespace llvm {
 
 class SBFSelectionDAGInfo : public SelectionDAGTargetInfo {
 public:
-  SBFSelectionDAGInfo() : isSolana(false) {}
+  SBFSelectionDAGInfo() {}
   SDValue EmitTargetCodeForMemcpy(SelectionDAG &DAG, const SDLoc &dl,
                                   SDValue Chain, SDValue Dst, SDValue Src,
                                   SDValue Size, Align Alignment,
@@ -28,15 +28,8 @@ class SBFSelectionDAGInfo : public SelectionDAGTargetInfo {
                                   MachinePointerInfo SrcPtrInfo) const override;
 
   unsigned getCommonMaxStoresPerMemFunc() const {
-    return isSolana ? 4 : 128;
+    return 4;
   }
-  void setSolanaFlag(bool value) const {
-    isSolana = value;
-  }
-
-private:
-  mutable bool isSolana;
-
 };
 
 }
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index e3474791ddc32..5b915a382e2bd 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -35,7 +35,6 @@ SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT,
 
 void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
-  IsSolana = true;
   HasJmpExt = false;
   HasAlu32 = false;
   UseDwarfRIS = false;
@@ -74,6 +73,4 @@ SBFSubtarget::SBFSubtarget(const Triple &TT, const std::string &CPU,
       FrameLowering(initializeSubtargetDependencies(TT, CPU, FS)),
       TLInfo(TM, *this) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
-  IsSolana = true;
-  TSInfo.setSolanaFlag(IsSolana);
 }
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index a21eca0f82da5..2421403962700 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -40,12 +40,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   void initSubtargetFeatures(StringRef CPU, StringRef FS);
 
 protected:
-  // unused
-  bool isDummyMode;
-
-  // whether to enable Solana extensions.
-  bool IsSolana;
-
   // whether the cpu supports jmp ext
   bool HasJmpExt;
 
@@ -95,7 +89,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // ParseSubtargetFeatures - Parses features string setting specified
   // subtarget options.  Definition of function is auto generated by tblgen.
   void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);
-  bool isSolana() const { return IsSolana; }
   bool getHasJmpExt() const { return HasJmpExt; }
   bool getHasAlu32() const { return HasAlu32; }
   bool getHasDynamicFrames() const { return HasDynamicFrames; }
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 3644dbfdd0a1f..91c8d2eb616c4 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -10,18 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-def DummyFeature : SubtargetFeature<"dummy", "isDummyMode",
-                                    "true", "unused feature">;
-
 def ALU32 : SubtargetFeature<"alu32", "HasAlu32", "true",
                              "Enable ALU32 instructions">;
 
 def DwarfRIS: SubtargetFeature<"dwarfris", "UseDwarfRIS", "true",
                                "Disable MCAsmInfo DwarfUsesRelocationsAcrossSections">;
 
-def FeatureSolana : SubtargetFeature<"solana", "IsSolana", "true",
-                                     "Enable Solana extensions">;
-
 def FeatureDynamicFrames : SubtargetFeature<"dynamic-frames", "HasDynamicFrames", "true",
                                             "Enable dynamic frames">;
 
@@ -56,6 +50,6 @@ def : Proc<"generic", []>;
 def : Proc<"v1", []>;
 def : Proc<"v2", []>;
 def : Proc<"v3", [ALU32]>;
-def : Proc<"sbfv2", [FeatureSolana, FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
+def : Proc<"sbfv2", [FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
                         FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
                           FeaturePqrInstr, FeatureCallConv]>;
\ No newline at end of file

From d09c2f0cd76d93136f51c8210d7bd03055b72de6 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 2 Dec 2024 17:46:02 -0300
Subject: [PATCH 058/114] [SOL] Implement store imm instructions (#115)

---
 llvm/lib/Target/SBF/BTFDebug.cpp              |  10 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td           |  77 +++++++--
 .../lib/Target/SBF/SBFMISimplifyPatchable.cpp |  45 +++--
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |   1 +
 llvm/lib/Target/SBF/SBFSubtarget.h            |   4 +
 llvm/lib/Target/SBF/SBFTargetFeatures.td      |   3 +
 .../CodeGen/SBF/CORE/field-reloc-st-imm.ll    | 154 ++++++++++++++++++
 llvm/test/CodeGen/SBF/store-imm.ll            |  75 +++++++++
 llvm/test/MC/Disassembler/SBF/sbf-ldst.txt    |   9 +
 llvm/test/MC/SBF/sbf-ldst.s                   |  14 ++
 10 files changed, 364 insertions(+), 28 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll
 create mode 100644 llvm/test/CodeGen/SBF/store-imm.ll

diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index c6726d2f8a030..474307284de66 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -1345,8 +1345,9 @@ void BTFDebug::beginInstruction(const MachineInstr *MI) {
     // If the insn is "r2 = LD_imm64 @<an TypeIdAttr global>",
     // The LD_imm64 result will be replaced with a btf type id.
     processGlobalValue(MI->getOperand(1));
-  } else if (MI->getOpcode() == SBF::CORE_MEM ||
-             MI->getOpcode() == SBF::CORE_ALU32_MEM ||
+  } else if (MI->getOpcode() == SBF::CORE_LD64 ||
+             MI->getOpcode() == SBF::CORE_LD32 ||
+             MI->getOpcode() == SBF::CORE_ST ||
              MI->getOpcode() == SBF::CORE_SHIFT) {
     // relocation insn is a load, store or shift insn.
     processGlobalValue(MI->getOperand(3));
@@ -1524,8 +1525,9 @@ bool BTFDebug::InstLower(const MachineInstr *MI, MCInst &OutMI) {
         return true;
       }
     }
-  } else if (MI->getOpcode() == SBF::CORE_MEM ||
-             MI->getOpcode() == SBF::CORE_ALU32_MEM ||
+  } else if (MI->getOpcode() == SBF::CORE_LD64 ||
+             MI->getOpcode() == SBF::CORE_LD32 ||
+             MI->getOpcode() == SBF::CORE_ST ||
              MI->getOpcode() == SBF::CORE_SHIFT) {
     const MachineOperand &MO = MI->getOperand(3);
     if (MO.isGlobal()) {
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index e61f7ff70515f..bfce5db319742 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -64,6 +64,7 @@ def SBFCallxSrc : Predicate<"Subtarget->getCallXRegSrc()">, AssemblerPredicate<(
 def SBFNoCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">;
 def SBFPqrInstr : Predicate<"Subtarget->getHasPqrClass()">;
 def SBFNoPqrInstr : Predicate<"!Subtarget->getHasPqrClass()">;
+def SBFHasStoreImm : Predicate<"Subtarget->getHasStoreImm()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -74,10 +75,18 @@ def u64imm   : Operand<i64> {
   let PrintMethod = "printImm64Operand";
 }
 
+def gpr_or_imm : Operand<i64>;
+
 def i64immSExt32 : PatLeaf<(i64 imm),
                 [{return isInt<32>(N->getSExtValue()); }]>;
 def i32immSExt32 : PatLeaf<(i32 imm),
                 [{return isInt<32>(N->getSExtValue()); }]>;
+def i64immZExt32 : PatLeaf<(i64 imm),
+                [{return isUInt<32>(N->getZExtValue()); }]>;
+
+def imm_to_i64 : SDNodeXForm<timm, [{
+  return CurDAG->getTargetConstant(N->getZExtValue(), SDLoc(N), MVT::i64);
+}]>;
 
 // Fetch the upper 32-bits of a 64-bit integer.
 def Upper32 : SDNodeXForm<imm, [{
@@ -469,7 +478,7 @@ class STORE<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
 }
 
 class STOREi64<SBFWidthModifer Opc, string Mnemonic, PatFrag OpNode>
-    : STORE<Opc, Mnemonic, [(OpNode i64:$src, ADDRri:$addr)]>;
+    : STORE<Opc, Mnemonic, [(OpNode GPR:$src, ADDRri:$addr)]>;
 
 let Predicates = [SBFNoALU32] in {
   def STW : STOREi64<SBF_W, "stxw", truncstorei32>;
@@ -478,6 +487,49 @@ let Predicates = [SBFNoALU32] in {
 }
 def STD : STOREi64<SBF_DW, "stxdw", store>;
 
+class STORE_imm<SBFWidthModifer SizeOp,
+                string Mnemonic, dag Pattern>
+    : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
+                 (outs),
+                 (ins i64imm:$imm, MEMri:$addr),
+                 Mnemonic # " [$addr], $imm",
+                 [Pattern]> {
+  bits<20> addr;
+  bits<32> imm;
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{47-32} = addr{15-0};  // offset
+  let Inst{31-0} = imm;
+  let SBFClass = SBF_ST;
+}
+
+// Opcode (SBF_ST | SBF_MEM | SBF_DW) implies sign extension for
+// value stored to memory:
+// - it is fine to generate such write when immediate is -1
+// - it is incorrect to generate such write when immediate is
+//   +0xffff_ffff.
+//
+// In the latter case two instructions would be generated instead of
+// one BPF_ST:
+//   lddw rA, 0xffffffff
+//   stx [rb], rA
+//
+// For SBF_{B,H,W} the size of value stored matches size of the immediate.
+let Predicates = [SBFHasStoreImm] in {
+    def STD_imm : STORE_imm<SBF_DW, "stdw", (store         (i64 i64immSExt32:$imm), ADDRri:$addr)>;
+    def STW_imm : STORE_imm<SBF_W,  "stw",  (truncstorei32 (i64 i64immZExt32:$imm), ADDRri:$addr)>;
+    def STH_imm : STORE_imm<SBF_H,  "sth",  (truncstorei16 (i64 i64immZExt32:$imm), ADDRri:$addr)>;
+    def STB_imm : STORE_imm<SBF_B,  "stb",  (truncstorei8  (i64 i64immZExt32:$imm), ADDRri:$addr)>;
+}
+
+let Predicates = [SBFHasALU32, SBFHasStoreImm] in {
+  def : Pat<(store (i32 imm:$src), ADDRri:$dst),
+            (STW_imm (imm_to_i64 $src), ADDRri:$dst)>;
+  def : Pat<(truncstorei16 (i32 imm:$src), ADDRri:$dst),
+            (STH_imm (imm_to_i64 imm:$src), ADDRri:$dst)>;
+  def : Pat<(truncstorei8 (i32 imm:$src), ADDRri:$dst),
+            (STB_imm (imm_to_i64 imm:$src), ADDRri:$dst)>;
+}
+
 // LOAD instructions
 class LOAD<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
@@ -498,16 +550,21 @@ class LOADi64<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
     : LOAD<SizeOp, Mnemonic, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
 
 let isCodeGenOnly = 1 in {
-  def CORE_MEM : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
-                            (outs GPR:$dst),
+  class CORE_LD<RegisterClass RegClass, string Sz>
+                : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
+                            (outs RegClass:$dst),
                             (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
-                            "$dst = core_mem($opcode, $src, $offset)",
+                            "$dst = core_ld"#Sz#"($opcode, $src, $offset)",
                             []>;
-  def CORE_ALU32_MEM : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
-                                  (outs GPR32:$dst),
-                                  (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
-                                  "$dst = core_alu32_mem($opcode, $src, $offset)",
-                                  []>;
+
+  def CORE_LD64 : CORE_LD<GPR, "64">;
+  def CORE_LD32 : CORE_LD<GPR32, "32">;
+
+  def CORE_ST   : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
+                             (outs),
+                             (ins gpr_or_imm:$src, u64imm:$opcode, GPR:$ptr, u64imm:$offset),
+                             "core_st($src, $opcode, $ptr, $offset)",
+                             []>;
   let Constraints = "$dst = $src" in {
     def CORE_SHIFT : MATH_RR<SBF_ALU64, SBF_LSH,
                              (outs GPR:$dst),
@@ -996,7 +1053,7 @@ class STORE32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
 }
 
 class STOREi32<SBFWidthModifer Opc, string Mnemonic, PatFrag OpNode>
-    : STORE32<Opc, Mnemonic, [(OpNode i32:$src, ADDRri:$addr)]>;
+    : STORE32<Opc, Mnemonic, [(OpNode GPR32:$src, ADDRri:$addr)]>;
 
 let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
   def STW32 : STOREi32<SBF_W, "stxw", store>;
diff --git a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
index 1a5bef5e149d6..358b7c2e4e013 100644
--- a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
+++ b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
@@ -92,10 +92,31 @@ void SBFMISimplifyPatchable::initialize(MachineFunction &MFParm) {
   LLVM_DEBUG(dbgs() << "*** SBF simplify patchable insts pass ***\n\n");
 }
 
+static bool isST(unsigned Opcode) {
+  return Opcode == SBF::STB_imm || Opcode == SBF::STH_imm ||
+         Opcode == SBF::STW_imm || Opcode == SBF::STD_imm;
+}
+
+static bool isSTX32(unsigned Opcode) {
+  return Opcode == SBF::STB32 || Opcode == SBF::STH32 || Opcode == SBF::STW32;
+}
+
+static bool isSTX64(unsigned Opcode) {
+  return Opcode == SBF::STB || Opcode == SBF::STH || Opcode == SBF::STW ||
+         Opcode == SBF::STD;
+}
+
+static bool isLDX32(unsigned Opcode) {
+  return Opcode == SBF::LDB32 || Opcode == SBF::LDH32 || Opcode == SBF::LDW32;
+}
+
+static bool isLDX64(unsigned Opcode) {
+  return Opcode == SBF::LDB || Opcode == SBF::LDH || Opcode == SBF::LDW ||
+         Opcode == SBF::LDD;
+}
+
 bool SBFMISimplifyPatchable::isLoadInst(unsigned Opcode) {
-  return Opcode == SBF::LDD || Opcode == SBF::LDW || Opcode == SBF::LDH ||
-         Opcode == SBF::LDB || Opcode == SBF::LDW32 || Opcode == SBF::LDH32 ||
-         Opcode == SBF::LDB32;
+  return isLDX32(Opcode) || isLDX64(Opcode);
 }
 
 void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
@@ -116,14 +137,12 @@ void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
     MachineInstr *DefInst = MO.getParent();
     unsigned Opcode = DefInst->getOpcode();
     unsigned COREOp;
-    if (Opcode == SBF::LDB || Opcode == SBF::LDH || Opcode == SBF::LDW ||
-        Opcode == SBF::LDD || Opcode == SBF::STB || Opcode == SBF::STH ||
-        Opcode == SBF::STW || Opcode == SBF::STD)
-      COREOp = SBF::CORE_MEM;
-    else if (Opcode == SBF::LDB32 || Opcode == SBF::LDH32 ||
-             Opcode == SBF::LDW32 || Opcode == SBF::STB32 ||
-             Opcode == SBF::STH32 || Opcode == SBF::STW32)
-      COREOp = SBF::CORE_ALU32_MEM;
+    if (isLDX64(Opcode))
+      COREOp = SBF::CORE_LD64;
+    else if (isLDX32(Opcode))
+      COREOp = SBF::CORE_LD32;
+    else if (isSTX64(Opcode) || isSTX32(Opcode) || isST(Opcode))
+      COREOp = SBF::CORE_ST;
     else
       continue;
 
@@ -135,9 +154,7 @@ void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
     // Reject the form:
     //   %1 = ADD_rr %2, %3
     //   *(type *)(%2 + 0) = %1
-    if (Opcode == SBF::STB || Opcode == SBF::STH || Opcode == SBF::STW ||
-        Opcode == SBF::STD || Opcode == SBF::STB32 || Opcode == SBF::STH32 ||
-        Opcode == SBF::STW32) {
+    if (isSTX64(Opcode) || isSTX32(Opcode)) {
       const MachineOperand &Opnd = DefInst->getOperand(0);
       if (Opnd.isReg() && Opnd.getReg() == MO.getReg())
         continue;
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 5b915a382e2bd..e3098cae86bf6 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -47,6 +47,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   CallxRegSrc = false;
   HasPqrClass = false;
   NewCallConvention = false;
+  HasStoreImm = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 2421403962700..c32a76d2e4368 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -77,6 +77,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether to use the new call convention in SBFv2
   bool NewCallConvention;
 
+  // Whether we have store imm instructions
+  bool HasStoreImm;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -101,6 +104,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getEnableNewCallConvention() const {
     return HasDynamicFrames && NewCallConvention;
   }
+  bool getHasStoreImm() const { return HasStoreImm; }
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
     return &FrameLowering;
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 91c8d2eb616c4..753c8d04988dc 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -43,6 +43,9 @@ def FeaturePqrInstr : SubtargetFeature<"pqr-instr", "HasPqrClass", "true",
 def FeatureCallConv : SubtargetFeature<"new-call-conv", "NewCallConvention", "true",
                                     "Enable new call convetion for SBFv2">;
 
+def FeatureStoreImm : SubtargetFeature<"store-imm", "HasStoreImm", "true",
+                                           "Enable store imm instructions">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll
new file mode 100644
index 0000000000000..ab5a6a68f2b22
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll
@@ -0,0 +1,154 @@
+; RUN: llc -march=sbf -mattr=+store-imm -sbf-enable-btf-emission < %s | FileCheck %s
+
+; Make sure that CO-RE relocations had been generated correctly for
+; BPF_ST (store immediate) instructions and that
+; BPFMISimplifyPatchable optimizations had been applied.
+;
+; Generated from the following source code:
+;
+;   #define __pai __attribute__((preserve_access_index))
+;
+;   struct foo {
+;     unsigned char  b;
+;     unsigned short h;
+;     unsigned int   w;
+;     unsigned long  d;
+;   } __pai;
+;
+;   void bar(volatile struct foo *p) {
+;     p->b = 1;
+;     p->h = 2;
+;     p->w = 3;
+;     p->d = 4;
+;   }
+;
+; Using the following command:
+;
+;   clang -g -O2 -S -emit-llvm --target=sbf test.c
+
+@"llvm.foo:0:0$0:0" = external global i64, !llvm.preserve.access.index !0 #0
+@"llvm.foo:0:2$0:1" = external global i64, !llvm.preserve.access.index !0 #0
+@"llvm.foo:0:4$0:2" = external global i64, !llvm.preserve.access.index !0 #0
+@"llvm.foo:0:8$0:3" = external global i64, !llvm.preserve.access.index !0 #0
+
+; Function Attrs: nofree nounwind
+define dso_local void @bar(ptr noundef %p) local_unnamed_addr #1 !dbg !18 {
+entry:
+  call void @llvm.dbg.value(metadata ptr %p, metadata !24, metadata !DIExpression()), !dbg !25
+  %0 = load i64, ptr @"llvm.foo:0:0$0:0", align 8
+  %1 = getelementptr i8, ptr %p, i64 %0
+  %2 = tail call ptr @llvm.bpf.passthrough.p0.p0(i32 0, ptr %1)
+  store volatile i8 1, ptr %2, align 8, !dbg !26, !tbaa !27
+  %3 = load i64, ptr @"llvm.foo:0:2$0:1", align 8
+  %4 = getelementptr i8, ptr %p, i64 %3
+  %5 = tail call ptr @llvm.bpf.passthrough.p0.p0(i32 1, ptr %4)
+  store volatile i16 2, ptr %5, align 2, !dbg !34, !tbaa !35
+  %6 = load i64, ptr @"llvm.foo:0:4$0:2", align 8
+  %7 = getelementptr i8, ptr %p, i64 %6
+  %8 = tail call ptr @llvm.bpf.passthrough.p0.p0(i32 2, ptr %7)
+  store volatile i32 3, ptr %8, align 4, !dbg !36, !tbaa !37
+  %9 = load i64, ptr @"llvm.foo:0:8$0:3", align 8
+  %10 = getelementptr i8, ptr %p, i64 %9
+  %11 = tail call ptr @llvm.bpf.passthrough.p0.p0(i32 3, ptr %10)
+  store volatile i64 4, ptr %11, align 8, !dbg !38, !tbaa !39
+  ret void, !dbg !40
+}
+
+; CHECK: [[L0:.Ltmp.*]]:
+; CHECK:       stb [r1 + 0], 1
+; CHECK: [[L2:.Ltmp.*]]:
+; CHECK:       sth [r1 + 2], 2
+; CHECK: [[L4:.Ltmp.*]]:
+; CHECK:       stw [r1 + 4], 3
+; CHECK: [[L6:.Ltmp.*]]:
+; CHECK:       stdw [r1 + 8], 4
+
+; CHECK:       .section        .BTF
+; ...
+; CHECK:       .long   [[FOO:.*]]           # BTF_KIND_STRUCT(id = [[FOO_ID:.*]])
+; ...
+; CHECK:       .ascii  "foo"                # string offset=[[FOO]]
+; CHECK:       .ascii  ".text"              # string offset=[[TEXT:.*]]
+; CHECK:       .ascii  "0:0"                # string offset=[[S1:.*]]
+; CHECK:       .ascii  "0:1"                # string offset=[[S2:.*]]
+; CHECK:       .ascii  "0:2"                # string offset=[[S3:.*]]
+; CHECK:       .ascii  "0:3"                # string offset=[[S4:.*]]
+
+; CHECK:       .section        .BTF.ext
+; ...
+; CHECK:       .long   [[#]]                # FieldReloc
+; CHECK-NEXT:  .long   [[TEXT]]             # Field reloc section string offset=[[TEXT]]
+; CHECK-NEXT:  .long   [[#]]
+; CHECK-NEXT:  .long   [[L0]]
+; CHECK-NEXT:  .long   [[FOO_ID]]
+; CHECK-NEXT:  .long   [[S1]]
+; CHECK-NEXT:  .long   0
+; CHECK-NEXT:  .long   [[L2]]
+; CHECK-NEXT:  .long   [[FOO_ID]]
+; CHECK-NEXT:  .long   [[S2]]
+; CHECK-NEXT:  .long   0
+; CHECK-NEXT:  .long   [[L4]]
+; CHECK-NEXT:  .long   [[FOO_ID]]
+; CHECK-NEXT:  .long   [[S3]]
+; CHECK-NEXT:  .long   0
+; CHECK-NEXT:  .long   [[L6]]
+; CHECK-NEXT:  .long   [[FOO_ID]]
+; CHECK-NEXT:  .long   [[S4]]
+; CHECK-NEXT:  .long   0
+
+; Function Attrs: nofree nosync nounwind memory(none)
+declare ptr @llvm.bpf.passthrough.p0.p0(i32, ptr) #2
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { "btf_ama" }
+attributes #1 = { nofree nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="v4" }
+attributes #2 = { nofree nosync nounwind memory(none) }
+attributes #3 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
+
+!llvm.dbg.cu = !{!11}
+!llvm.module.flags = !{!12, !13, !14, !15, !16}
+!llvm.ident = !{!17}
+
+!0 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "foo", file: !1, line: 3, size: 128, elements: !2)
+!1 = !DIFile(filename: "some-file.c", directory: "/some/dir", checksumkind: CSK_MD5, checksum: "e5d03b4d39dfffadc6c607e956c37996")
+!2 = !{!3, !5, !7, !9}
+!3 = !DIDerivedType(tag: DW_TAG_member, name: "b", scope: !0, file: !1, line: 4, baseType: !4, size: 8)
+!4 = !DIBasicType(name: "unsigned char", size: 8, encoding: DW_ATE_unsigned_char)
+!5 = !DIDerivedType(tag: DW_TAG_member, name: "h", scope: !0, file: !1, line: 5, baseType: !6, size: 16, offset: 16)
+!6 = !DIBasicType(name: "unsigned short", size: 16, encoding: DW_ATE_unsigned)
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "w", scope: !0, file: !1, line: 6, baseType: !8, size: 32, offset: 32)
+!8 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!9 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !0, file: !1, line: 7, baseType: !10, size: 64, offset: 64)
+!10 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!11 = distinct !DICompileUnit(language: DW_LANG_C11, file: !1, producer: "clang version 18.0.0 ...", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!12 = !{i32 7, !"Dwarf Version", i32 5}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{i32 7, !"frame-pointer", i32 2}
+!16 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
+!17 = !{!"clang version 18.0.0 ..."}
+!18 = distinct !DISubprogram(name: "bar", scope: !1, file: !1, line: 10, type: !19, scopeLine: 10, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !11, retainedNodes: !23)
+!19 = !DISubroutineType(types: !20)
+!20 = !{null, !21}
+!21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !22, size: 64)
+!22 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !0)
+!23 = !{!24}
+!24 = !DILocalVariable(name: "p", arg: 1, scope: !18, file: !1, line: 10, type: !21)
+!25 = !DILocation(line: 0, scope: !18)
+!26 = !DILocation(line: 11, column: 8, scope: !18)
+!27 = !{!28, !29, i64 0}
+!28 = !{!"foo", !29, i64 0, !31, i64 2, !32, i64 4, !33, i64 8}
+!29 = !{!"omnipotent char", !30, i64 0}
+!30 = !{!"Simple C/C++ TBAA"}
+!31 = !{!"short", !29, i64 0}
+!32 = !{!"int", !29, i64 0}
+!33 = !{!"long", !29, i64 0}
+!34 = !DILocation(line: 12, column: 8, scope: !18)
+!35 = !{!28, !31, i64 2}
+!36 = !DILocation(line: 13, column: 8, scope: !18)
+!37 = !{!28, !32, i64 4}
+!38 = !DILocation(line: 14, column: 8, scope: !18)
+!39 = !{!28, !33, i64 8}
+!40 = !DILocation(line: 15, column: 1, scope: !18)
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/store-imm.ll b/llvm/test/CodeGen/SBF/store-imm.ll
new file mode 100644
index 0000000000000..37b0bb1a32edb
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/store-imm.ll
@@ -0,0 +1,75 @@
+; RUN: llc < %s -march=sbf -mattr=+store-imm -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+store-imm,+alu32 -show-mc-encoding | FileCheck %s
+
+define void @byte(ptr %p0) {
+; CHECK-LABEL: byte:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    stb [r1 + 0], 1       # encoding: [0x72,0x01,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-NEXT:    stb [r1 + 1], 255     # encoding: [0x72,0x01,0x01,0x00,0xff,0x00,0x00,0x00]
+  %p1 = getelementptr i8, ptr %p0, i32 1
+  store volatile i8  1, ptr %p0, align 1
+  store volatile i8 -1, ptr %p1, align 1
+  unreachable
+}
+define void @half(ptr, ptr %p0) {
+; CHECK-LABEL: half:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    sth [r2 + 0], 1          # encoding: [0x6a,0x02,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-NEXT:    sth [r2 + 2], 65535      # encoding: [0x6a,0x02,0x02,0x00,0xff,0xff,0x00,0x00]
+  %p1 = getelementptr i8, ptr %p0, i32 2
+  store volatile i16  1, ptr %p0, align 2
+  store volatile i16 -1, ptr %p1, align 2
+  unreachable
+}
+define void @word(ptr, ptr, ptr %p0) {
+; CHECK-LABEL: word:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    stw [r3 + 0], 1            # encoding: [0x62,0x03,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-NEXT:    stw [r3 + 4], -1           # encoding: [0x62,0x03,0x04,0x00,0xff,0xff,0xff,0xff]
+; CHECK-NEXT:    stw [r3 + 8], -2000000000  # encoding: [0x62,0x03,0x08,0x00,0x00,0x6c,0xca,0x88]
+; CHECK-NEXT:    stw [r3 + 12], -1          # encoding: [0x62,0x03,0x0c,0x00,0xff,0xff,0xff,0xff]
+; CHECK-NEXT:    stw [r3 + 12], 0           # encoding: [0x62,0x03,0x0c,0x00,0x00,0x00,0x00,0x00]
+  %p1 = getelementptr i8, ptr %p0, i32 4
+  %p2 = getelementptr i8, ptr %p0, i32 8
+  %p3 = getelementptr i8, ptr %p0, i32 12
+  store volatile i32           1, ptr %p0, align 4
+  store volatile i32          -1, ptr %p1, align 4
+  store volatile i32 -2000000000, ptr %p2, align 4
+  store volatile i32  4294967295, ptr %p3, align 4
+  store volatile i32  4294967296, ptr %p3, align 4
+  unreachable
+}
+define void @dword(ptr, ptr, ptr, ptr %p0) {
+; CHECK-LABEL: dword:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    stdw [r4 + 0], 1             # encoding: [0x7a,0x04,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-NEXT:    stdw [r4 + 8], -1            # encoding: [0x7a,0x04,0x08,0x00,0xff,0xff,0xff,0xff]
+; CHECK-NEXT:    stdw [r4 + 16], 2000000000   # encoding: [0x7a,0x04,0x10,0x00,0x00,0x94,0x35,0x77]
+; CHECK-NEXT:    stdw [r4 + 16], -2000000000  # encoding: [0x7a,0x04,0x10,0x00,0x00,0x6c,0xca,0x88]
+; CHECK-NEXT:    lddw r1, 4294967295          # encoding: [0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-NEXT:    stxdw [r4 + 24], r1          # encoding: [0x7b,0x14,0x18,0x00,0x00,0x00,0x00,0x00]
+  %p1 = getelementptr i8, ptr %p0, i32 8
+  %p2 = getelementptr i8, ptr %p0, i32 16
+  %p3 = getelementptr i8, ptr %p0, i32 24
+  store volatile i64           1, ptr %p0, align 8
+  store volatile i64          -1, ptr %p1, align 8
+  store volatile i64  2000000000, ptr %p2, align 8
+  store volatile i64 -2000000000, ptr %p2, align 8
+  store volatile i64  4294967295, ptr %p3, align 8
+  unreachable
+}
+
+define void @unaligned(ptr %p0) {
+; SBF allows misaligned memory accesses
+; CHECK-LABEL: unaligned:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:  sth [r1 + 0], 65534          # encoding: [0x6a,0x01,0x00,0x00,0xfe,0xff,0x00,0x00]
+; CHECK-NEXT:  stw [r1 + 8], -2             # encoding: [0x62,0x01,0x08,0x00,0xfe,0xff,0xff,0xff]
+; CHECK-NEXT:  stdw [r1 + 16], -2           # encoding: [0x7a,0x01,0x10,0x00,0xfe,0xff,0xff,0xff]
+  %p1 = getelementptr i8, ptr %p0, i32 8
+  %p2 = getelementptr i8, ptr %p0, i32 16
+  store volatile i16 -2, ptr %p0, align 1
+  store volatile i32 -2, ptr %p1, align 2
+  store volatile i64 -2, ptr %p2, align 4
+  unreachable
+}
\ No newline at end of file
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
index 00541d55cc404..de26039d03f69 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-ldst.txt
@@ -130,3 +130,12 @@
 0xc3,0x58,0xf0,0xff,0xf1,0x00,0x00,0x00
 
 
+
+# CHECK-NEW: stb [r10 - 8], 2
+# CHECK-NEW: sth [r9 + 4], -20
+# CHECK-NEW: stw [r4 - 16], 34
+# CHECK-NEW: stdw [r1 + 24], 65534
+0x72,0x0a,0xf8,0xff,0x02,0x00,0x00,0x00
+0x6a,0x09,0x04,0x00,0xec,0xff,0xff,0xff
+0x62,0x04,0xf0,0xff,0x22,0x00,0x00,0x00
+0x7a,0x01,0x18,0x00,0xfe,0xff,0x00,0x00
\ No newline at end of file
diff --git a/llvm/test/MC/SBF/sbf-ldst.s b/llvm/test/MC/SBF/sbf-ldst.s
index 001b9f8d51838..0f05cfc62b96d 100644
--- a/llvm/test/MC/SBF/sbf-ldst.s
+++ b/llvm/test/MC/SBF/sbf-ldst.s
@@ -183,3 +183,17 @@ stxxchgw [r8 - 16], w0
 stxcmpxchgdw [r8 - 16], r5
 stxcmpxchgw [r8 - 16], w5
 
+
+
+# CHECK-OBJ-NEW: stb [r10 - 0x8], 0x2
+# CHECK-OBJ-NEW: sth [r9 + 0x4], -0x14
+# CHECK-OBJ-NEW: stw [r4 - 0x10], 0x22
+# CHECK-OBJ-NEW: stdw [r1 + 0x18], 0xfffe
+# CHECK-ASM-NEW: encoding: [0x72,0x0a,0xf8,0xff,0x02,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x6a,0x09,0x04,0x00,0xec,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x62,0x04,0xf0,0xff,0x22,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x7a,0x01,0x18,0x00,0xfe,0xff,0x00,0x00]
+stb [r10 - 8], 2
+sth [r9 + 4], -20
+stw [r4 - 16], 34
+stdw [r1 + 24], 65534
\ No newline at end of file

From 2a309303b410c7c3de85d1170848beb1050a13f7 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:03:04 -0300
Subject: [PATCH 059/114] [SOL] Create explicit sign extension instruction
 (#114)

* Create explicit sign extension instruction
---
 llvm/lib/Target/SBF/SBFISelLowering.cpp    |  13 ++-
 llvm/lib/Target/SBF/SBFInstrInfo.cpp       |  12 ++-
 llvm/lib/Target/SBF/SBFInstrInfo.h         |   4 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td        |  59 ++++++++---
 llvm/lib/Target/SBF/SBFSubtarget.cpp       |   1 +
 llvm/lib/Target/SBF/SBFSubtarget.h         |   4 +
 llvm/lib/Target/SBF/SBFTargetFeatures.td   |   5 +-
 llvm/test/CodeGen/SBF/explicit-sign-ext.ll | 110 +++++++++++++++++++++
 llvm/test/MC/SBF/sbf-alu.s                 |   8 ++
 9 files changed, 196 insertions(+), 20 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/explicit-sign-ext.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index ab6837fb72167..6eb5dd3640cf9 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -933,24 +933,29 @@ SBFTargetLowering::EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB,
                                  unsigned Reg, bool isSigned) const {
   const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo();
   const TargetRegisterClass *RC = getRegClassFor(MVT::i64);
-  int RShiftOp = isSigned ? SBF::SRA_ri : SBF::SRL_ri;
   MachineFunction *F = BB->getParent();
   DebugLoc DL = MI.getDebugLoc();
 
   MachineRegisterInfo &RegInfo = F->getRegInfo();
 
   if (!isSigned) {
+    unsigned MovOp =
+        Subtarget->getHasExplicitSignExt()
+                         ? SBF::MOV_rr : SBF::MOV_32_64;
     Register PromotedReg0 = RegInfo.createVirtualRegister(RC);
-    BuildMI(BB, DL, TII.get(SBF::MOV_32_64), PromotedReg0).addReg(Reg);
+    BuildMI(BB, DL, TII.get(MovOp), PromotedReg0).addReg(Reg);
     return PromotedReg0;
   }
   Register PromotedReg0 = RegInfo.createVirtualRegister(RC);
+  BuildMI(BB, DL, TII.get(SBF::MOV_32_64), PromotedReg0).addReg(Reg);
+  if (Subtarget->getHasExplicitSignExt())
+    return PromotedReg0;
+
   Register PromotedReg1 = RegInfo.createVirtualRegister(RC);
   Register PromotedReg2 = RegInfo.createVirtualRegister(RC);
-  BuildMI(BB, DL, TII.get(SBF::MOV_32_64), PromotedReg0).addReg(Reg);
   BuildMI(BB, DL, TII.get(SBF::SLL_ri), PromotedReg1)
     .addReg(PromotedReg0).addImm(32);
-  BuildMI(BB, DL, TII.get(RShiftOp), PromotedReg2)
+  BuildMI(BB, DL, TII.get(SBF::SRA_ri), PromotedReg2)
     .addReg(PromotedReg1).addImm(32);
 
   return PromotedReg2;
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index b222513ae2f11..9e7cc61e85472 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -28,6 +28,10 @@ using namespace llvm;
 SBFInstrInfo::SBFInstrInfo()
     : SBFGenInstrInfo(SBF::ADJCALLSTACKDOWN, SBF::ADJCALLSTACKUP) {}
 
+void SBFInstrInfo::setHasExplicitSignExt(bool HasExplicitSext) {
+  this->HasExplicitSignExt = HasExplicitSext;
+}
+
 void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
                                MachineBasicBlock::iterator I,
                                const DebugLoc &DL, MCRegister DestReg,
@@ -35,9 +39,13 @@ void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
   if (SBF::GPRRegClass.contains(DestReg, SrcReg))
     BuildMI(MBB, I, DL, get(SBF::MOV_rr), DestReg)
         .addReg(SrcReg, getKillRegState(KillSrc));
-  else if (SBF::GPR32RegClass.contains(DestReg, SrcReg))
-    BuildMI(MBB, I, DL, get(SBF::MOV_rr_32), DestReg)
+  else if (SBF::GPR32RegClass.contains(DestReg, SrcReg)) {
+    unsigned OpCode =
+        HasExplicitSignExt ? SBF::MOV_rr_32_no_sext_v2
+                           : SBF::MOV_rr_32_no_sext_v1;
+    BuildMI(MBB, I, DL, get(OpCode), DestReg)
         .addReg(SrcReg, getKillRegState(KillSrc));
+  }
   else
     llvm_unreachable("Impossible reg-to-reg copy");
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index 0711f216386ab..5c4afdb2a2578 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -58,9 +58,11 @@ class SBFInstrInfo : public SBFGenInstrInfo {
                         MachineBasicBlock *FBB, ArrayRef<MachineOperand> Cond,
                         const DebugLoc &DL,
                         int *BytesAdded = nullptr) const override;
+  void setHasExplicitSignExt(bool HasExplicitSext);
+
 private:
   void expandMEMCPY(MachineBasicBlock::iterator) const;
-
+  bool HasExplicitSignExt;
 };
 }
 
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index bfce5db319742..03136325cdca0 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -65,6 +65,8 @@ def SBFNoCallxSrc : Predicate<"!Subtarget->getCallXRegSrc()">;
 def SBFPqrInstr : Predicate<"Subtarget->getHasPqrClass()">;
 def SBFNoPqrInstr : Predicate<"!Subtarget->getHasPqrClass()">;
 def SBFHasStoreImm : Predicate<"Subtarget->getHasStoreImm()">;
+def SBFExplicitSignExt : Predicate<"Subtarget->getHasExplicitSignExt()">;
+def SBFNoExplicitSignExt : Predicate<"!Subtarget->getHasExplicitSignExt()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -415,16 +417,26 @@ def MOV_ri : MATH_RI<SBF_ALU64, SBF_MOV,
                     (ins i64imm:$imm),
                     "mov64 $dst, $imm",
                     [(set GPR:$dst, (i64 i64immSExt32:$imm))]>;
-def MOV_rr_32 : MATH_RR<SBF_ALU, SBF_MOV,
-                    (outs GPR32:$dst),
-                    (ins GPR32:$src),
-                    "mov32 $dst, $src",
-                    []>;
+
 def MOV_ri_32 : MATH_RI<SBF_ALU, SBF_MOV,
                     (outs GPR32:$dst),
                     (ins i32imm:$imm),
                     "mov32 $dst, $imm",
                     [(set GPR32:$dst, (i32 i32immSExt32:$imm))]>;
+
+let Predicates = [SBFExplicitSignExt], DecoderNamespace = "SBFv2" in {
+    def MOV_rr_32_no_sext_v2 : MATH_RR<SBF_ALU64, SBF_MOV,
+                                (outs GPR32:$dst),
+                                (ins GPR32:$src),
+                                "mov64 $dst, $src",
+                                []>;
+}
+
+def MOV_rr_32_no_sext_v1 : MATH_RR<SBF_ALU, SBF_MOV,
+                        (outs GPR32:$dst),
+                        (ins GPR32:$src),
+                        "mov32 $dst, $src",
+                        []>, Requires<[SBFNoExplicitSignExt]>;
 }
 
 def FI_ri
@@ -993,10 +1005,13 @@ let Constraints = "$dst = $src" in {
     }
 }
 
-let isCodeGenOnly = 1 in {
+let DecoderNamespace = "SBFv2" in {
   def MOV_32_64 : MATH_RR<SBF_ALU, SBF_MOV,
                          (outs GPR:$dst), (ins GPR32:$src),
                          "mov32 $dst, $src", []>;
+}
+
+let isCodeGenOnly = 1 in {
   def MOV_32_64_addr : MATH_RI<SBF_ALU, SBF_MOV,
                            (outs GPR:$dst), (ins u64imm:$imm),
                            "mov32 $dst, $imm", []>, Requires<[SBFNoLddw]>;
@@ -1023,19 +1038,39 @@ def : Pat<(SBFWrapper tglobaladdr:$in),
         (HOR_addr (MOV_32_64_addr tglobaladdr:$in),
                             tglobaladdr:$in)>, Requires<[SBFNoLddw]>;
 
+// SBFv2 sign extension
+def : Pat<(i64 (sext GPR32:$src)),
+          (MOV_32_64 GPR32:$src)>, Requires<[SBFExplicitSignExt]>;
 
+// SBFv1 sign extension
 def : Pat<(i64 (sext GPR32:$src)),
-          (SRA_ri (SLL_ri (MOV_32_64 GPR32:$src), 32), 32)>;
+          (SRA_ri (SLL_ri (MOV_32_64 GPR32:$src), 32), 32)>,
+                Requires<[SBFNoExplicitSignExt]>;
+
+// SBFv2 zero extension
+def : Pat<(i64 (zext GPR32:$src)), (INSERT_SUBREG (i64 (IMPLICIT_DEF)),
+                                    GPR32:$src, sub_32)>, Requires<[SBFExplicitSignExt]>;
 
-def : Pat<(i64 (zext GPR32:$src)), (MOV_32_64 GPR32:$src)>;
+// SBFv1 zero extension
+def : Pat<(i64 (zext GPR32:$src)), (MOV_32_64 GPR32:$src)>,
+                                Requires<[SBFNoExplicitSignExt]>;
 
-// For i64 -> i32 truncation, use the 32-bit subregister directly.
+// SBFv2 truncation
 def : Pat<(i32 (trunc GPR:$src)),
-          (i32 (EXTRACT_SUBREG GPR:$src, sub_32))>;
+          (AND_ri_32 (i32 (EXTRACT_SUBREG GPR:$src, sub_32)),
+          (i32 0xffffffff))>, Requires<[SBFExplicitSignExt]>;
+
+// SBFv1 truncation
+def : Pat<(i32 (trunc GPR:$src)),
+          (i32 (EXTRACT_SUBREG GPR:$src, sub_32))>, Requires<[SBFNoExplicitSignExt]>;
+
+// SBFv2 anyext
+def : Pat<(i64 (anyext GPR32:$src)),
+          (MOV_32_64 GPR32:$src)>, Requires<[SBFExplicitSignExt]>;
 
-// For i32 -> i64 anyext, we don't care about the high bits.
+// SBFv1 anyext
 def : Pat<(i64 (anyext GPR32:$src)),
-          (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>;
+          (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>, Requires<[SBFNoExplicitSignExt]>;
 
 class STORE32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index e3098cae86bf6..313be03f9539e 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -30,6 +30,7 @@ SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT,
                                                             StringRef FS) {
   initializeEnvironment(TT);
   initSubtargetFeatures(CPU, FS);
+  InstrInfo.setHasExplicitSignExt(HasExplicitSignExt);
   return *this;
 }
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index c32a76d2e4368..685bbef2fb7b4 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -80,6 +80,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether we have store imm instructions
   bool HasStoreImm;
 
+  // Whether we have the explicit sign extension instruction (mov32)
+  bool HasExplicitSignExt;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -105,6 +108,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
     return HasDynamicFrames && NewCallConvention;
   }
   bool getHasStoreImm() const { return HasStoreImm; }
+  bool getHasExplicitSignExt() const { return HasExplicitSignExt; }
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
     return &FrameLowering;
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 753c8d04988dc..351500e73da65 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -46,6 +46,9 @@ def FeatureCallConv : SubtargetFeature<"new-call-conv", "NewCallConvention", "tr
 def FeatureStoreImm : SubtargetFeature<"store-imm", "HasStoreImm", "true",
                                            "Enable store imm instructions">;
 
+def FeatureExplicitSext : SubtargetFeature<"explicit-sext", "HasExplicitSignExt",
+                    "true", "Enable the explicit sign extension instruction mov32">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
@@ -55,4 +58,4 @@ def : Proc<"v2", []>;
 def : Proc<"v3", [ALU32]>;
 def : Proc<"sbfv2", [FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
                         FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
-                          FeaturePqrInstr, FeatureCallConv]>;
\ No newline at end of file
+                          FeaturePqrInstr, FeatureCallConv, FeatureExplicitSext]>;
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/explicit-sign-ext.ll b/llvm/test/CodeGen/SBF/explicit-sign-ext.ll
new file mode 100644
index 0000000000000..16d93bf12b1a3
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/explicit-sign-ext.ll
@@ -0,0 +1,110 @@
+; RUN: llc -march=sbf -mattr=+alu32 < %s | FileCheck --check-prefixes=CHECK-v1,CHECK %s
+; RUN: llc -march=sbf -mattr=+alu32,+explicit-sext < %s | FileCheck --check-prefixes=CHECK-v2,CHECK %s
+
+
+define dso_local i64 @my_sext(i32 %a) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: my_sext
+  %res = sext i32 %a to i64
+
+; CHECK-v1: mov32 r0, w1
+; CHECK-v1: lsh64 r0, 32
+; CHECK-v1: arsh64 r0, 32
+
+; CHECK-v2: mov32 r0, w1
+  ret i64 %res
+}
+
+define dso_local i64 @my_zext(i32 %a) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: my_zext
+  %res = zext i32 %a to i64
+
+; CHECK-v1: mov32 r0, w1
+; CHECK-v2: mov64 w0, w1
+
+  ret i64 %res
+}
+
+define dso_local i32 @my_trunc(i64 %a) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: my_trunc
+  %res = trunc i64 %a to i32
+
+; CHECK-v1: mov64 r0, r1
+; CHECK-v2: mov64 r0, r1
+; CHECK-v2: and32 w0, -1
+  ret i32 %res
+}
+
+define dso_local i32 @copy_phys(i32 %a) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: copy_phys
+  %res = add i32 %a, 2
+  %b = sub i32 %res, 5
+; CHECK-v1: mov32 w0, w1
+; CHECK-v2: mov64 w0, w1
+  ret i32 %b
+}
+
+define dso_local i32 @select_cc_imm(i32 %a, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: select_cc_imm
+  %cmp = icmp sgt i32 %a, 10
+; CHECK-v1: mov32 w0, w2
+; CHECK-v2: mov64 w0, w2
+
+; CHECK-v1: mov32 r1, w1
+; CHECK-v1: lsh64 r1, 32
+; CHECK-v1: arsh64 r1, 32
+; CHECK-v2: mov32 r1, w1
+
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+; CHECK-v1: mov32 w0, w3
+; CHECK-v2: mov64 w0, w3
+
+  ret i32 %c.d
+}
+
+define dso_local i32 @select_cc_reg(i32 %a, i32 %b, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: select_cc_reg
+  %cmp = icmp sgt i32 %a, %b
+; CHECK-v1: mov32 w0, w3
+; CHECK-v2: mov64 w0, w3
+
+; CHECK-v1: mov32 r1, w1
+; CHECK-v1: lsh64 r1, 32
+; CHECK-v1: arsh64 r1, 32
+; CHECK-v2: mov32 r1, w1
+
+; CHECK-v1: mov32 r2, w2
+; CHECK-v1: lsh64 r2, 32
+; CHECK-v1: arsh64 r2, 32
+; CHECK-v2: mov32 r2, w2
+
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+; CHECK-v1: mov32 w0, w4
+; CHECK-v2: mov64 w0, w4
+  ret i32 %c.d
+}
+
+define dso_local i64 @select_cc_imm_64(i32 %a, i64 %c, i64 %d) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: select_cc_imm_64
+; CHECK-v1: mov64 r0, r2
+  %cmp = icmp sgt i32 %a, 10
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+; CHECK: mov64 r0, r3
+  ret i64 %c.d
+}
+
+define dso_local i64 @select_cc_reg_64(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: select_cc_reg_64
+; CHECK: mov64 r0, r3
+  %cmp = icmp sgt i32 %a, %b
+  %c.d = select i1 %cmp, i64 %c, i64 %d
+; CHECK: mov64 r0, r4
+  ret i64 %c.d
+}
\ No newline at end of file
diff --git a/llvm/test/MC/SBF/sbf-alu.s b/llvm/test/MC/SBF/sbf-alu.s
index 7e29513cbf2da..e45f81211a787 100644
--- a/llvm/test/MC/SBF/sbf-alu.s
+++ b/llvm/test/MC/SBF/sbf-alu.s
@@ -291,6 +291,10 @@ mov64 r0, r9
 # CHECK-ASM-NEW: encoding: [0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
 mov64 r3, r2
 
+# CHECK-OBJ-NEW: mov64 r3, r2
+# CHECK-ASM-NEW: encoding: [0xbf,0x23,0x00,0x00,0x00,0x00,0x00,0x00]
+mov64 w3, w2
+
 # CHECK-OBJ-NEW: mov64 r3, 0x7b
 # CHECK-ASM-NEW: encoding: [0xb7,0x03,0x00,0x00,0x7b,0x00,0x00,0x00]
 mov64 r3, 123
@@ -303,6 +307,10 @@ mov64 r5, -123
 # CHECK-ASM-NEW: encoding: [0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
 mov32 w6, w2
 
+# CHECK-OBJ-NEW: mov32 w6, w2
+# CHECK-ASM-NEW: encoding: [0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00]
+mov32 r6, w2
+
 # CHECK-OBJ-NEW: mov32 w5, -0x7b
 # CHECK-ASM-NEW: encoding: [0xb4,0x05,0x00,0x00,0x85,0xff,0xff,0xff]
 mov32 w5, -123

From f562f76b2faeab6c7e79a8fec33c705be243ca1e Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 6 Dec 2024 16:10:23 -0300
Subject: [PATCH 060/114] [SOL] Fix ALU32 instructions with explicit sign
 extension (#116)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp       |  45 ++++--
 llvm/lib/Target/SBF/SBFInstrInfo.td           |   6 +
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |   3 +-
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |   8 +-
 .../CodeGen/SBF/32-bit-subreg-cond-select.ll  |  16 ++-
 llvm/test/CodeGen/SBF/atomics_sbf.ll          |  76 +++++------
 llvm/test/CodeGen/SBF/br_cc_sext.ll           | 129 ++++++++++++++++++
 llvm/test/CodeGen/SBF/remove_truncate_7.ll    |   2 +-
 8 files changed, 227 insertions(+), 58 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/br_cc_sext.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 6eb5dd3640cf9..4979d552e8336 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -126,7 +126,11 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
 
   if (STI.getHasAlu32()) {
     setOperationAction(ISD::BSWAP, MVT::i32, Promote);
-    setOperationAction(ISD::BR_CC, MVT::i32, Promote);
+    setOperationAction(ISD::BR_CC, MVT::i32, Custom);
+    setOperationAction(ISD::CTTZ, MVT::i32, Expand);
+    setOperationAction(ISD::CTLZ, MVT::i32, Expand);
+    setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i32, Expand);
+    setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i32, Expand);
   }
 
   setOperationAction(ISD::CTTZ, MVT::i64, Expand);
@@ -763,6 +767,30 @@ SDValue SBFTargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
   if (!getHasJmpExt())
     NegateCC(LHS, RHS, CC);
 
+  bool IsSignedCmp = (CC == ISD::SETGT ||
+                      CC == ISD::SETGE ||
+                      CC == ISD::SETLT ||
+                      CC == ISD::SETLE);
+  bool Is32Num = LHS.getValueType() == MVT::i32 ||
+                 RHS.getValueType() == MVT::i32;
+
+  if (getHasAlu32() && Is32Num) {
+    if (isIntOrFPConstant(RHS) || isIntOrFPConstant(LHS)) {
+      // Immediate values are sign extended in SBF, so we sign extend the
+      // registers for a correct comparison.
+      LHS = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, LHS);
+      RHS = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, RHS);
+    } else if (IsSignedCmp) {
+      // If the comparison is signed, we sign extend registers
+      LHS = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, LHS);
+      RHS = DAG.getNode(ISD::SIGN_EXTEND, DL, MVT::i64, RHS);
+    } else {
+      // If the comparison is unsigned, we zero extend registers
+      LHS = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, LHS);
+      RHS = DAG.getNode(ISD::ZERO_EXTEND, DL, MVT::i64, RHS);
+    }
+  }
+
   return DAG.getNode(SBFISD::BR_CC, DL, Op.getValueType(), Chain, LHS, RHS,
                      DAG.getConstant(CC, DL, MVT::i64), Dest);
 }
@@ -941,7 +969,7 @@ SBFTargetLowering::EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB,
   if (!isSigned) {
     unsigned MovOp =
         Subtarget->getHasExplicitSignExt()
-                         ? SBF::MOV_rr : SBF::MOV_32_64;
+                         ? SBF::MOV_32_64_no_sext : SBF::MOV_32_64;
     Register PromotedReg0 = RegInfo.createVirtualRegister(RC);
     BuildMI(BB, DL, TII.get(MovOp), PromotedReg0).addReg(Reg);
     return PromotedReg0;
@@ -1087,15 +1115,12 @@ SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
                       CC == ISD::SETLT ||
                       CC == ISD::SETLE);
 
-  // eBPF at the moment only has 64-bit comparison. Any 32-bit comparison need
-  // to be promoted, however if the 32-bit comparison operands are destination
-  // registers then they are implicitly zero-extended already, there is no
-  // need of explicit zero-extend sequence for them.
-  //
-  // We simply do extension for all situations in this method, but we will
-  // try to remove those unnecessary in SBFMIPeephole pass.
+  // SBF at the moment only has 64-bit comparison. Any 32-bit comparison needs
+  // to be promoted. If we are comparing against an immediate value, we must
+  // sign extend the registers. Likewise for signed comparisons. Unsigned
+  // comparisons will zero extent registers.
   if (is32BitCmp)
-    LHS = EmitSubregExt(MI, BB, LHS, isSignedCmp);
+    LHS = EmitSubregExt(MI, BB, LHS, isSignedCmp || !isSelectRROp);
 
   if (isSelectRROp) {
     Register RHS = MI.getOperand(2).getReg();
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 03136325cdca0..a2a41da9e0f77 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -1015,6 +1015,12 @@ let isCodeGenOnly = 1 in {
   def MOV_32_64_addr : MATH_RI<SBF_ALU, SBF_MOV,
                            (outs GPR:$dst), (ins u64imm:$imm),
                            "mov32 $dst, $imm", []>, Requires<[SBFNoLddw]>;
+
+  def MOV_32_64_no_sext : MATH_RR<SBF_ALU64, SBF_MOV,
+                                    (outs GPR:$dst),
+                                    (ins GPR32:$src),
+                                    "mov64 $dst, $src",
+                                    []>;
 }
 
 let DecoderNamespace = "SBFv2", Predicates = [SBFNoLddw] in {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 313be03f9539e..f6e8c84c46a18 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -37,7 +37,6 @@ SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT,
 void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
   HasJmpExt = false;
-  HasAlu32 = false;
   UseDwarfRIS = false;
 
   // SBFv2 features
@@ -49,6 +48,8 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasPqrClass = false;
   NewCallConvention = false;
   HasStoreImm = false;
+  HasAlu32 = false;
+  HasExplicitSignExt = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 20f1de30d04f4..ced3cd528d895 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -158,10 +158,12 @@ void SBFPassConfig::addMachineSSAOptimization() {
   // Peephole ran at last.
   TargetPassConfig::addMachineSSAOptimization();
 
-  const SBFSubtarget *Subtarget = getSBFTargetMachine().getSubtargetImpl();
+//  const SBFSubtarget *Subtarget = getSBFTargetMachine().getSubtargetImpl();
   if (!DisableMIPeephole) {
-    if (Subtarget->getHasAlu32())
-      addPass(createSBFMIPeepholePass());
+// TODO: The peephole doesn't work with explicit sign extension. A future PR
+// will revamp the implementation.
+//    if (Subtarget->getHasAlu32())
+//      addPass(createSBFMIPeepholePass());
     addPass(createSBFMIPeepholeTruncElimPass());
   }
 }
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
index 2ea3048a314e2..af88048ccf37f 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mattr=+alu32,+explicit-sext -verify-machineinstrs < %s | FileCheck %s
 ;
 ; unsigned int select_cc_32 (unsigned a, unsigned b, int c, int d)
 ; {
@@ -56,19 +56,23 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: select_cc_32
-; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov64 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov64 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: jgt r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i64 @select_cc_32_64(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_addr #0 {
 entry:
-  %cmp = icmp ugt i32 %a, %b
+  %cmp = icmp sgt i32 %a, %b
   %c.d = select i1 %cmp, i64 %c, i64 %d
   ret i64 %c.d
 }
 ; CHECK-LABEL: select_cc_32_64
 ; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: jsgt r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
@@ -80,6 +84,7 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: select_cc_64_32
+; CHECK: jsgt r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
@@ -91,18 +96,20 @@ entry:
 }
 ; CHECK-LABEL: selecti_cc_32
 ; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: jgt r{{[0-9]+}}, 10
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i64 @selecti_cc_32_64(i32 %a, i64 %c, i64 %d) local_unnamed_addr #0 {
 entry:
-  %cmp = icmp ugt i32 %a, 11
+  %cmp = icmp sgt i32 %a, 11
   %c.d = select i1 %cmp, i64 %c, i64 %d
   ret i64 %c.d
 }
 ; CHECK-LABEL: selecti_cc_32_64
 ; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: jsgt r{{[0-9]+}}, 11,
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
 
@@ -114,4 +121,5 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: selecti_cc_64_32
+; CHECK: jsgt r{{[0-9]+}}, 12
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
index 9e135c44664dd..7c1b599e63b78 100644
--- a/llvm/test/CodeGen/SBF/atomics_sbf.ll
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -1,8 +1,8 @@
-; RUN: llc < %s -march=sbf -mcpu=v3 -verify-machineinstrs | tee -i /tmp/log | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+alu32,+explicit-sext -verify-machineinstrs | tee -i /tmp/log | FileCheck %s
 ;
 ; CHECK-LABEL: test_load_add_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: add32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_add_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
@@ -25,7 +25,7 @@ entry:
 
 ; CHECK-LABEL: test_load_sub_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: sub32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_sub_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
@@ -67,8 +67,10 @@ entry:
 
 ; CHECK-LABEL: test_cas_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: jeq r0, r2,
-; CHECK: mov32 w3, w0
+; CHECK: mov64 r4, w0
+; CHECK: mov64 r2, w2
+; CHECK: jeq r4, r2,
+; CHECK: mov64 w3, w0
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
 entry:
@@ -91,7 +93,7 @@ entry:
 
 ; CHECK-LABEL: test_load_and_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: and32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_and_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
@@ -113,7 +115,7 @@ entry:
 
 ; CHECK-LABEL: test_load_nand_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: and32 w3, w2
 ; CHECK: xor32 w3, -1
 ; CHECK: stxw [r1 + 0], w3
@@ -137,7 +139,7 @@ entry:
 
 ; CHECK-LABEL: test_load_or_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: or32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_or_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
@@ -159,7 +161,7 @@ entry:
 
 ; CHECK-LABEL: test_load_xor_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: xor32 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_load_xor_32(i32* nocapture %p, i32 %v) local_unnamed_addr {
@@ -181,15 +183,11 @@ entry:
 
 ; CHECK-LABEL: test_min_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov64 r4, r0
-; CHECK: lsh64 r4, 32
-; CHECK: arsh64 r4, 32
-; CHECK: mov32 r5, w2
-; CHECK: lsh64 r5, 32
-; CHECK: arsh64 r5, 32
-; CHECK: mov32 w3, w0
-; CHECK: jslt r4, r5, LBB16_2
-; CHECK: mov32 w3, w2
+; CHECK: mov32 r4, w2
+; CHECK: mov32 r5, w0
+; CHECK: mov64 w3, w0
+; CHECK: jsgt r4, r5, LBB16_2
+; CHECK: mov64 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_min_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
@@ -200,7 +198,7 @@ entry:
 ; CHECK-LABEL: test_min_64
 ; CHECK: ldxdw r0, [r1 + 0]
 ; CHECK: mov64 r3, r0
-; CHECK: jslt r0, r2,
+; CHECK: jsgt r2, r0,
 ; CHECK: mov64 r3, r2
 ; CHECK: stxdw [r1 + 0], r3
 define dso_local  i64 @test_min_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
@@ -211,15 +209,11 @@ entry:
 
 ; CHECK-LABEL: test_max_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov64 r4, r0
-; CHECK: lsh64 r4, 32
-; CHECK: arsh64 r4, 32
+; CHECK: mov32 r4, w0
 ; CHECK: mov32 r5, w2
-; CHECK: lsh64 r5, 32
-; CHECK: arsh64 r5, 32
-; CHECK: mov32 w3, w0
+; CHECK: mov64 w3, w0
 ; CHECK: jsgt r4, r5, LBB18_2
-; CHECK: mov32 w3, w2
+; CHECK: mov64 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_max_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
@@ -241,10 +235,11 @@ entry:
 
 ; CHECK-LABEL: test_umin_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 r4, w2
-; CHECK: mov32 w3, w0
-; CHECK: jlt r0, r4,
-; CHECK: mov32 w3, w2
+; CHECK: mov64 r4, w2
+; CHECK: mov64 r5, w0
+; CHECK: mov64 w3, w0
+; CHECK: jgt r4, r5,
+; CHECK: mov64 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umin_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
@@ -255,7 +250,7 @@ entry:
 ; CHECK-LABEL: test_umin_64
 ; CHECK: ldxdw r0, [r1 + 0]
 ; CHECK: mov64 r3, r0
-; CHECK: jlt r0, r2,
+; CHECK: jgt r2, r0,
 ; CHECK: mov64 r3, r2
 ; CHECK: stxdw [r1 + 0], r3
 define dso_local  i64 @test_umin_64(i64* nocapture %ptr, i64 %v) local_unnamed_addr #0 {
@@ -266,10 +261,11 @@ entry:
 
 ; CHECK-LABEL: test_umax_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov32 r4, w2
-; CHECK: mov32 w3, w0
-; CHECK: jgt r0, r4,
-; CHECK: mov32 w3, w2
+; CHECK: mov64 r4, w0
+; CHECK: mov64 r5, w2
+; CHECK: mov64 w3, w0
+; CHECK: jgt r4, r5
+; CHECK: mov64 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umax_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
 entry:
@@ -305,8 +301,9 @@ entry:
 ; CHECK-LABEL: test_load_32
 ; CHECK: ldxw w0, [r1 + 0]
 ; CHECK: mov32 w2, 0
-; CHECK: jeq r0, 0, LBB25_2
-; CHECK: mov32 w2, w0
+; CHECK: mov32 r3, w0
+; CHECK: jeq r3, 0, LBB25_2
+; CHECK: mov64 w2, w0
 ; CHECK: LBB25_2:
 ; CHECK: stxw [r1 + 0], w2
 define dso_local i32 @test_load_32(ptr nocapture %p) local_unnamed_addr {
@@ -333,8 +330,9 @@ entry:
 
 ; CHECK-LABEL: test_weak_cas_32
 ; CHECK: ldxw w4, [r1 + 0]
-; CHECK: mov32 r2, w2
-; CHECK: jeq r4, r2,
+; CHECK: mov64 r5, w4
+; CHECK: mov64 r2, w2
+; CHECK: jeq r5, r2,
 ; CHECK: stxw [r1 + 0], w3
 define dso_local void @test_weak_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
 entry:
diff --git a/llvm/test/CodeGen/SBF/br_cc_sext.ll b/llvm/test/CodeGen/SBF/br_cc_sext.ll
new file mode 100644
index 0000000000000..bca0722fa0163
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/br_cc_sext.ll
@@ -0,0 +1,129 @@
+; RUN: llc -march=sbf -mattr=+alu32,+explicit-sext -verify-machineinstrs < %s | FileCheck %s
+
+; ModuleID = 'test.c'
+source_filename = "test.c"
+target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+target triple = "sbf"
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local noundef i32 @doThis(i32 noundef %a, i32 noundef %b) local_unnamed_addr #0 {
+entry:
+  %rem = srem i32 %a, %b
+  ret i32 %rem
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i32 @test_one(i32 noundef %a, i32 noundef %b, ptr %c) local_unnamed_addr #0 {
+entry:
+; Sign extension before comparison with immediate value
+; CHECK-LABEL: test_one
+; CHECK: mov32 r1, w1
+; CHECK: jeq r1, -1, LBB1_2
+  %ld = load i32, ptr %c, align 4
+  %cmp = icmp ult i32 %ld, -1
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %add = add nsw i32 %a, 9
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %rem.i = srem i32 %b, %a
+  %sub = sub nsw i32 9, %rem.i
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  %f.0 = phi i32 [ %add, %if.then ], [ %sub, %if.else ]
+  %add1 = add nsw i32 %f.0, 90
+  ret i32 %add1
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i32 @test_two(i32 noundef %a, i32 noundef %b, ptr %c) local_unnamed_addr #0 {
+entry:
+; Sign extension before comparison with immediate value
+; CHECK-LABEL: test_two
+; CHECK: mov32 r1, w1
+; CHECK: jsgt r1, -2, LBB2_2
+  %ld = load i32, ptr %c, align 4
+  %cmp = icmp slt i32 %ld, -1
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %add = add nsw i32 %a, 9
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %rem.i = srem i32 %b, %a
+  %sub = sub nsw i32 9, %rem.i
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  %f.0 = phi i32 [ %add, %if.then ], [ %sub, %if.else ]
+  %add1 = add nsw i32 %f.0, 90
+  ret i32 %add1
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i32 @test_three(i32 noundef %a, i32 noundef %b, ptr %c) local_unnamed_addr #0 {
+entry:
+; Sign extension for signed comparison
+; CHECK-LABEL: test_three
+; CHECK: mov32 r1, w2
+; CHECK: ldxw w3, [r3 + 0]
+; CHECK: mov32 r3, w3
+; CHECK: jsge r3, r1, LBB3_2
+  %ld = load i32, ptr %c, align 4
+  %cmp = icmp slt i32 %ld, %b
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %add = add nsw i32 %a, 9
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %rem.i = srem i32 %b, %a
+  %sub = sub nsw i32 9, %rem.i
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  %f.0 = phi i32 [ %add, %if.then ], [ %sub, %if.else ]
+  %add1 = add nsw i32 %f.0, 90
+  ret i32 %add1
+}
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define dso_local i32 @test_four(i32 noundef %a, i32 noundef %b, ptr %c) local_unnamed_addr #0 {
+entry:
+; Zero extension for unsigned comparison
+; CHECK-LABEL: test_four
+; CHECK: mov64 w0, w1
+; CHECK: ldxw w1, [r3 + 0]
+; CHECK: jge r1, r2, LBB4_2
+  %ld = load i32, ptr %c, align 4
+  %cmp = icmp ult i32 %ld, %b
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %add = add nsw i32 %a, 9
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %rem.i = srem i32 %b, %a
+  %sub = sub nsw i32 9, %rem.i
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  %f.0 = phi i32 [ %add, %if.then ], [ %sub, %if.else ]
+  %add1 = add nsw i32 %f.0, 90
+  ret i32 %add1
+}
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn memory(none) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+solana" }
+
+!llvm.module.flags = !{!0, !1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 7, !"frame-pointer", i32 2}
+!2 = !{!"clang version 18.1.7 (https://github.com/solana-labs/llvm-project.git 9fd466387b898c6e320f31dbb8b7766507d1e6ae)"}
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_7.ll b/llvm/test/CodeGen/SBF/remove_truncate_7.ll
index a0df2f86d1f1e..fbc89d8c1fe8f 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_7.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_7.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=sbf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+alu32,+explicit-sext -verify-machineinstrs | FileCheck %s
 ;
 ; Source:
 ;  struct __sk_buff {

From a2170ea3e3d4850e3cf7193e80745bf2eb8ceeb4 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:03:52 -0300
Subject: [PATCH 061/114] [SOL] Use R10 as the stack pointer (#117)

* Use R10 as the stack pointer

* Use ubuntu 22 for CI

* Use R10 for pseudo stack pointer
---
 .github/workflows/docs.yml                    |  2 +-
 .github/workflows/issue-subscriber.yml        |  2 +-
 .github/workflows/libclang-abi-tests.yml      |  6 +-
 .../libcxx-check-generated-files.yml          |  2 +-
 .github/workflows/llvm-bugs.yml               |  2 +-
 .github/workflows/llvm-project-tests.yml      |  4 +-
 .github/workflows/llvm-tests.yml              |  6 +-
 .github/workflows/new-issues.yml              |  2 +-
 .github/workflows/new-prs.yml                 |  4 +-
 .github/workflows/pr-request-release-note.yml |  2 +-
 .github/workflows/pr-subscriber.yml           |  2 +-
 .github/workflows/release-documentation.yml   |  2 +-
 .github/workflows/release-doxygen.yml         |  2 +-
 .github/workflows/release-lit.yml             |  2 +-
 .github/workflows/release-tasks.yml           |  2 +-
 .github/workflows/scorecard.yml               |  2 +-
 .github/workflows/version-check.yml           |  2 +-
 .../SBF/Disassembler/SBFDisassembler.cpp      | 10 +--
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |  2 +-
 llvm/lib/Target/SBF/SBFFrameLowering.cpp      |  4 +-
 llvm/lib/Target/SBF/SBFFrameLowering.h        |  6 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 61 ++++++-------------
 llvm/lib/Target/SBF/SBFInstrInfo.td           |  4 +-
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp       | 26 +++++---
 llvm/lib/Target/SBF/SBFRegisterInfo.td        |  4 +-
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |  1 -
 llvm/lib/Target/SBF/SBFSubtarget.h            |  6 --
 llvm/lib/Target/SBF/SBFTargetFeatures.td      |  5 +-
 .../SBF/dynamic_stack_frame_add_not_sub.ll    |  8 +--
 llvm/test/CodeGen/SBF/many_args_new_conv.ll   | 57 +++++++++--------
 llvm/test/CodeGen/SBF/stack_args_v2.ll        | 17 +++---
 llvm/test/MC/Disassembler/SBF/sbf-pqr.txt     |  4 +-
 32 files changed, 124 insertions(+), 137 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b4fa27203236a..cdec2fdff69dc 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -51,7 +51,7 @@ on:
 jobs:
   check-docs-build:
     name: "Test documentation build"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     steps:
       # Don't fetch before checking for file changes to force the file changes
diff --git a/.github/workflows/issue-subscriber.yml b/.github/workflows/issue-subscriber.yml
index ef4fdf4418193..54cb04fd2cbc6 100644
--- a/.github/workflows/issue-subscriber.yml
+++ b/.github/workflows/issue-subscriber.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   auto-subscribe:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     steps:
       - name: Checkout Automation Script
diff --git a/.github/workflows/libclang-abi-tests.yml b/.github/workflows/libclang-abi-tests.yml
index 65cffccff776f..122f7fcb65bf7 100644
--- a/.github/workflows/libclang-abi-tests.yml
+++ b/.github/workflows/libclang-abi-tests.yml
@@ -27,7 +27,7 @@ concurrency:
 jobs:
   abi-dump-setup:
     if: github.repository_owner == 'llvm'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       BASELINE_REF: ${{ steps.vars.outputs.BASELINE_REF }}
       ABI_HEADERS: ${{ steps.vars.outputs.ABI_HEADERS }}
@@ -83,7 +83,7 @@ jobs:
   abi-dump:
     if: github.repository_owner == 'llvm'
     needs: abi-dump-setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         name:
@@ -138,7 +138,7 @@ jobs:
 
   abi-compare:
     if: github.repository_owner == 'llvm'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs:
       - abi-dump-setup
       - abi-dump
diff --git a/.github/workflows/libcxx-check-generated-files.yml b/.github/workflows/libcxx-check-generated-files.yml
index 570055624b2a8..96f3ddbbf7521 100644
--- a/.github/workflows/libcxx-check-generated-files.yml
+++ b/.github/workflows/libcxx-check-generated-files.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   check_generated_files:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v4
diff --git a/.github/workflows/llvm-bugs.yml b/.github/workflows/llvm-bugs.yml
index c392078fa4525..3fee30f00b20e 100644
--- a/.github/workflows/llvm-bugs.yml
+++ b/.github/workflows/llvm-bugs.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   auto-subscribe:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     steps:
       - uses: actions/setup-node@v4
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 609b5333a0416..048f8bb74ceae 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -14,7 +14,7 @@ on:
         required: false
       os_list:
         required: false
-        default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
+        default: '["ubuntu-22.04", "windows-2019", "macOS-13"]'
       python_version:
         required: false
         type: string
@@ -71,7 +71,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-22.04
           # Use windows-2019 due to:
           # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
           - windows-2019
diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml
index 4b37a076373f4..ee0be48f8a844 100644
--- a/.github/workflows/llvm-tests.yml
+++ b/.github/workflows/llvm-tests.yml
@@ -29,7 +29,7 @@ concurrency:
 jobs:
   abi-dump-setup:
     #if: github.repository_owner == 'llvm'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       BASELINE_REF: ${{ steps.vars.outputs.BASELINE_REF }}
       ABI_HEADERS: ${{ steps.vars.outputs.ABI_HEADERS }}
@@ -73,7 +73,7 @@ jobs:
   abi-dump:
     #if: github.repository_owner == 'llvm'
     needs: abi-dump-setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         name:
@@ -144,7 +144,7 @@ jobs:
 
   abi-compare:
     #if: github.repository_owner == 'llvm'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs:
       - abi-dump-setup
       - abi-dump
diff --git a/.github/workflows/new-issues.yml b/.github/workflows/new-issues.yml
index 3cac57e268513..c54ffbf5b0307 100644
--- a/.github/workflows/new-issues.yml
+++ b/.github/workflows/new-issues.yml
@@ -10,7 +10,7 @@ jobs:
   automate-issues-labels:
     permissions:
       issues: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     steps:
       - uses: llvm/actions/issue-labeler@main
diff --git a/.github/workflows/new-prs.yml b/.github/workflows/new-prs.yml
index 88175d6f8d64d..fead63cb89081 100644
--- a/.github/workflows/new-prs.yml
+++ b/.github/workflows/new-prs.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   greeter:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       pull-requests: write
     # Only comment on PRs that have been opened for the first time, by someone
@@ -56,7 +56,7 @@ jobs:
   automate-prs-labels:
     # Greet first so that only the author gets that notification.
     needs: greeter
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     # Ignore PRs with more than 10 commits.  Pull requests with a lot of
     # commits tend to be accidents usually when someone made a mistake while trying
     # to rebase.  We want to ignore these pull requests to avoid excessive
diff --git a/.github/workflows/pr-request-release-note.yml b/.github/workflows/pr-request-release-note.yml
index 2fa501dda16bb..6b4d830d792a6 100644
--- a/.github/workflows/pr-request-release-note.yml
+++ b/.github/workflows/pr-request-release-note.yml
@@ -14,7 +14,7 @@ jobs:
       github.repository_owner == 'llvm' &&
       startsWith(github.ref, 'refs/heads/release')
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       # We need to pull the script from the main branch, so that we ensure
       # we get the latest version of this script.
diff --git a/.github/workflows/pr-subscriber.yml b/.github/workflows/pr-subscriber.yml
index 272d3e2f9ef8a..d52f075270c46 100644
--- a/.github/workflows/pr-subscriber.yml
+++ b/.github/workflows/pr-subscriber.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   auto-subscribe:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     steps:
       - name: Checkout Automation Script
diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml
index 09e21585bfc56..6d1ebdc392ac1 100644
--- a/.github/workflows/release-documentation.yml
+++ b/.github/workflows/release-documentation.yml
@@ -29,7 +29,7 @@ on:
 jobs:
   release-documentation:
     name: Build and Upload Release Documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       upload: ${{ inputs.upload && !contains(inputs.release-version, 'rc') }}
     steps:
diff --git a/.github/workflows/release-doxygen.yml b/.github/workflows/release-doxygen.yml
index ea95e5bb12b2b..53be795285aa3 100644
--- a/.github/workflows/release-doxygen.yml
+++ b/.github/workflows/release-doxygen.yml
@@ -33,7 +33,7 @@ on:
 jobs:
   release-doxygen:
     name: Build and Upload Release Doxygen
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
     env:
diff --git a/.github/workflows/release-lit.yml b/.github/workflows/release-lit.yml
index 9d6f3140e6883..de373e46f0112 100644
--- a/.github/workflows/release-lit.yml
+++ b/.github/workflows/release-lit.yml
@@ -25,7 +25,7 @@ on:
 jobs:
   release-lit:
     name: Release Lit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout LLVM
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
diff --git a/.github/workflows/release-tasks.yml b/.github/workflows/release-tasks.yml
index 52076ea1821b0..e23173230773c 100644
--- a/.github/workflows/release-tasks.yml
+++ b/.github/workflows/release-tasks.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   validate-tag:
     name: Validate Tag
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     outputs:
       release-version: ${{ steps.validate-tag.outputs.release-version }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ff61cf83a6af3..0433c306f1834 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -21,7 +21,7 @@ permissions:
 jobs:
   analysis:
     name: Scorecard analysis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     permissions:
       # Needed to upload the results to code-scanning dashboard.
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
index 894e07d323ca9..66b0e21bbda89 100644
--- a/.github/workflows/version-check.yml
+++ b/.github/workflows/version-check.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   version_check:
     if: github.repository_owner == 'llvm'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v4
diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index d3cad4bc32321..a5881c0108792 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -86,7 +86,8 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFDisassembler() {
 
 static const unsigned GPRDecoderTable[] = {
     SBF::R0, SBF::R1, SBF::R2, SBF::R3, SBF::R4,  SBF::R5,
-    SBF::R6, SBF::R7, SBF::R8, SBF::R9, SBF::R10, SBF::R11};
+    SBF::R6, SBF::R7, SBF::R8, SBF::R9, SBF::R10
+};
 
 static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, unsigned RegNo,
                                            uint64_t /*Address*/,
@@ -101,12 +102,13 @@ static DecodeStatus DecodeGPRRegisterClass(MCInst &Inst, unsigned RegNo,
 
 static const unsigned GPR32DecoderTable[] = {
     SBF::W0, SBF::W1, SBF::W2, SBF::W3, SBF::W4,  SBF::W5,
-    SBF::W6, SBF::W7, SBF::W8, SBF::W9, SBF::W10, SBF::W11};
+    SBF::W6, SBF::W7, SBF::W8, SBF::W9, SBF::W10
+};
 
 static DecodeStatus
 DecodeGPR32RegisterClass(MCInst &Inst, unsigned RegNo, uint64_t /*Address*/,
                          const MCDisassembler * /*Decoder*/) {
-  if (RegNo > 11)
+  if (RegNo > 10)
     return MCDisassembler::Fail;
 
   unsigned Reg = GPR32DecoderTable[RegNo];
@@ -118,7 +120,7 @@ static DecodeStatus decodeMemoryOpValue(MCInst &Inst, unsigned Insn,
                                         uint64_t Address,
                                         const MCDisassembler *Decoder) {
   unsigned Register = (Insn >> 16) & 0xf;
-  if (Register > 11)
+  if (Register > 10)
     return MCDisassembler::Fail;
 
   Inst.addOperand(MCOperand::createReg(GPRDecoderTable[Register]));
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 99af4aa9b19bb..e92e2fcb534e4 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -48,7 +48,7 @@ static MCInstrInfo *createSBFMCInstrInfo() {
 
 static MCRegisterInfo *createSBFMCRegisterInfo(const Triple &TT) {
   MCRegisterInfo *X = new MCRegisterInfo();
-  InitSBFMCRegisterInfo(X, SBF::R11 /* RAReg doesn't exist */);
+  InitSBFMCRegisterInfo(X, SBF::R10 /* RAReg doesn't exist */);
   return X;
 }
 
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.cpp b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
index c29af66e9281f..177fd06e81fb8 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
@@ -29,8 +29,8 @@ void adjustStackPointer(MachineFunction &MF, MachineBasicBlock &MBB,
     DebugLoc Dl;
     const SBFInstrInfo &TII =
         *static_cast<const SBFInstrInfo *>(MF.getSubtarget().getInstrInfo());
-    BuildMI(MBB, MBBI, Dl, TII.get(SBF::ADD_ri), SBF::R11)
-        .addReg(SBF::R11)
+    BuildMI(MBB, MBBI, Dl, TII.get(SBF::ADD_ri), SBF::R10)
+        .addReg(SBF::R10)
         .addImm(IsSubtract ? -NumBytes : NumBytes);
   }
 }
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.h b/llvm/lib/Target/SBF/SBFFrameLowering.h
index 6c4c5aff96eb8..67f98b77da1ea 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.h
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.h
@@ -21,7 +21,11 @@ class SBFSubtarget;
 class SBFFrameLowering : public TargetFrameLowering {
 public:
   explicit SBFFrameLowering(const SBFSubtarget &sti)
-      : TargetFrameLowering(TargetFrameLowering::StackGrowsDown, Align(8), 0) {}
+      : TargetFrameLowering(
+            TargetFrameLowering::StackGrowsDown,
+            Align(64),
+            0,
+            Align(64)) {}
 
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 4979d552e8336..94b4c3f2bbcc6 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -63,7 +63,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
   // Compute derived properties from the register classes
   computeRegisterProperties(STI.getRegisterInfo());
 
-  setStackPointerRegisterToSaveRestore(SBF::R11);
+  setStackPointerRegisterToSaveRestore(SBF::R10);
 
   setOperationAction(ISD::BR_CC, MVT::i64, Custom);
   setOperationAction(ISD::BR_JT, MVT::Other, Expand);
@@ -359,18 +359,13 @@ SDValue SBFTargetLowering::LowerFormalArguments(
   // Assign locations to all of the incoming arguments.
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
-  if (Ins.size() > MaxArgs) {
-    if (Subtarget->getEnableNewCallConvention()) {
-      // Pass args 1-5 via registers, remaining args via stack.
-      CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32 : CC_SBF64);
-    } else {
-      // Pass args 1-4 via registers, remaining args via stack, referenced via
-      // SBF::R5
-      CCInfo.AnalyzeFormalArguments(Ins,
-                                    getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
-    }
+  if (!Subtarget->getHasDynamicFrames() && Ins.size() > MaxArgs) {
+    // Pass args 1-4 via registers, remaining args via stack, referenced via
+    // SBF::R5
+    CCInfo.AnalyzeFormalArguments(Ins,
+                                  getHasAlu32() ? CC_SBF32_X : CC_SBF64_X);
   } else {
-    // Pass all args via registers
+    // Pass args 1-5 via registers, remaining args via stack, if any.
     CCInfo.AnalyzeFormalArguments(Ins, getHasAlu32() ? CC_SBF32 : CC_SBF64);
   }
 
@@ -416,9 +411,9 @@ SDValue SBFTargetLowering::LowerFormalArguments(
       EVT LocVT = VA.getLocVT();
 
       SDValue SDV;
-      if (Subtarget->getEnableNewCallConvention()) {
-        // In the new convention, arguments are in at the start
-        // of the callee frame
+      if (Subtarget->getHasDynamicFrames()) {
+        // In the new convention, arguments are in at the end of the callee
+        // frame.
         uint64_t Size = PtrVT.getFixedSizeInBits() / 8;
         int64_t Offset = -static_cast<int64_t>(VA.getLocMemOffset() + Size);
         int FrameIndex =
@@ -428,14 +423,7 @@ SDValue SBFTargetLowering::LowerFormalArguments(
             MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
         SDV = DAG.getLoad(LocVT, DL, Chain, DstAddr, DstInfo);
       } else {
-        unsigned Offset;
-        if (Subtarget->getHasDynamicFrames()) {
-          // In the old convention, the arguments are stored on
-          // the start of caller the frame.
-          Offset = VA.getLocMemOffset() + PtrVT.getFixedSizeInBits() / 8;
-        } else {
-          Offset = SBFRegisterInfo::FrameLength - VA.getLocMemOffset();
-        }
+        unsigned Offset = SBFRegisterInfo::FrameLength - VA.getLocMemOffset();
 
         // Arguments relative to SBF::R5
         unsigned reg = MF.addLiveIn(SBF::R5, &SBF::GPRRegClass);
@@ -487,7 +475,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   SmallVector<CCValAssign, 16> ArgLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, ArgLocs, *DAG.getContext());
   if (Outs.size() > MaxArgs) {
-    if (Subtarget->getEnableNewCallConvention()) {
+    if (Subtarget->getHasDynamicFrames()) {
       // Pass args 1-5 via registers, remaining args via stack
       CCInfo.AnalyzeCallOperands(Outs, getHasAlu32() ? CC_SBF32 : CC_SBF64);
     } else {
@@ -563,33 +551,24 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       SDValue DstAddr;
       MachinePointerInfo DstInfo;
       int FrameIndex;
-      int64_t Offset;
+      int64_t Offset = static_cast<int64_t>(VA.getLocMemOffset());
+      uint64_t Size = VA.getLocVT().getFixedSizeInBits() / 8;
       if (Subtarget->getHasDynamicFrames()) {
         // In the new call convention, arguments are stored in the callee frame
-        // The positive offset signals that the variable does not occupy space
-        // in the caller frame.
-        Offset = static_cast<int64_t>(VA.getLocMemOffset() +
-                                      PtrVT.getFixedSizeInBits() / 8);
-        if (!Subtarget->getEnableNewCallConvention())
-          // In the old call convention, we place argument at the start of the
-          // frame in a fixed stack offset.
-          Offset = -Offset;
-
-        FrameIndex = MF.getFrameInfo().CreateFixedObject(
-            VA.getLocVT().getFixedSizeInBits() / 8, Offset, false);
-      } else {
-        Offset = static_cast<int64_t>(VA.getLocMemOffset());
-        FrameIndex = MF.getFrameInfo().CreateFixedObject(
-            VA.getLocVT().getFixedSizeInBits() / 8, Offset, false);
+        // We must increase the offset, simply because offset zero belongs to
+        // the caller.
+        Offset += Size;
       }
 
+      FrameIndex = MF.getFrameInfo().CreateFixedObject(
+          Size, Offset, false);
       SBFFuncInfo->storeFrameIndexArgument(FrameIndex);
       DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
       DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
       Chain = DAG.getStore(Chain, CLI.DL, Arg, DstAddr, DstInfo);
     }
 
-    if (!Subtarget->getEnableNewCallConvention()) {
+    if (!Subtarget->getHasDynamicFrames()) {
       // Pass the current stack frame pointer via SBF::R5, gluing the
       // instruction to instructions passing the first 4 arguments in
       // registers below.
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index a2a41da9e0f77..f50a10a89f01b 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -648,7 +648,7 @@ let isBranch = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1 in {
 }
 
 // Jump and link
-let isCall=1, hasDelaySlot=0, Uses = [R11],
+let isCall=1, hasDelaySlot=0, Uses = [R10],
     // Potentially clobbered registers
     Defs = [R0, R1, R2, R3, R4, R5] in {
   def JAL     : CALL<"call">;
@@ -689,7 +689,7 @@ let isReturn = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1,
 }
 
 // ADJCALLSTACKDOWN/UP pseudo insns
-let Defs = [R11], Uses = [R11], isCodeGenOnly = 1 in {
+let Defs = [R10], Uses = [R10], isCodeGenOnly = 1 in {
 def ADJCALLSTACKDOWN : Pseudo<(outs), (ins i64imm:$amt1, i64imm:$amt2),
                               "#ADJCALLSTACKDOWN $amt1 $amt2",
                               [(SBFcallseq_start timm:$amt1, timm:$amt2)]>;
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index de9659bf66f92..78f598cf9e6f6 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -39,7 +39,6 @@ SBFRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
 BitVector SBFRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
   BitVector Reserved(getNumRegs());
   markSuperRegs(Reserved, SBF::W10); // [W|R]10 is read only frame pointer
-  markSuperRegs(Reserved, SBF::W11); // [W|R]11 is pseudo stack pointer
   return Reserved;
 }
 
@@ -149,11 +148,13 @@ int SBFRegisterInfo::resolveInternalFrameIndex(
   const MachineFrameInfo &MFI = MF.getFrameInfo();
   const SBFFunctionInfo *SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
   int Offset = MFI.getObjectOffset(FI);
+  const SBFSubtarget & SubTarget = MF.getSubtarget<SBFSubtarget>();
+  uint64_t StackSize = MFI.getStackSize();
 
-  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames() &&
+  if (!SubTarget.getHasDynamicFrames() &&
       SBFFuncInfo->containsFrameIndex(FI)) {
     Offset = SBFRegisterInfo::FrameLength - Offset;
-    if (static_cast<uint64_t>(Offset) < MFI.getStackSize()) {
+    if (static_cast<uint64_t>(Offset) < StackSize) {
       dbgs() << "Error: A function call in method "
              << MF.getFunction().getName()
              << " overwrites values in the frame. Please, decrease stack usage "
@@ -161,13 +162,18 @@ int SBFRegisterInfo::resolveInternalFrameIndex(
              << "The function call may cause undefined behavior "
                 "during execution.\n\n";
     }
-    Offset = -Offset;
-  } else if (MF.getSubtarget<SBFSubtarget>().getEnableNewCallConvention() &&
-             SBFFuncInfo->containsFrameIndex(FI)) {
-    uint64_t StackSize = MFI.getStackSize();
-    Offset = -static_cast<int>(StackSize) - Offset;
-  } else if (Imm.has_value()) {
-    Offset += Imm.value();
+    return -Offset;
+  }
+
+  if (SubTarget.getHasDynamicFrames() &&
+      SBFFuncInfo->containsFrameIndex(FI)) {
+    return -Offset;
+  }
+
+  Offset += Imm.value_or(0);
+
+  if (SubTarget.getHasDynamicFrames()) {
+    return static_cast<int>(StackSize) + Offset;
   }
 
   return Offset;
diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.td b/llvm/lib/Target/SBF/SBFRegisterInfo.td
index 7696b0b973159..2b434f2cea24d 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.td
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.td
@@ -28,7 +28,7 @@ class Ri<bits<16> Enc, string n, list<Register> subregs>
   let SubRegIndices = [sub_32];
 }
 
-foreach I = 0-11 in {
+foreach I = 0-10 in {
   // 32-bit Integer (alias to low part of 64-bit register).
   def W#I  : Wi<I,  "w"#I>,  DwarfRegNum<[I]>;
   // 64-bit Integer registers
@@ -39,13 +39,11 @@ foreach I = 0-11 in {
 def GPR32 : RegisterClass<"SBF", [i32], 64, (add
   (sequence "W%u", 1, 9),
   W0, // Return value
-  W11, // Stack Ptr
   W10  // Frame Ptr
 )>;
 
 def GPR : RegisterClass<"SBF", [i64], 64, (add
   (sequence "R%u", 1, 9),
   R0, // Return value
-  R11, // Stack Ptr
   R10  // Frame Ptr
 )>;
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index f6e8c84c46a18..ff2c27df0d781 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -46,7 +46,6 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   NoLddw = false;
   CallxRegSrc = false;
   HasPqrClass = false;
-  NewCallConvention = false;
   HasStoreImm = false;
   HasAlu32 = false;
   HasExplicitSignExt = false;
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 685bbef2fb7b4..be578f8e993ce 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -74,9 +74,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether we have the PQR instruction class
   bool HasPqrClass;
 
-  // Whether to use the new call convention in SBFv2
-  bool NewCallConvention;
-
   // Whether we have store imm instructions
   bool HasStoreImm;
 
@@ -104,9 +101,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getNoLddw() const { return NoLddw; }
   bool getCallXRegSrc() const { return CallxRegSrc; }
   bool getHasPqrClass() const { return HasPqrClass; }
-  bool getEnableNewCallConvention() const {
-    return HasDynamicFrames && NewCallConvention;
-  }
   bool getHasStoreImm() const { return HasStoreImm; }
   bool getHasExplicitSignExt() const { return HasExplicitSignExt; }
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index 351500e73da65..dc2cf380600b8 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -40,9 +40,6 @@ def FeatureCallxRegSrc : SubtargetFeature<"callx-reg-src", "CallxRegSrc", "true"
 def FeaturePqrInstr : SubtargetFeature<"pqr-instr", "HasPqrClass", "true",
                                     "Enable the PQR instruction class">;
 
-def FeatureCallConv : SubtargetFeature<"new-call-conv", "NewCallConvention", "true",
-                                    "Enable new call convetion for SBFv2">;
-
 def FeatureStoreImm : SubtargetFeature<"store-imm", "HasStoreImm", "true",
                                            "Enable store imm instructions">;
 
@@ -58,4 +55,4 @@ def : Proc<"v2", []>;
 def : Proc<"v3", [ALU32]>;
 def : Proc<"sbfv2", [FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
                         FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
-                          FeaturePqrInstr, FeatureCallConv, FeatureExplicitSext]>;
\ No newline at end of file
+                          FeaturePqrInstr, FeatureExplicitSext]>;
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll b/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
index 307c50d058300..702d3b58ad5e7 100644
--- a/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
+++ b/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=sbf --mattr=+dynamic-frames | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+dynamic-frames | FileCheck %s
 ;
 ; Source:
 ; int test_func(int * vec, int idx) {
@@ -12,11 +12,11 @@
 ; Function Attrs: noinline nounwind optnone ssp uwtable(sync)
 define i32 @test_func(ptr noundef %vec, i32 noundef %idx) #0 {
 ; CHECK-LABEL: test_func:
-; CHECK: add64 r11, -16
-; CHECK: add64 r11, 16
+; CHECK: add64 r10, -128
+; CHECK: add64 r10, 128
 entry:
   %vec.addr = alloca ptr, align 8
-  %idx.addr = alloca i32, align 4
+  %idx.addr = alloca i512, align 4
   store ptr %vec, ptr %vec.addr, align 8
   store i32 %idx, ptr %idx.addr, align 4
   %0 = load i32, ptr %idx.addr, align 4
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index a21a00d60613f..b2a7fbe5ff863 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -6,7 +6,7 @@ entry:
 ; CHECK-LABEL: caller_no_alloca
 
 ; No changes to the stack pointer
-; CHECK-NOT: add64 r11
+; CHECK-NOT: add64 r10
 
 ; Saving arguments on the stack
 ; CHECK: mov64 r4, 55
@@ -30,26 +30,26 @@ entry:
 ; Function Attrs: nounwind uwtable
 define i32 @caller_alloca(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK-LABEL: caller_alloca
-; CHECK: add64 r11, -24
-; CHECK: ldxw r1, [r10 - 4]
+; CHECK: add64 r10, -64
+; CHECK: ldxw r1, [r10 + 60]
 
-; Saving arguments in the stack
+; Saving arguments in the callee's frame
 ; CHECK: mov64 r4, 55
 
-; Offset in the callee: (-56) - (-24) = -32
-; CHECK: stxdw [r10 - 56], r4
+; Offset in the callee: frame_size - 32
+; CHECK: stxdw [r10 - 32], r4
 ; CHECK: mov64 r4, 60
-; Offset in the callee: (-64) - (-24) = -40
-; CHECK: stxdw [r10 - 64], r4
+; Offset in the callee: frame_size - 40
+; CHECK: stxdw [r10 - 40], r4
 ; CHECK: mov64 r4, 50
-; Offset in the callee: (-48) - (-24) = -24
-; CHECK: stxdw [r10 - 48], r4
+; Offset in the callee: frame_size - 24
+; CHECK: stxdw [r10 - 24], r4
 ; CHECK: mov64 r4, 4
-; Offset in the callee: (-40) - (-24) = -16
-; CHECK: stxdw [r10 - 40], r4
+; Offset in the callee: frame_size - 16
+; CHECK: stxdw [r10 - 16], r4
 ; CHECK: mov64 r4, 3
-; Offset in the callee: (-32) - (-24) = -8
-; CHECK: stxdw [r10 - 32], r4
+; Offset in the callee: frame_size - 8
+; CHECK: stxdw [r10 - 8], r4
 ; CHECK: mov64 r4, 1
 ; CHECK: mov64 r5, 2
 ; CHECK: call callee_no_alloca
@@ -67,17 +67,19 @@ entry:
 ; Function Attrs: nounwind uwtable
 define i32 @callee_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %p, i32 %y, i32 %a1, i32 %a2) #1 {
 ; CHECK-LABEL: callee_alloca
+; CHECK: add64 r10, -128
 ; Loading arguments
-; CHECK: ldxdw r2, [r10 - 8]
-; CHECK: ldxdw r2, [r10 - 16]
-; CHECK: ldxdw r2, [r10 - 24]
-; CHECK: ldxdw r2, [r10 - 32]
-; CHECK: ldxdw r2, [r10 - 40]
+; CHECK: ldxdw r2, [r10 + 120]
+; CHECK: ldxdw r2, [r10 + 112]
+; CHECK: ldxdw r2, [r10 + 104]
+; CHECK: ldxdw r2, [r10 + 96]
+; CHECK: ldxdw r2, [r10 + 88]
 ; Loading allocated i32
-; CHECK: ldxw r0, [r10 - 44]
+; CHECK: ldxw r0, [r10 + 24]
+; CHECK: add64 r10, 128
 
 entry:
-  %o = alloca i32
+  %o = alloca i512
   %g = add i32 %a, %b
   %h = sub i32 %g, %c
   %i = add i32 %h, %d
@@ -95,12 +97,15 @@ entry:
 ; Function Attrs: nounwind uwtable
 define i32 @callee_no_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %p, i32 %y, i32 %a1, i32 %a2) #1 {
 ; CHECK-LABEL: callee_no_alloca
+; CHECK: add64 r10, -64
 ; Loading arguments
-; CHECK: ldxdw r1, [r10 - 8]
-; CHECK: ldxdw r1, [r10 - 16]
-; CHECK: ldxdw r1, [r10 - 24]
-; CHECK: ldxdw r1, [r10 - 32]
-; CHECK: ldxdw r1, [r10 - 40]
+; CHECK: ldxdw r1, [r10 + 56]
+; CHECK: ldxdw r1, [r10 + 48]
+; CHECK: ldxdw r1, [r10 + 40]
+; CHECK: ldxdw r1, [r10 + 32]
+; CHECK: ldxdw r1, [r10 + 24]
+
+; CHECK: add64 r10, 64
 entry:
   %g = add i32 %a, %b
   %h = sub i32 %g, %c
diff --git a/llvm/test/CodeGen/SBF/stack_args_v2.ll b/llvm/test/CodeGen/SBF/stack_args_v2.ll
index 942bc06756216..ba399b85e6b2b 100644
--- a/llvm/test/CodeGen/SBF/stack_args_v2.ll
+++ b/llvm/test/CodeGen/SBF/stack_args_v2.ll
@@ -3,12 +3,10 @@
 ; Function Attrs: nounwind uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK-LABEL: foo:
-; CHECK: mov64 r4, 2
-; CHECK: stxdw [r10 - 8], r4
 ; CHECK: mov64 r4, 3
-; CHECK: stxdw [r10 - 16], r4
-; CHECK: mov64 r5, r10
+; CHECK: stxdw [r10 - 8], r4
 ; CHECK: mov64 r4, 1
+; CHECK: mov64 r5, 2
 ; CHECK: call bar
 entry:
   %call = tail call i32 @bar(i32 %a, i32 %b, i32 %c, i32 1, i32 2, i32 3) #3
@@ -18,10 +16,15 @@ entry:
 ; Function Attrs: nounwind uwtable
 define i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) #1 {
 ; CHECK-LABEL: bar:
-; CHECK: ldxdw r1, [r5 - 8]
-; CHECK: sub64 r0, r1
-; CHECK: ldxdw r1, [r5 - 16]
+; CHECK: add64 r10, -64
+; CHECK: mov64 r0, r1
+; CHECK: add64 r0, r2
+; CHECK: sub64 r0, r3
+; CHECK: add64 r0, r4
+; CHECK: sub64 r0, r5
+; CHECK: ldxdw r1, [r10 + 56]
 ; CHECK: add64 r0, r1
+; CHECK: add64 r10, 64
 entry:
   %g = add i32 %a, %b
   %h = sub i32 %g, %c
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt b/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt
index d941711b1987f..5123ef093b9a5 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-pqr.txt
@@ -65,8 +65,8 @@
 # CHECK: srem32 w3, -98
 0xe6,0x03,0x00,0x00,0x9e,0xff,0xff,0xff
 
-# CHECK: srem32 w11, w10
-0xee,0xab,0x00,0x00,0x00,0x00,0x00,0x00
+# CHECK: srem32 w9, w10
+0xee,0xa9,0x00,0x00,0x00,0x00,0x00,0x00
 
 # CHECK: srem64 r7, -987
 0xf6,0x07,0x00,0x00,0x25,0xfc,0xff,0xff

From 01e340d69d4908cc9f658a6d447379bea342d40a Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Sat, 14 Dec 2024 12:25:59 -0300
Subject: [PATCH 062/114] [SOL] Revamp peephole pass for explicit sign
 extension (#119)

---
 llvm/lib/Target/SBF/SBFMIPeephole.cpp         | 191 +-----------------
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |   8 +-
 .../CodeGen/SBF/32-bit-subreg-cond-select.ll  |   4 +-
 llvm/test/CodeGen/SBF/atomics_sbf.ll          |  24 +--
 .../test/CodeGen/SBF/peephole-explict-sext.ll |  12 ++
 5 files changed, 37 insertions(+), 202 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/peephole-explict-sext.ll

diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index e88bad1e46c39..0a84933ebabab 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -51,12 +51,6 @@ struct SBFMIPeephole : public MachineFunctionPass {
 private:
   // Initialize class variables.
   void initialize(MachineFunction &MFParm);
-
-  bool isCopyFrom32Def(MachineInstr *CopyMI);
-  bool isInsnFrom32Def(MachineInstr *DefInsn);
-  bool isPhiFrom32Def(MachineInstr *MovMI);
-  bool isMovFrom32Def(MachineInstr *MovMI);
-  bool eliminateZExtSeq();
   bool eliminateZExt();
 
   std::set<MachineInstr *> PhiInsns;
@@ -70,12 +64,7 @@ struct SBFMIPeephole : public MachineFunctionPass {
 
     initialize(MF);
 
-    // First try to eliminate (zext, lshift, rshift) and then
-    // try to eliminate zext.
-    bool ZExtSeqExist, ZExtExist;
-    ZExtSeqExist = eliminateZExtSeq();
-    ZExtExist = eliminateZExt();
-    return ZExtSeqExist || ZExtExist;
+    return eliminateZExt();
   }
 };
 
@@ -87,159 +76,6 @@ void SBFMIPeephole::initialize(MachineFunction &MFParm) {
   LLVM_DEBUG(dbgs() << "*** SBF MachineSSA ZEXT Elim peephole pass ***\n\n");
 }
 
-bool SBFMIPeephole::isCopyFrom32Def(MachineInstr *CopyMI)
-{
-  MachineOperand &opnd = CopyMI->getOperand(1);
-
-  if (!opnd.isReg())
-    return false;
-
-  // Return false if getting value from a 32bit physical register.
-  // Most likely, this physical register is aliased to
-  // function call return value or current function parameters.
-  Register Reg = opnd.getReg();
-  if (!Reg.isVirtual())
-    return false;
-
-  if (MRI->getRegClass(Reg) == &SBF::GPRRegClass)
-    return false;
-
-  MachineInstr *DefInsn = MRI->getVRegDef(Reg);
-  if (!isInsnFrom32Def(DefInsn))
-    return false;
-
-  return true;
-}
-
-bool SBFMIPeephole::isPhiFrom32Def(MachineInstr *PhiMI)
-{
-  for (unsigned i = 1, e = PhiMI->getNumOperands(); i < e; i += 2) {
-    MachineOperand &opnd = PhiMI->getOperand(i);
-
-    if (!opnd.isReg())
-      return false;
-
-    MachineInstr *PhiDef = MRI->getVRegDef(opnd.getReg());
-    if (!PhiDef)
-      return false;
-    if (PhiDef->isPHI()) {
-      if (PhiInsns.find(PhiDef) != PhiInsns.end())
-        return false;
-      PhiInsns.insert(PhiDef);
-      if (!isPhiFrom32Def(PhiDef))
-        return false;
-    }
-    if (PhiDef->getOpcode() == SBF::COPY && !isCopyFrom32Def(PhiDef))
-      return false;
-  }
-
-  return true;
-}
-
-// The \p DefInsn instruction defines a virtual register.
-bool SBFMIPeephole::isInsnFrom32Def(MachineInstr *DefInsn)
-{
-  if (!DefInsn)
-    return false;
-
-  if (DefInsn->isPHI()) {
-    if (PhiInsns.find(DefInsn) != PhiInsns.end())
-      return false;
-    PhiInsns.insert(DefInsn);
-    if (!isPhiFrom32Def(DefInsn))
-      return false;
-  } else if (DefInsn->getOpcode() == SBF::COPY) {
-    if (!isCopyFrom32Def(DefInsn))
-      return false;
-  }
-
-  return true;
-}
-
-bool SBFMIPeephole::isMovFrom32Def(MachineInstr *MovMI)
-{
-  MachineInstr *DefInsn = MRI->getVRegDef(MovMI->getOperand(1).getReg());
-
-  LLVM_DEBUG(dbgs() << "  Def of Mov Src:");
-  LLVM_DEBUG(DefInsn->dump());
-
-  PhiInsns.clear();
-  if (!isInsnFrom32Def(DefInsn))
-    return false;
-
-  LLVM_DEBUG(dbgs() << "  One ZExt elim sequence identified.\n");
-
-  return true;
-}
-
-bool SBFMIPeephole::eliminateZExtSeq() {
-  MachineInstr* ToErase = nullptr;
-  bool Eliminated = false;
-
-  for (MachineBasicBlock &MBB : *MF) {
-    for (MachineInstr &MI : MBB) {
-      // If the previous instruction was marked for elimination, remove it now.
-      if (ToErase) {
-        ToErase->eraseFromParent();
-        ToErase = nullptr;
-      }
-
-      // Eliminate the 32-bit to 64-bit zero extension sequence when possible.
-      //
-      //   MOV_32_64 rB, wA
-      //   SLL_ri    rB, rB, 32
-      //   SRL_ri    rB, rB, 32
-      if (MI.getOpcode() == SBF::SRL_ri &&
-          MI.getOperand(2).getImm() == 32) {
-        Register DstReg = MI.getOperand(0).getReg();
-        Register ShfReg = MI.getOperand(1).getReg();
-        MachineInstr *SllMI = MRI->getVRegDef(ShfReg);
-
-        LLVM_DEBUG(dbgs() << "Starting SRL found:");
-        LLVM_DEBUG(MI.dump());
-
-        if (!SllMI ||
-            SllMI->isPHI() ||
-            SllMI->getOpcode() != SBF::SLL_ri ||
-            SllMI->getOperand(2).getImm() != 32)
-          continue;
-
-        LLVM_DEBUG(dbgs() << "  SLL found:");
-        LLVM_DEBUG(SllMI->dump());
-
-        MachineInstr *MovMI = MRI->getVRegDef(SllMI->getOperand(1).getReg());
-        if (!MovMI ||
-            MovMI->isPHI() ||
-            MovMI->getOpcode() != SBF::MOV_32_64)
-          continue;
-
-        LLVM_DEBUG(dbgs() << "  Type cast Mov found:");
-        LLVM_DEBUG(MovMI->dump());
-
-        Register SubReg = MovMI->getOperand(1).getReg();
-        if (!isMovFrom32Def(MovMI)) {
-          LLVM_DEBUG(dbgs()
-                     << "  One ZExt elim sequence failed qualifying elim.\n");
-          continue;
-        }
-
-        BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(SBF::SUBREG_TO_REG), DstReg)
-          .addImm(0).addReg(SubReg).addImm(SBF::sub_32);
-
-        SllMI->eraseFromParent();
-        MovMI->eraseFromParent();
-        // MI is the right shift, we can't erase it in it's own iteration.
-        // Mark it to ToErase, and erase in the next iteration.
-        ToErase = &MI;
-        ZExtElemNum++;
-        Eliminated = true;
-      }
-    }
-  }
-
-  return Eliminated;
-}
-
 bool SBFMIPeephole::eliminateZExt() {
   MachineInstr* ToErase = nullptr;
   bool Eliminated = false;
@@ -252,23 +88,15 @@ bool SBFMIPeephole::eliminateZExt() {
         ToErase = nullptr;
       }
 
-      if (MI.getOpcode() != SBF::MOV_32_64)
+      if (MI.getOpcode() != SBF::MOV_32_64_no_sext)
         continue;
 
       // Eliminate MOV_32_64 if possible.
       //   MOV_32_64 rA, wB
-      //
-      // If wB has been zero extended, replace it with a SUBREG_TO_REG.
-      // This is to workaround SBF programs where pkt->{data, data_end}
-      // is encoded as u32, but actually the verifier populates them
-      // as 64bit pointer. The MOV_32_64 will zero out the top 32 bits.
-      LLVM_DEBUG(dbgs() << "Candidate MOV_32_64 instruction:");
+      LLVM_DEBUG(dbgs() << "Candidate MOV_32_64_no_sext instruction:");
       LLVM_DEBUG(MI.dump());
 
-      if (!isMovFrom32Def(&MI))
-        continue;
-
-      LLVM_DEBUG(dbgs() << "Removing the MOV_32_64 instruction\n");
+      LLVM_DEBUG(dbgs() << "Removing the MOV_32_64_no_sext instruction\n");
 
       Register dst = MI.getOperand(0).getReg();
       Register src = MI.getOperand(1).getReg();
@@ -351,14 +179,11 @@ bool SBFMIPreEmitPeephole::eliminateRedundantMov() {
       // Eliminate identical move:
       //
       //   MOV rA, rA
-      //
-      // Note that we cannot remove
-      //   MOV_32_64  rA, wA
-      //   MOV_rr_32  wA, wA
-      // as these two instructions having side effects, zeroing out
-      // top 32 bits of rA.
+      //   MOV wA, wA
       unsigned Opcode = MI.getOpcode();
-      if (Opcode == SBF::MOV_rr) {
+      if (Opcode == SBF::MOV_rr ||
+          Opcode == SBF::MOV_rr_32_no_sext_v2 ||
+          Opcode == SBF::MOV_32_64_no_sext) {
         Register dst = MI.getOperand(0).getReg();
         Register src = MI.getOperand(1).getReg();
 
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index ced3cd528d895..3c45f98323148 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -158,12 +158,10 @@ void SBFPassConfig::addMachineSSAOptimization() {
   // Peephole ran at last.
   TargetPassConfig::addMachineSSAOptimization();
 
-//  const SBFSubtarget *Subtarget = getSBFTargetMachine().getSubtargetImpl();
+  const SBFSubtarget *Subtarget = getSBFTargetMachine().getSubtargetImpl();
   if (!DisableMIPeephole) {
-// TODO: The peephole doesn't work with explicit sign extension. A future PR
-// will revamp the implementation.
-//    if (Subtarget->getHasAlu32())
-//      addPass(createSBFMIPeepholePass());
+    if (Subtarget->getHasAlu32() && Subtarget->getHasExplicitSignExt())
+      addPass(createSBFMIPeepholePass());
     addPass(createSBFMIPeepholeTruncElimPass());
   }
 }
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
index af88048ccf37f..7cf5b774631dd 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-cond-select.ll
@@ -56,8 +56,8 @@ entry:
   ret i32 %c.d
 }
 ; CHECK-LABEL: select_cc_32
-; CHECK: mov64 r{{[0-9]+}}, w{{[0-9]+}}
-; CHECK: mov64 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: mov64 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NOT: mov64 r{{[0-9]+}}, w{{[0-9]+}}
 ; CHECK: jgt r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh64 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh64 r{{[0-9]+}}, 32
diff --git a/llvm/test/CodeGen/SBF/atomics_sbf.ll b/llvm/test/CodeGen/SBF/atomics_sbf.ll
index 7c1b599e63b78..f881b1c51f882 100644
--- a/llvm/test/CodeGen/SBF/atomics_sbf.ll
+++ b/llvm/test/CodeGen/SBF/atomics_sbf.ll
@@ -67,9 +67,9 @@ entry:
 
 ; CHECK-LABEL: test_cas_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov64 r4, w0
-; CHECK: mov64 r2, w2
-; CHECK: jeq r4, r2,
+; CHECK-NOT: mov64 r4, w0
+; CHECK-NOT: mov64 r2, w2
+; CHECK: jeq r0, r2,
 ; CHECK: mov64 w3, w0
 ; CHECK: stxw [r1 + 0], w3
 define dso_local i32 @test_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
@@ -235,10 +235,10 @@ entry:
 
 ; CHECK-LABEL: test_umin_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov64 r4, w2
-; CHECK: mov64 r5, w0
+; CHECK-NOT: mov64 r4, w2
+; CHECK-NOT: mov64 r5, w0
 ; CHECK: mov64 w3, w0
-; CHECK: jgt r4, r5,
+; CHECK: jgt r2, r0,
 ; CHECK: mov64 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umin_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
@@ -261,10 +261,10 @@ entry:
 
 ; CHECK-LABEL: test_umax_32
 ; CHECK: ldxw w0, [r1 + 0]
-; CHECK: mov64 r4, w0
-; CHECK: mov64 r5, w2
+; CHECK-NOT: mov64 r4, w0
+; CHECK-NOT: mov64 r4, w2
 ; CHECK: mov64 w3, w0
-; CHECK: jgt r4, r5
+; CHECK: jgt r0, r2
 ; CHECK: mov64 w3, w2
 ; CHECK: stxw [r1 + 0], w3
 define dso_local  i32 @test_umax_32(i32* nocapture %ptr, i32 %v) local_unnamed_addr #0 {
@@ -330,9 +330,9 @@ entry:
 
 ; CHECK-LABEL: test_weak_cas_32
 ; CHECK: ldxw w4, [r1 + 0]
-; CHECK: mov64 r5, w4
-; CHECK: mov64 r2, w2
-; CHECK: jeq r5, r2,
+; CHECK-NOT: mov64 r5, w4
+; CHECK-NOT: mov64 r2, w2
+; CHECK: jeq r4, r2,
 ; CHECK: stxw [r1 + 0], w3
 define dso_local void @test_weak_cas_32(i32* nocapture %p, i32 %old, i32 %new) local_unnamed_addr {
 entry:
diff --git a/llvm/test/CodeGen/SBF/peephole-explict-sext.ll b/llvm/test/CodeGen/SBF/peephole-explict-sext.ll
new file mode 100644
index 0000000000000..452c4cf86eac9
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/peephole-explict-sext.ll
@@ -0,0 +1,12 @@
+; RUN: llc < %s -march=sbf -mattr=+alu32,+explicit-sext | FileCheck %s
+
+define dso_local i32 @select_cc_32(i32 %a, i32 %b, i32 %c, i32 %d) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: select_cc_32
+  %cmp = icmp ugt i32 %a, %b
+; CHECK-NOT: mov64 r{{[0-9]+}}, w1
+; CHECK-NOT: mov64 r{{[0-9]+}}, w2
+; CHECK: jgt r1, r2,
+  %c.d = select i1 %cmp, i32 %c, i32 %d
+  ret i32 %c.d
+}

From b5b90fbcd41174f5af8d1bdc82fb573ce07512ea Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:16:35 -0300
Subject: [PATCH 063/114] [SOL] New encoding for memory instructions (#118)

---
 llvm/lib/Target/SBF/BTFDebug.cpp              |  26 +-
 .../SBF/Disassembler/SBFDisassembler.cpp      |  23 +
 llvm/lib/Target/SBF/SBFInstrFormats.td        |  12 +
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |  45 +-
 llvm/lib/Target/SBF/SBFInstrInfo.h            |   3 +-
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 432 +++++++++++++++---
 llvm/lib/Target/SBF/SBFMIPeephole.cpp         |  33 +-
 .../lib/Target/SBF/SBFMISimplifyPatchable.cpp |  73 ++-
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |   3 +-
 llvm/lib/Target/SBF/SBFSubtarget.h            |   4 +
 llvm/lib/Target/SBF/SBFTargetFeatures.td      |   3 +
 .../CodeGen/SBF/32-bit-subreg-load-store.ll   |   2 +
 .../CodeGen/SBF/CORE/field-reloc-st-imm.ll    |   1 +
 llvm/test/CodeGen/SBF/load.ll                 |   1 +
 llvm/test/CodeGen/SBF/many_args_new_conv.ll   |   1 +
 llvm/test/CodeGen/SBF/memcpy_16.ll            |   1 +
 llvm/test/CodeGen/SBF/preprocess-loads.ll     |   1 +
 llvm/test/CodeGen/SBF/remove_truncate_3.ll    |   1 +
 llvm/test/CodeGen/SBF/store-imm.ll            |  24 +
 llvm/test/CodeGen/SBF/undef.ll                |   1 +
 .../test/MC/Disassembler/SBF/sbf-ldst-new.txt |  62 +++
 llvm/test/MC/SBF/sbf-ldst-new.s               |  91 ++++
 22 files changed, 713 insertions(+), 130 deletions(-)
 create mode 100644 llvm/test/MC/Disassembler/SBF/sbf-ldst-new.txt
 create mode 100644 llvm/test/MC/SBF/sbf-ldst-new.s

diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index 474307284de66..de238e6f4685a 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -25,6 +25,7 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include <optional>
+#include "SBFSubtarget.h"
 
 using namespace llvm;
 using namespace BTFX;
@@ -1309,6 +1310,15 @@ void BTFDebug::processGlobalValue(const MachineOperand &MO) {
   }
 }
 
+static bool isCoreLoadOrStore(unsigned OpCode, bool NewMemEncoding) {
+  if (NewMemEncoding)
+    return OpCode == SBF::CORE_LD64_V2 || OpCode == SBF::CORE_LD32_V2 ||
+           OpCode == SBF::CORE_ST_V2;
+
+  return OpCode == SBF::CORE_LD64_V1 || OpCode == SBF::CORE_LD32_V1 ||
+         OpCode == SBF::CORE_ST_V1;
+}
+
 void BTFDebug::beginInstruction(const MachineInstr *MI) {
   DebugHandlerBase::beginInstruction(MI);
 
@@ -1329,6 +1339,10 @@ void BTFDebug::beginInstruction(const MachineInstr *MI) {
       return;
   }
 
+  bool NewMemEncoding = MI->getParent()
+                            ->getParent()
+                            ->getSubtarget<SBFSubtarget>()
+                            .getNewMemEncoding();
   if (MI->getOpcode() == SBF::LD_imm64) {
     // If the insn is "r2 = LD_imm64 @<an AmaAttr global>",
     // add this insn into the .BTF.ext FieldReloc subsection.
@@ -1345,9 +1359,7 @@ void BTFDebug::beginInstruction(const MachineInstr *MI) {
     // If the insn is "r2 = LD_imm64 @<an TypeIdAttr global>",
     // The LD_imm64 result will be replaced with a btf type id.
     processGlobalValue(MI->getOperand(1));
-  } else if (MI->getOpcode() == SBF::CORE_LD64 ||
-             MI->getOpcode() == SBF::CORE_LD32 ||
-             MI->getOpcode() == SBF::CORE_ST ||
+  } else if (isCoreLoadOrStore(MI->getOpcode(), NewMemEncoding) ||
              MI->getOpcode() == SBF::CORE_SHIFT) {
     // relocation insn is a load, store or shift insn.
     processGlobalValue(MI->getOperand(3));
@@ -1496,6 +1508,10 @@ void BTFDebug::processGlobals(bool ProcessingMapDef) {
 
 /// Emit proper patchable instructions.
 bool BTFDebug::InstLower(const MachineInstr *MI, MCInst &OutMI) {
+  bool NewMemEncoding = MI->getParent()
+                            ->getParent()
+                            ->getSubtarget<SBFSubtarget>()
+                                .getNewMemEncoding();
   if (MI->getOpcode() == SBF::LD_imm64) {
     const MachineOperand &MO = MI->getOperand(1);
     if (MO.isGlobal()) {
@@ -1525,9 +1541,7 @@ bool BTFDebug::InstLower(const MachineInstr *MI, MCInst &OutMI) {
         return true;
       }
     }
-  } else if (MI->getOpcode() == SBF::CORE_LD64 ||
-             MI->getOpcode() == SBF::CORE_LD32 ||
-             MI->getOpcode() == SBF::CORE_ST ||
+  } else if (isCoreLoadOrStore(MI->getOpcode(), NewMemEncoding) ||
              MI->getOpcode() == SBF::CORE_SHIFT) {
     const MachineOperand &MO = MI->getOperand(3);
     if (MO.isGlobal()) {
diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index a5881c0108792..f9489bc85df3e 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -68,6 +68,7 @@ class SBFDisassembler : public MCDisassembler {
   uint8_t getInstSize(uint64_t Inst) const { return (Inst >> 59) & 0x3; };
   uint8_t getInstMode(uint64_t Inst) const { return (Inst >> 61) & 0x7; };
   bool isMov32(uint64_t Inst) const { return (Inst >> 56) == 0xb4; }
+  bool isNewMem(uint64_t Inst) const;
 };
 
 } // end anonymous namespace
@@ -158,6 +159,18 @@ static DecodeStatus readInstruction64(ArrayRef<uint8_t> Bytes, uint64_t Address,
   return MCDisassembler::Success;
 }
 
+bool SBFDisassembler::isNewMem(uint64_t Inst) const {
+  uint8_t OpCode = Inst >> 56;
+
+  uint8_t LSB = OpCode & 0xf;
+  if (LSB != 0x7 && LSB != 0xc && LSB != 0xf)
+    return false;
+
+  uint8_t MSB = OpCode >> 4;
+
+  return MSB == 0x2 || MSB == 0x3 || MSB == 0x8 || MSB == 0x9;
+}
+
 DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
                                              ArrayRef<uint8_t> Bytes,
                                              uint64_t Address,
@@ -183,6 +196,16 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
            STI.hasFeature(SBF::FeatureDisableLddw))
     Result =
         decodeInstruction(DecoderTableSBFv264, Instr, Insn, Address, this, STI);
+  else if (isNewMem(Insn) && (Insn >> 60) != 0x9 &&
+           STI.hasFeature(SBF::FeatureNewMemEncoding) &&
+           STI.hasFeature(SBF::ALU32))
+    Result =
+        decodeInstruction(DecoderTableSBFALU32MEMv264,
+                          Instr, Insn, Address, this, STI);
+  else if (isNewMem(Insn) && STI.hasFeature(SBF::FeatureNewMemEncoding))
+    Result =
+        decodeInstruction(DecoderTableSBFv264,
+                          Instr, Insn, Address, this, STI);
   else
     Result =
         decodeInstruction(DecoderTableSBF64, Instr, Insn, Address, this, STI);
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
index 8a772e3bf1cc6..ae49010b6772f 100644
--- a/llvm/lib/Target/SBF/SBFInstrFormats.td
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -19,6 +19,9 @@ def SBF_JMP   : SBFOpClass<0x5>;
 def SBF_PQR   : SBFOpClass<0x6>;
 def SBF_ALU64 : SBFOpClass<0x7>;
 
+def SBF_LD_V2 : SBFOpClass<0x4>;
+def SBF_ST_V2 : SBFOpClass<0x7>;
+
 class SBFSrcType<bits<1> val> {
   bits<1> Value = val;
 }
@@ -92,6 +95,15 @@ def SBF_H  : SBFWidthModifer<0x1>;
 def SBF_B  : SBFWidthModifer<0x2>;
 def SBF_DW : SBFWidthModifer<0x3>;
 
+class SBFSizeModifier<bits<4> val> {
+  bits<4> Value = val;
+}
+
+def SBF_B_V2  : SBFSizeModifier<0x2>;
+def SBF_H_V2  : SBFSizeModifier<0x3>;
+def SBF_W_V2  : SBFSizeModifier<0x8>;
+def SBF_DW_V2 : SBFSizeModifier<0x9>;
+
 class SBFModeModifer<bits<3> val> {
   bits<3> Value = val;
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index 9e7cc61e85472..b001fd9cdce8a 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -28,8 +28,9 @@ using namespace llvm;
 SBFInstrInfo::SBFInstrInfo()
     : SBFGenInstrInfo(SBF::ADJCALLSTACKDOWN, SBF::ADJCALLSTACKUP) {}
 
-void SBFInstrInfo::setHasExplicitSignExt(bool HasExplicitSext) {
+void SBFInstrInfo::initializeTargetFeatures(bool HasExplicitSext, bool NewMemEncoding) {
   this->HasExplicitSignExt = HasExplicitSext;
+  this->NewMemEncoding = NewMemEncoding;
 }
 
 void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
@@ -60,24 +61,24 @@ void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
   DebugLoc dl = MI->getDebugLoc();
   unsigned LdOpc, StOpc;
 
+#define MEM_SWITCH(X) \
+LdOpc = NewMemEncoding ? SBF::LD##X##_V2 : SBF::LD##X##_V1; \
+StOpc = NewMemEncoding ? SBF::ST##X##_V2 : SBF::ST##X##_V1;
+
   unsigned BytesPerOp = std::min(static_cast<unsigned>(Alignment), 8u);
   switch (Alignment) {
   case 1:
-    LdOpc = SBF::LDB;
-    StOpc = SBF::STB;
+    MEM_SWITCH(B)
     break;
   case 2:
-    LdOpc = SBF::LDH;
-    StOpc = SBF::STH;
+    MEM_SWITCH(H)
     break;
   case 4:
-    LdOpc = SBF::LDW;
-    StOpc = SBF::STW;
+    MEM_SWITCH(W)
     break;
   case 8:
   case 16:
-    LdOpc = SBF::LDD;
-    StOpc = SBF::STD;
+    MEM_SWITCH(D)
     break;
   default:
     llvm_unreachable("unsupported memcpy alignment");
@@ -104,20 +105,16 @@ void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
 
   if (BytesLeft < 2) {
     Offset = CopyLen - 1;
-    LdOpc = SBF::LDB;
-    StOpc = SBF::STB;
+    MEM_SWITCH(B)
   } else if (BytesLeft <= 2) {
     Offset = CopyLen - 2;
-    LdOpc = SBF::LDH;
-    StOpc = SBF::STH;
+    MEM_SWITCH(H)
   } else if (BytesLeft <= 4) {
     Offset = CopyLen - 4;
-    LdOpc = SBF::LDW;
-    StOpc = SBF::STW;
+    MEM_SWITCH(W)
   } else if (BytesLeft <= 8) {
     Offset = CopyLen - 8;
-    LdOpc = SBF::LDD;
-    StOpc = SBF::STD;
+    MEM_SWITCH(D)
   } else {
     llvm_unreachable("There cannot be more than 8 bytes left");
   }
@@ -154,12 +151,14 @@ void SBFInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
     DL = I->getDebugLoc();
 
   if (RC == &SBF::GPRRegClass)
-    BuildMI(MBB, I, DL, get(SBF::STD))
+    BuildMI(MBB, I, DL, get(NewMemEncoding ?
+                                           SBF::STD_V2 : SBF::STD_V1))
         .addReg(SrcReg, getKillRegState(IsKill))
         .addFrameIndex(FI)
         .addImm(0);
   else if (RC == &SBF::GPR32RegClass)
-    BuildMI(MBB, I, DL, get(SBF::STW32))
+    BuildMI(MBB, I, DL, get(NewMemEncoding ?
+                                           SBF::STW32_V2 : SBF::STW32_V1))
         .addReg(SrcReg, getKillRegState(IsKill))
         .addFrameIndex(FI)
         .addImm(0);
@@ -178,9 +177,13 @@ void SBFInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
     DL = I->getDebugLoc();
 
   if (RC == &SBF::GPRRegClass)
-    BuildMI(MBB, I, DL, get(SBF::LDD), DestReg).addFrameIndex(FI).addImm(0);
+    BuildMI(MBB, I, DL, get(NewMemEncoding ?
+                                           SBF::LDD_V2 : SBF::LDD_V1),
+            DestReg).addFrameIndex(FI).addImm(0);
   else if (RC == &SBF::GPR32RegClass)
-    BuildMI(MBB, I, DL, get(SBF::LDW32), DestReg).addFrameIndex(FI).addImm(0);
+    BuildMI(MBB, I, DL, get(NewMemEncoding ?
+                                           SBF::LDW32_V2 : SBF::LDW32_V1),
+            DestReg).addFrameIndex(FI).addImm(0);
   else
     llvm_unreachable("Can't load this register from stack slot");
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index 5c4afdb2a2578..a6ee6ad4767f2 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -58,11 +58,12 @@ class SBFInstrInfo : public SBFGenInstrInfo {
                         MachineBasicBlock *FBB, ArrayRef<MachineOperand> Cond,
                         const DebugLoc &DL,
                         int *BytesAdded = nullptr) const override;
-  void setHasExplicitSignExt(bool HasExplicitSext);
+  void initializeTargetFeatures(bool HasExplicitSext, bool NewMemEncoding);
 
 private:
   void expandMEMCPY(MachineBasicBlock::iterator) const;
   bool HasExplicitSignExt;
+  bool NewMemEncoding;
 };
 }
 
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index f50a10a89f01b..057c92327a929 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -67,6 +67,8 @@ def SBFNoPqrInstr : Predicate<"!Subtarget->getHasPqrClass()">;
 def SBFHasStoreImm : Predicate<"Subtarget->getHasStoreImm()">;
 def SBFExplicitSignExt : Predicate<"Subtarget->getHasExplicitSignExt()">;
 def SBFNoExplicitSignExt : Predicate<"!Subtarget->getHasExplicitSignExt()">;
+def SBFNewMemEncoding : Predicate<"Subtarget->getNewMemEncoding()">, AssemblerPredicate<(all_of FeatureNewMemEncoding)>;
+def SBFOldMemEncoding : Predicate<"!Subtarget->getNewMemEncoding()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -173,6 +175,22 @@ class TYPE_LD_ST<bits<3> mode, bits<2> size,
   let Inst{60-59} = size;
 }
 
+//For load and store instructions in SBFv2 the 8-bit 'code' field is divided as:
+//
+//  +--------+---------------+-------------------+
+//  | 4 bits | 1 bit         |   3 bits          |
+//  |  size  |  source type  | instruction class |
+//  +--------+---------------+-------------------+
+//  (MSB)                             (LSB)
+class TYPE_LD_ST_V2<bits<4> size, bits<1> srctype,
+                 dag outs, dag ins, string asmstr, list<dag> pattern>
+  : InstSBF<outs, ins, asmstr, pattern> {
+
+  let Inst{63-60} = size;
+  let Inst{59} = srctype;
+}
+
+
 // jump instructions
 class JMP_RR<SBFJumpOp Opc, string Mnemonic, PatLeaf Cond>
     : TYPE_ALU_JMP<Opc.Value, SBF_X.Value,
@@ -474,12 +492,12 @@ def LD_pseudo
 }
 
 // STORE instructions
-class STORE<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
+class STORE_V1<SBFWidthModifer SizeOp, string Mnemonic>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins GPR:$src, MEMri:$addr),
                  Mnemonic # " [$addr], $src",
-                 Pattern> {
+                 []> {
   bits<4> src;
   bits<20> addr;
 
@@ -489,23 +507,68 @@ class STORE<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
   let SBFClass = SBF_STX;
 }
 
-class STOREi64<SBFWidthModifer Opc, string Mnemonic, PatFrag OpNode>
-    : STORE<Opc, Mnemonic, [(OpNode GPR:$src, ADDRri:$addr)]>;
+class STORE_V2<SBFSizeModifier SizeOp, string Mnemonic>
+    : TYPE_LD_ST_V2<SizeOp.Value, SBF_X.Value,
+                 (outs),
+                 (ins GPR:$src, MEMri:$addr),
+                 Mnemonic # " [$addr], $src",
+                 []> {
+  bits<4> src;
+  bits<20> addr;
+
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = src;
+  let Inst{47-32} = addr{15-0}; // offset
+  let SBFClass = SBF_ST_V2;
+}
+
+multiclass STOREi64<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2,
+                                    string Mnemonic> {
+    def _V1 : STORE_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
 
-let Predicates = [SBFNoALU32] in {
-  def STW : STOREi64<SBF_W, "stxw", truncstorei32>;
-  def STH : STOREi64<SBF_H, "stxh", truncstorei16>;
-  def STB : STOREi64<SBF_B, "stxb", truncstorei8>;
+    let DecoderNamespace = "SBFv2" in {
+        def _V2 : STORE_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
+    }
 }
-def STD : STOREi64<SBF_DW, "stxdw", store>;
 
-class STORE_imm<SBFWidthModifer SizeOp,
-                string Mnemonic, dag Pattern>
+
+defm STW : STOREi64<SBF_W, SBF_W_V2, "stxw">;
+defm STH : STOREi64<SBF_H, SBF_H_V2, "stxh">;
+defm STB : STOREi64<SBF_B, SBF_B_V2, "stxb">;
+defm STD : STOREi64<SBF_DW, SBF_DW_V2, "stxdw">;
+
+def : Pat<(store GPR:$src, ADDRri:$addr),
+                 (STD_V1 GPR:$src, ADDRri:$addr)>, Requires<[SBFOldMemEncoding]>;
+
+def : Pat<(store GPR:$src, ADDRri:$addr),
+                 (STD_V2 GPR:$src, ADDRri:$addr)>, Requires<[SBFNewMemEncoding]>;
+
+let Predicates = [SBFNoALU32, SBFOldMemEncoding] in {
+    def : Pat<(truncstorei32 GPR:$src, ADDRri:$addr),
+                (STW_V1 GPR:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei16 GPR:$src, ADDRri:$addr),
+                (STH_V1 GPR:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei8 GPR:$src, ADDRri:$addr),
+                (STB_V1 GPR:$src, ADDRri:$addr)>;
+}
+
+let Predicates = [SBFNoALU32, SBFNewMemEncoding] in {
+    def : Pat<(truncstorei32 GPR:$src, ADDRri:$addr),
+                (STW_V2 GPR:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei16 GPR:$src, ADDRri:$addr),
+                (STH_V2 GPR:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei8 GPR:$src, ADDRri:$addr),
+                (STB_V2 GPR:$src, ADDRri:$addr)>;
+}
+
+
+class STORE_imm_V1<SBFWidthModifer SizeOp,
+                string Mnemonic>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins i64imm:$imm, MEMri:$addr),
                  Mnemonic # " [$addr], $imm",
-                 [Pattern]> {
+                 []> {
   bits<20> addr;
   bits<32> imm;
   let Inst{51-48} = addr{19-16}; // base reg
@@ -514,6 +577,30 @@ class STORE_imm<SBFWidthModifer SizeOp,
   let SBFClass = SBF_ST;
 }
 
+class STORE_imm_V2<SBFSizeModifier SizeOp,
+                string Mnemonic>
+    : TYPE_LD_ST_V2<SizeOp.Value, SBF_K.Value,
+                 (outs),
+                 (ins i64imm:$imm, MEMri:$addr),
+                 Mnemonic # " [$addr], $imm",
+                 []> {
+  bits<20> addr;
+  bits<32> imm;
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{47-32} = addr{15-0};  // offset
+  let Inst{31-0} = imm;
+  let SBFClass = SBF_ST_V2;
+}
+
+multiclass STORE_imm<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2,
+                    string Mnemonic> {
+    def _V1 : STORE_imm_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+
+    let DecoderNamespace = "SBFv2" in {
+      def _V2 : STORE_imm_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
+    }
+}
+
 // Opcode (SBF_ST | SBF_MEM | SBF_DW) implies sign extension for
 // value stored to memory:
 // - it is fine to generate such write when immediate is -1
@@ -526,29 +613,68 @@ class STORE_imm<SBFWidthModifer SizeOp,
 //   stx [rb], rA
 //
 // For SBF_{B,H,W} the size of value stored matches size of the immediate.
-let Predicates = [SBFHasStoreImm] in {
-    def STD_imm : STORE_imm<SBF_DW, "stdw", (store         (i64 i64immSExt32:$imm), ADDRri:$addr)>;
-    def STW_imm : STORE_imm<SBF_W,  "stw",  (truncstorei32 (i64 i64immZExt32:$imm), ADDRri:$addr)>;
-    def STH_imm : STORE_imm<SBF_H,  "sth",  (truncstorei16 (i64 i64immZExt32:$imm), ADDRri:$addr)>;
-    def STB_imm : STORE_imm<SBF_B,  "stb",  (truncstorei8  (i64 i64immZExt32:$imm), ADDRri:$addr)>;
+defm STD_imm : STORE_imm<SBF_DW, SBF_DW_V2, "stdw">;
+defm STW_imm : STORE_imm<SBF_W, SBF_W_V2,  "stw">;
+defm STH_imm : STORE_imm<SBF_H, SBF_H_V2, "sth">;
+defm STB_imm : STORE_imm<SBF_B, SBF_B_V2,  "stb">;
+
+let Predicates = [SBFHasStoreImm, SBFOldMemEncoding] in {
+  def : Pat<(store (i64 i64immSExt32:$imm), ADDRri:$addr),
+            (STD_imm_V1 (i64 imm:$imm), ADDRri:$addr)>;
+  def : Pat<(truncstorei32 (i64 i64immZExt32:$imm), ADDRri:$addr),
+            (STW_imm_V1 (i64 imm:$imm), ADDRri:$addr)>;
+  def : Pat<(truncstorei16 (i64 i64immZExt32:$imm), ADDRri:$addr),
+            (STH_imm_V1 (i64 imm:$imm), ADDRri:$addr)>;
+  def : Pat<(truncstorei8  (i64 i64immZExt32:$imm), ADDRri:$addr),
+              (STB_imm_V1 (i64 imm:$imm), ADDRri:$addr)>;
+}
+
+let Predicates = [SBFHasStoreImm, SBFNewMemEncoding] in {
+  def : Pat<(store (i64 i64immSExt32:$imm), ADDRri:$addr),
+            (STD_imm_V2 (i64 imm:$imm), ADDRri:$addr)>;
+  def : Pat<(truncstorei32 (i64 i64immZExt32:$imm), ADDRri:$addr),
+            (STW_imm_V2 (i64 imm:$imm), ADDRri:$addr)>;
+  def : Pat<(truncstorei16 (i64 i64immZExt32:$imm), ADDRri:$addr),
+            (STH_imm_V2 (i64 imm:$imm), ADDRri:$addr)>;
+  def : Pat<(truncstorei8  (i64 i64immZExt32:$imm), ADDRri:$addr),
+              (STB_imm_V2 (i64 imm:$imm), ADDRri:$addr)>;
+}
+
+let Predicates = [SBFHasStoreImm, SBFNewMemEncoding] in {
+  def : Pat<(store (i32 imm:$src), ADDRri:$dst),
+            (STW_imm_V2 (imm_to_i64 $src), ADDRri:$dst)>;
+  def : Pat<(truncstorei16 (i32 imm:$src), ADDRri:$dst),
+            (STH_imm_V2 (imm_to_i64 imm:$src), ADDRri:$dst)>;
+  def : Pat<(truncstorei8 (i32 imm:$src), ADDRri:$dst),
+            (STB_imm_V2 (imm_to_i64 imm:$src), ADDRri:$dst)>;
 }
 
-let Predicates = [SBFHasALU32, SBFHasStoreImm] in {
+
+let Predicates = [SBFHasALU32, SBFHasStoreImm, SBFOldMemEncoding] in {
   def : Pat<(store (i32 imm:$src), ADDRri:$dst),
-            (STW_imm (imm_to_i64 $src), ADDRri:$dst)>;
+            (STW_imm_V1 (imm_to_i64 $src), ADDRri:$dst)>;
   def : Pat<(truncstorei16 (i32 imm:$src), ADDRri:$dst),
-            (STH_imm (imm_to_i64 imm:$src), ADDRri:$dst)>;
+            (STH_imm_V1 (imm_to_i64 imm:$src), ADDRri:$dst)>;
   def : Pat<(truncstorei8 (i32 imm:$src), ADDRri:$dst),
-            (STB_imm (imm_to_i64 imm:$src), ADDRri:$dst)>;
+            (STB_imm_V1 (imm_to_i64 imm:$src), ADDRri:$dst)>;
+}
+
+let Predicates = [SBFHasALU32, SBFHasStoreImm, SBFNewMemEncoding] in {
+  def : Pat<(store (i32 imm:$src), ADDRri:$dst),
+            (STW_imm_V2 (imm_to_i64 $src), ADDRri:$dst)>;
+  def : Pat<(truncstorei16 (i32 imm:$src), ADDRri:$dst),
+            (STH_imm_V2 (imm_to_i64 imm:$src), ADDRri:$dst)>;
+  def : Pat<(truncstorei8 (i32 imm:$src), ADDRri:$dst),
+            (STB_imm_V2 (imm_to_i64 imm:$src), ADDRri:$dst)>;
 }
 
 // LOAD instructions
-class LOAD<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
+class LOAD_V1<SBFWidthModifer SizeOp, string Mnemonic>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs GPR:$dst),
                  (ins MEMri:$addr),
                  Mnemonic # " $dst, [$addr]",
-                 Pattern> {
+                 []> {
   bits<4> dst;
   bits<20> addr;
 
@@ -558,25 +684,59 @@ class LOAD<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
   let SBFClass = SBF_LDX;
 }
 
-class LOADi64<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
-    : LOAD<SizeOp, Mnemonic, [(set i64:$dst, (OpNode ADDRri:$addr))]>;
+class LOAD_V2<SBFSizeModifier SizeOp, string Mnemonic>
+    : TYPE_LD_ST_V2<SizeOp.Value, SBF_X.Value,
+                 (outs GPR:$dst),
+                 (ins MEMri:$addr),
+                 Mnemonic # " $dst, [$addr]",
+                 []> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = dst;
+  let Inst{55-52} = addr{19-16};
+  let Inst{47-32} = addr{15-0};
+  let SBFClass = SBF_LD_V2;
+}
+
+multiclass LOADi64<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2, string Mnemonic> {
+  def _V1 : LOAD_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+
+  let DecoderNamespace = "SBFv2" in {
+     def _V2 : LOAD_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
+  }
+}
 
 let isCodeGenOnly = 1 in {
-  class CORE_LD<RegisterClass RegClass, string Sz>
-                : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
-                            (outs RegClass:$dst),
-                            (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
-                            "$dst = core_ld"#Sz#"($opcode, $src, $offset)",
-                            []>;
+  multiclass CORE_LD<RegisterClass RegClass, string Sz> {
+     def _V1 : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
+                                       (outs RegClass:$dst),
+                                       (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
+                                       "$dst = core_ld"#Sz#"($opcode, $src, $offset)",
+                                       []>;
+
+     def _V2 : TYPE_LD_ST_V2<SBF_W_V2.Value, SBF_X.Value,
+                                    (outs RegClass:$dst),
+                                    (ins u64imm:$opcode, GPR:$src, u64imm:$offset),
+                                    "$dst = core_ld"#Sz#"($opcode, $src, $offset)",
+                                       []>;
+  }
 
-  def CORE_LD64 : CORE_LD<GPR, "64">;
-  def CORE_LD32 : CORE_LD<GPR32, "32">;
+  defm CORE_LD64 : CORE_LD<GPR, "64">;
+  defm CORE_LD32 : CORE_LD<GPR32, "32">;
 
-  def CORE_ST   : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
+  def CORE_ST_V1   : TYPE_LD_ST<SBF_MEM.Value, SBF_W.Value,
                              (outs),
                              (ins gpr_or_imm:$src, u64imm:$opcode, GPR:$ptr, u64imm:$offset),
                              "core_st($src, $opcode, $ptr, $offset)",
                              []>;
+
+  def CORE_ST_V2   : TYPE_LD_ST_V2<SBF_W_V2.Value, SBF_X.Value,
+                             (outs),
+                             (ins gpr_or_imm:$src, u64imm:$opcode, GPR:$ptr, u64imm:$offset),
+                             "core_st($src, $opcode, $ptr, $offset)",
+                             []>;
+
   let Constraints = "$dst = $src" in {
     def CORE_SHIFT : MATH_RR<SBF_ALU64, SBF_LSH,
                              (outs GPR:$dst),
@@ -586,13 +746,34 @@ let isCodeGenOnly = 1 in {
   }
 }
 
-let Predicates = [SBFNoALU32] in {
-  def LDW : LOADi64<SBF_W, "ldxw", zextloadi32>;
-  def LDH : LOADi64<SBF_H, "ldxh", zextloadi16>;
-  def LDB : LOADi64<SBF_B, "ldxb", zextloadi8>;
+defm LDW : LOADi64<SBF_W, SBF_W_V2, "ldxw">;
+defm LDH : LOADi64<SBF_H, SBF_H_V2, "ldxh">;
+defm LDB : LOADi64<SBF_B, SBF_B_V2, "ldxb">;
+defm LDD : LOADi64<SBF_DW, SBF_DW_V2, "ldxdw">;
+
+def : Pat<(load ADDRri:$addr),
+                 (LDD_V1 ADDRri:$addr)>, Requires<[SBFOldMemEncoding]>;
+
+def : Pat<(load ADDRri:$addr),
+                 (LDD_V2 ADDRri:$addr)>, Requires<[SBFNewMemEncoding]>;
+
+let Predicates = [SBFNoALU32, SBFOldMemEncoding] in {
+    def : Pat<(zextloadi32 ADDRri:$addr),
+                (LDW_V1 ADDRri:$addr)>;
+    def : Pat<(zextloadi16 ADDRri:$addr),
+                (LDH_V1 ADDRri:$addr)>;
+    def : Pat<(zextloadi8 ADDRri:$addr),
+                (LDB_V1 ADDRri:$addr)>;
 }
 
-def LDD : LOADi64<SBF_DW, "ldxdw", load>;
+let Predicates = [SBFNoALU32, SBFNewMemEncoding] in {
+    def : Pat<(zextloadi32 ADDRri:$addr),
+                (LDW_V2 ADDRri:$addr)>;
+    def : Pat<(zextloadi16 ADDRri:$addr),
+                (LDH_V2 ADDRri:$addr)>;
+    def : Pat<(zextloadi8 ADDRri:$addr),
+                (LDB_V2 ADDRri:$addr)>;
+}
 
 class BRANCH<SBFJumpOp Opc, string Mnemonic, list<dag> Pattern>
     : TYPE_ALU_JMP<Opc.Value, SBF_K.Value,
@@ -753,10 +934,16 @@ def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>, Requires<[SBFNoCallxSrc]>;
 def : Pat<(SBFcall GPR:$dst), (JALX_v2 GPR:$dst)>, Requires<[SBFCallxSrc]>;
 
 // Loads
-let Predicates = [SBFNoALU32] in {
-  def : Pat<(i64 (extloadi8  ADDRri:$src)), (i64 (LDB ADDRri:$src))>;
-  def : Pat<(i64 (extloadi16 ADDRri:$src)), (i64 (LDH ADDRri:$src))>;
-  def : Pat<(i64 (extloadi32 ADDRri:$src)), (i64 (LDW ADDRri:$src))>;
+let Predicates = [SBFNoALU32, SBFOldMemEncoding] in {
+  def : Pat<(i64 (extloadi8  ADDRri:$src)), (i64 (LDB_V1 ADDRri:$src))>;
+  def : Pat<(i64 (extloadi16 ADDRri:$src)), (i64 (LDH_V1 ADDRri:$src))>;
+  def : Pat<(i64 (extloadi32 ADDRri:$src)), (i64 (LDW_V1 ADDRri:$src))>;
+}
+
+let Predicates = [SBFNoALU32, SBFNewMemEncoding] in {
+  def : Pat<(i64 (extloadi8  ADDRri:$src)), (i64 (LDB_V2 ADDRri:$src))>;
+  def : Pat<(i64 (extloadi16 ADDRri:$src)), (i64 (LDH_V2 ADDRri:$src))>;
+  def : Pat<(i64 (extloadi32 ADDRri:$src)), (i64 (LDW_V2 ADDRri:$src))>;
 }
 
 // Atomic XADD for SBFNoALU32
@@ -1078,12 +1265,12 @@ def : Pat<(i64 (anyext GPR32:$src)),
 def : Pat<(i64 (anyext GPR32:$src)),
           (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>, Requires<[SBFNoExplicitSignExt]>;
 
-class STORE32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
+class STORE32_V1<SBFWidthModifer SizeOp, string Mnemonic>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                  (outs),
                  (ins GPR32:$src, MEMri:$addr),
                  Mnemonic # " [$addr], $src",
-                 Pattern> {
+                 []> {
   bits<4> src;
   bits<20> addr;
 
@@ -1093,21 +1280,61 @@ class STORE32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
   let SBFClass = SBF_STX;
 }
 
-class STOREi32<SBFWidthModifer Opc, string Mnemonic, PatFrag OpNode>
-    : STORE32<Opc, Mnemonic, [(OpNode GPR32:$src, ADDRri:$addr)]>;
+class STORE32_V2<SBFSizeModifier SizeOp, string Mnemonic>
+    : TYPE_LD_ST_V2<SizeOp.Value,
+                 SBF_X.Value,
+                 (outs),
+                 (ins GPR32:$src, MEMri:$addr),
+                 Mnemonic # " [$addr], $src",
+                 []> {
+  bits<4> src;
+  bits<20> addr;
 
-let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-  def STW32 : STOREi32<SBF_W, "stxw", store>;
-  def STH32 : STOREi32<SBF_H, "stxh", truncstorei16>;
-  def STB32 : STOREi32<SBF_B, "stxb", truncstorei8>;
+  let Inst{51-48} = addr{19-16}; // base reg
+  let Inst{55-52} = src;
+  let Inst{47-32} = addr{15-0}; // offset
+  let SBFClass = SBF_ST_V2;
+}
+
+multiclass STOREi32<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2,
+                                    string Mnemonic> {
+    let DecoderNamespace = "SBFALU32" in {
+      def _V1 : STORE32_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+    }
+
+    let DecoderNamespace = "SBFALU32MEMv2" in {
+      def _V2 : STORE32_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
+    }
 }
 
-class LOAD32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
+defm STW32 : STOREi32<SBF_W, SBF_W_V2, "stxw">;
+defm STH32 : STOREi32<SBF_H, SBF_H_V2, "stxh">;
+defm STB32 : STOREi32<SBF_B, SBF_B_V2, "stxb">;
+
+let Predicates = [SBFHasALU32, SBFOldMemEncoding] in {
+    def : Pat<(store GPR32:$src, ADDRri:$addr),
+                (STW32_V1 GPR32:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei16 GPR32:$src, ADDRri:$addr),
+                (STH32_V1 GPR32:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei8 GPR32:$src, ADDRri:$addr),
+                (STB32_V1 GPR32:$src, ADDRri:$addr)>;
+}
+
+let Predicates = [SBFHasALU32, SBFNewMemEncoding] in {
+    def : Pat<(store GPR32:$src, ADDRri:$addr),
+                (STW32_V2 GPR32:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei16 GPR32:$src, ADDRri:$addr),
+                (STH32_V2 GPR32:$src, ADDRri:$addr)>;
+    def : Pat<(truncstorei8 GPR32:$src, ADDRri:$addr),
+                (STB32_V2 GPR32:$src, ADDRri:$addr)>;
+}
+
+class LOAD32_V1<SBFWidthModifer SizeOp, string Mnemonic>
     : TYPE_LD_ST<SBF_MEM.Value, SizeOp.Value,
                 (outs GPR32:$dst),
                 (ins MEMri:$addr),
                 Mnemonic # " $dst, [$addr]",
-                Pattern> {
+                []> {
   bits<4> dst;
   bits<20> addr;
 
@@ -1117,36 +1344,99 @@ class LOAD32<SBFWidthModifer SizeOp, string Mnemonic, list<dag> Pattern>
   let SBFClass = SBF_LDX;
 }
 
-class LOADi32<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
-    : LOAD32<SizeOp, Mnemonic, [(set i32:$dst, (OpNode ADDRri:$addr))]>;
+class LOAD32_V2<SBFSizeModifier SizeOp, string Mnemonic>
+    : TYPE_LD_ST_V2<SizeOp.Value, SBF_X.Value,
+                (outs GPR32:$dst),
+                (ins MEMri:$addr),
+                Mnemonic # " $dst, [$addr]",
+                []> {
+  bits<4> dst;
+  bits<20> addr;
+
+  let Inst{51-48} = dst;
+  let Inst{55-52} = addr{19-16};
+  let Inst{47-32} = addr{15-0};
+  let SBFClass = SBF_LD_V2;
+}
 
-let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-  def LDW32 : LOADi32<SBF_W, "ldxw", load>;
-  def LDH32 : LOADi32<SBF_H, "ldxh", zextloadi16>;
-  def LDB32 : LOADi32<SBF_B, "ldxb", zextloadi8>;
+
+multiclass LOADi32<SBFWidthModifer SizeV1, SBFSizeModifier SizeV2,
+                                    string Mnemonic> {
+ let DecoderNamespace = "SBFALU32" in {
+    def _V1 : LOAD32_V1<SizeV1, Mnemonic>, Requires<[SBFOldMemEncoding]>;
+ }
+ let DecoderNamespace = "SBFALU32MEMv2" in {
+   def _V2 : LOAD32_V2<SizeV2, Mnemonic>, Requires<[SBFNewMemEncoding]>;
+ }
+}
+
+
+defm LDW32 : LOADi32<SBF_W, SBF_W_V2, "ldxw">;
+defm LDH32 : LOADi32<SBF_H, SBF_H_V2, "ldxh">;
+defm LDB32 : LOADi32<SBF_B, SBF_B_V2, "ldxb">;
+
+let Predicates = [SBFHasALU32, SBFOldMemEncoding] in {
+    def : Pat<(load ADDRri:$addr),
+                (LDW32_V1 ADDRri:$addr)>;
+    def : Pat<(zextloadi16 ADDRri:$addr),
+                (LDH32_V1 ADDRri:$addr)>;
+    def : Pat<(zextloadi8 ADDRri:$addr),
+                (LDB32_V1 ADDRri:$addr)>;
+}
+
+let Predicates = [SBFHasALU32, SBFNewMemEncoding] in {
+    def : Pat<(load ADDRri:$addr),
+                (LDW32_V2 ADDRri:$addr)>;
+    def : Pat<(zextloadi16 ADDRri:$addr),
+                (LDH32_V2 ADDRri:$addr)>;
+    def : Pat<(zextloadi8 ADDRri:$addr),
+                (LDB32_V2 ADDRri:$addr)>;
+}
+
+let Predicates = [SBFHasALU32, SBFOldMemEncoding] in {
+  def : Pat<(truncstorei8 GPR:$src, ADDRri:$dst),
+            (STB32_V1 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(truncstorei16 GPR:$src, ADDRri:$dst),
+            (STH32_V1 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(truncstorei32 GPR:$src, ADDRri:$dst),
+            (STW32_V1 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(i32 (extloadi8 ADDRri:$src)), (i32 (LDB32_V1 ADDRri:$src))>;
+  def : Pat<(i32 (extloadi16 ADDRri:$src)), (i32 (LDH32_V1 ADDRri:$src))>;
+  def : Pat<(i64 (zextloadi8  ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDB32_V1 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (zextloadi16 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDH32_V1 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (zextloadi32 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDW32_V1 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (extloadi8  ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDB32_V1 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (extloadi16 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDH32_V1 ADDRri:$src), sub_32)>;
+  def : Pat<(i64 (extloadi32 ADDRri:$src)),
+            (SUBREG_TO_REG (i64 0), (LDW32_V1 ADDRri:$src), sub_32)>;
 }
 
-let Predicates = [SBFHasALU32] in {
+let Predicates = [SBFHasALU32, SBFNewMemEncoding] in {
   def : Pat<(truncstorei8 GPR:$src, ADDRri:$dst),
-            (STB32 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+            (STB32_V2 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
   def : Pat<(truncstorei16 GPR:$src, ADDRri:$dst),
-            (STH32 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+            (STH32_V2 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
   def : Pat<(truncstorei32 GPR:$src, ADDRri:$dst),
-            (STW32 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
-  def : Pat<(i32 (extloadi8 ADDRri:$src)), (i32 (LDB32 ADDRri:$src))>;
-  def : Pat<(i32 (extloadi16 ADDRri:$src)), (i32 (LDH32 ADDRri:$src))>;
+            (STW32_V2 (EXTRACT_SUBREG GPR:$src, sub_32), ADDRri:$dst)>;
+  def : Pat<(i32 (extloadi8 ADDRri:$src)), (i32 (LDB32_V2 ADDRri:$src))>;
+  def : Pat<(i32 (extloadi16 ADDRri:$src)), (i32 (LDH32_V2 ADDRri:$src))>;
   def : Pat<(i64 (zextloadi8  ADDRri:$src)),
-            (SUBREG_TO_REG (i64 0), (LDB32 ADDRri:$src), sub_32)>;
+            (SUBREG_TO_REG (i64 0), (LDB32_V2 ADDRri:$src), sub_32)>;
   def : Pat<(i64 (zextloadi16 ADDRri:$src)),
-            (SUBREG_TO_REG (i64 0), (LDH32 ADDRri:$src), sub_32)>;
+            (SUBREG_TO_REG (i64 0), (LDH32_V2 ADDRri:$src), sub_32)>;
   def : Pat<(i64 (zextloadi32 ADDRri:$src)),
-            (SUBREG_TO_REG (i64 0), (LDW32 ADDRri:$src), sub_32)>;
+            (SUBREG_TO_REG (i64 0), (LDW32_V2 ADDRri:$src), sub_32)>;
   def : Pat<(i64 (extloadi8  ADDRri:$src)),
-            (SUBREG_TO_REG (i64 0), (LDB32 ADDRri:$src), sub_32)>;
+            (SUBREG_TO_REG (i64 0), (LDB32_V2 ADDRri:$src), sub_32)>;
   def : Pat<(i64 (extloadi16 ADDRri:$src)),
-            (SUBREG_TO_REG (i64 0), (LDH32 ADDRri:$src), sub_32)>;
+            (SUBREG_TO_REG (i64 0), (LDH32_V2 ADDRri:$src), sub_32)>;
   def : Pat<(i64 (extloadi32 ADDRri:$src)),
-            (SUBREG_TO_REG (i64 0), (LDW32 ADDRri:$src), sub_32)>;
+            (SUBREG_TO_REG (i64 0), (LDW32_V2 ADDRri:$src), sub_32)>;
 }
 
 let usesCustomInserter = 1, isCodeGenOnly = 1 in {
diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index 0a84933ebabab..13caaf29f8b52 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -245,16 +245,28 @@ struct SBFMIPeepholeTruncElim : public MachineFunctionPass {
   }
 };
 
-static bool TruncSizeCompatible(int TruncSize, unsigned opcode)
+static bool TruncSizeCompatible(int TruncSize, unsigned opcode, bool NewEncoding)
 {
-  if (TruncSize == 1)
-    return opcode == SBF::LDB || opcode == SBF::LDB32;
+  if (TruncSize == 1) {
+    if (NewEncoding)
+      return opcode == SBF::LDB_V2 || opcode == SBF::LDB32_V2;
 
-  if (TruncSize == 2)
-    return opcode == SBF::LDH || opcode == SBF::LDH32;
+    return opcode == SBF::LDB_V1 || opcode == SBF::LDB32_V1;
+  }
+
+  if (TruncSize == 2) {
+    if (NewEncoding)
+      return opcode == SBF::LDH_V2 || opcode == SBF::LDH32_V2;
+
+    return opcode == SBF::LDH_V1 || opcode == SBF::LDH32_V1;
+  }
+
+  if (TruncSize == 4) {
+    if (NewEncoding)
+      return opcode == SBF::LDW_V2 || opcode == SBF::LDW32_V2;
 
-  if (TruncSize == 4)
-    return opcode == SBF::LDW || opcode == SBF::LDW32;
+    return opcode == SBF::LDW_V1 || opcode == SBF::LDW32_V1;
+  }
 
   return false;
 }
@@ -281,6 +293,7 @@ bool SBFMIPeepholeTruncElim::eliminateTruncSeq() {
   MachineInstr* ToErase = nullptr;
   bool Eliminated = false;
 
+  bool NewEncoding = MF->getSubtarget<SBFSubtarget>().getNewMemEncoding();
   for (MachineBasicBlock &MBB : *MF) {
     for (MachineInstr &MI : MBB) {
       // The second insn to remove if the eliminate candidate is a pair.
@@ -348,7 +361,8 @@ bool SBFMIPeepholeTruncElim::eliminateTruncSeq() {
 
           MachineInstr *PhiDef = MRI->getVRegDef(opnd.getReg());
           if (!PhiDef || PhiDef->isPHI() ||
-              !TruncSizeCompatible(TruncSize, PhiDef->getOpcode())) {
+              !TruncSizeCompatible(TruncSize,
+                                   PhiDef->getOpcode(), NewEncoding)) {
             CheckFail = true;
             break;
           }
@@ -356,7 +370,8 @@ bool SBFMIPeepholeTruncElim::eliminateTruncSeq() {
 
         if (CheckFail)
           continue;
-      } else if (!TruncSizeCompatible(TruncSize, DefMI->getOpcode())) {
+      } else if (!TruncSizeCompatible(TruncSize,
+                                      DefMI->getOpcode(), NewEncoding)) {
         continue;
       }
 
diff --git a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
index 358b7c2e4e013..449be751eba97 100644
--- a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
+++ b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
@@ -92,31 +92,57 @@ void SBFMISimplifyPatchable::initialize(MachineFunction &MFParm) {
   LLVM_DEBUG(dbgs() << "*** SBF simplify patchable insts pass ***\n\n");
 }
 
-static bool isST(unsigned Opcode) {
-  return Opcode == SBF::STB_imm || Opcode == SBF::STH_imm ||
-         Opcode == SBF::STW_imm || Opcode == SBF::STD_imm;
+static bool isST(unsigned Opcode, bool NewEncoding) {
+  if (NewEncoding) {
+    return Opcode == SBF::STB_imm_V2 || Opcode == SBF::STH_imm_V2 ||
+           Opcode == SBF::STW_imm_V2 || Opcode == SBF::STD_imm_V2;
+  }
+
+  return Opcode == SBF::STB_imm_V1 || Opcode == SBF::STH_imm_V1 ||
+         Opcode == SBF::STW_imm_V1 || Opcode == SBF::STD_imm_V1;
 }
 
-static bool isSTX32(unsigned Opcode) {
-  return Opcode == SBF::STB32 || Opcode == SBF::STH32 || Opcode == SBF::STW32;
+static bool isSTX32(unsigned Opcode, bool NewEncoding) {
+  if (NewEncoding) {
+    return Opcode == SBF::STB32_V2 || Opcode == SBF::STH32_V2
+           || Opcode == SBF::STW32_V2;
+  }
+  return Opcode == SBF::STB32_V1 || Opcode == SBF::STH32_V1
+         || Opcode == SBF::STW32_V1;
 }
 
-static bool isSTX64(unsigned Opcode) {
-  return Opcode == SBF::STB || Opcode == SBF::STH || Opcode == SBF::STW ||
-         Opcode == SBF::STD;
+static bool isSTX64(unsigned Opcode, bool NewEncoding) {
+  if (NewEncoding) {
+    return Opcode == SBF::STB_V2 || Opcode == SBF::STH_V2 ||
+           Opcode == SBF::STW_V2 ||Opcode == SBF::STD_V2;
+  }
+
+  return Opcode == SBF::STB_V1 || Opcode == SBF::STH_V1 ||
+         Opcode == SBF::STW_V1 ||Opcode == SBF::STD_V1;
 }
 
-static bool isLDX32(unsigned Opcode) {
-  return Opcode == SBF::LDB32 || Opcode == SBF::LDH32 || Opcode == SBF::LDW32;
+static bool isLDX32(unsigned Opcode, bool NewEncoding) {
+  if (NewEncoding)
+    return Opcode == SBF::LDB32_V2 || Opcode == SBF::LDH32_V2 ||
+           Opcode == SBF::LDW32_V2;
+
+  return Opcode == SBF::LDB32_V1 || Opcode == SBF::LDH32_V1 ||
+         Opcode == SBF::LDW32_V1;
 }
 
-static bool isLDX64(unsigned Opcode) {
-  return Opcode == SBF::LDB || Opcode == SBF::LDH || Opcode == SBF::LDW ||
-         Opcode == SBF::LDD;
+static bool isLDX64(unsigned Opcode, bool NewEncoding) {
+  if (NewEncoding)
+    return Opcode == SBF::LDB_V2 || Opcode == SBF::LDH_V2 ||
+           Opcode == SBF::LDW_V2 || Opcode == SBF::LDD_V2;
+
+  return Opcode == SBF::LDB_V1 || Opcode == SBF::LDH_V1 ||
+         Opcode == SBF::LDW_V1 || Opcode == SBF::LDD_V1;
 }
 
 bool SBFMISimplifyPatchable::isLoadInst(unsigned Opcode) {
-  return isLDX32(Opcode) || isLDX64(Opcode);
+  bool NewMemEncoding = MF->getSubtarget<SBFSubtarget>().getNewMemEncoding();
+  return isLDX32(Opcode, NewMemEncoding) ||
+         isLDX64(Opcode, NewMemEncoding);
 }
 
 void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
@@ -127,6 +153,8 @@ void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
   const MachineOperand *BaseOp = (RelocOp == Op1) ? Op2 : Op1;
 
   // Go through all uses of %1 as in %1 = ADD_rr %2, %3
+  const SBFSubtarget& SubTarget = MF->getSubtarget<SBFSubtarget>();
+  bool NewMemEncoding = SubTarget.getNewMemEncoding();
   const MachineOperand Op0 = Inst->getOperand(0);
   for (MachineOperand &MO :
        llvm::make_early_inc_range(MRI->use_operands(Op0.getReg()))) {
@@ -137,12 +165,14 @@ void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
     MachineInstr *DefInst = MO.getParent();
     unsigned Opcode = DefInst->getOpcode();
     unsigned COREOp;
-    if (isLDX64(Opcode))
-      COREOp = SBF::CORE_LD64;
-    else if (isLDX32(Opcode))
-      COREOp = SBF::CORE_LD32;
-    else if (isSTX64(Opcode) || isSTX32(Opcode) || isST(Opcode))
-      COREOp = SBF::CORE_ST;
+    if (isLDX64(Opcode, NewMemEncoding))
+      COREOp = NewMemEncoding ? SBF::CORE_LD64_V2 : SBF::CORE_LD64_V1;
+    else if (isLDX32(Opcode, NewMemEncoding))
+      COREOp = NewMemEncoding ? SBF::CORE_LD32_V2 : SBF::CORE_LD32_V1;
+    else if (isSTX64(Opcode, NewMemEncoding) ||
+             isSTX32(Opcode, NewMemEncoding) ||
+             isST(Opcode, NewMemEncoding))
+      COREOp = NewMemEncoding ? SBF::CORE_ST_V2 : SBF::CORE_ST_V1;
     else
       continue;
 
@@ -154,7 +184,8 @@ void SBFMISimplifyPatchable::checkADDrr(MachineRegisterInfo *MRI,
     // Reject the form:
     //   %1 = ADD_rr %2, %3
     //   *(type *)(%2 + 0) = %1
-    if (isSTX64(Opcode) || isSTX32(Opcode)) {
+    if (isSTX64(Opcode, NewMemEncoding) ||
+        isSTX32(Opcode, NewMemEncoding)) {
       const MachineOperand &Opnd = DefInst->getOperand(0);
       if (Opnd.isReg() && Opnd.getReg() == MO.getReg())
         continue;
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index ff2c27df0d781..5d3e24fef099c 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -30,7 +30,7 @@ SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT,
                                                             StringRef FS) {
   initializeEnvironment(TT);
   initSubtargetFeatures(CPU, FS);
-  InstrInfo.setHasExplicitSignExt(HasExplicitSignExt);
+  InstrInfo.initializeTargetFeatures(HasExplicitSignExt, NewMemEncoding);
   return *this;
 }
 
@@ -49,6 +49,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasStoreImm = false;
   HasAlu32 = false;
   HasExplicitSignExt = false;
+  NewMemEncoding = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index be578f8e993ce..f30fcf5160709 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -80,6 +80,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether we have the explicit sign extension instruction (mov32)
   bool HasExplicitSignExt;
 
+  // Whether we enable the new encoding for memory instructions
+  bool NewMemEncoding;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -103,6 +106,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasPqrClass() const { return HasPqrClass; }
   bool getHasStoreImm() const { return HasStoreImm; }
   bool getHasExplicitSignExt() const { return HasExplicitSignExt; }
+  bool getNewMemEncoding() const { return NewMemEncoding; }
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
     return &FrameLowering;
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index dc2cf380600b8..a11b0aacbbd17 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -46,6 +46,9 @@ def FeatureStoreImm : SubtargetFeature<"store-imm", "HasStoreImm", "true",
 def FeatureExplicitSext : SubtargetFeature<"explicit-sext", "HasExplicitSignExt",
                     "true", "Enable the explicit sign extension instruction mov32">;
 
+def FeatureNewMemEncoding : SubtargetFeature<"mem-encoding", "NewMemEncoding",
+                                       "true", "Enable the new encoding for memory instructions">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
index e4fcde383c02f..c79daf1fd995d 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-load-store.ll
@@ -1,4 +1,6 @@
 ; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mattr=+alu32,+mem-encoding < %s | FileCheck %s
+
 ;
 ; unsigned char loadu8(unsigned char *p)
 ; {
diff --git a/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll b/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll
index ab5a6a68f2b22..7f76a4b92957b 100644
--- a/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll
+++ b/llvm/test/CodeGen/SBF/CORE/field-reloc-st-imm.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -march=sbf -mattr=+store-imm -sbf-enable-btf-emission < %s | FileCheck %s
+; RUN: llc -march=sbf -mattr=+store-imm,+mem-encoding -sbf-enable-btf-emission < %s | FileCheck %s
 
 ; Make sure that CO-RE relocations had been generated correctly for
 ; BPF_ST (store immediate) instructions and that
diff --git a/llvm/test/CodeGen/SBF/load.ll b/llvm/test/CodeGen/SBF/load.ll
index 9710b7df111ef..0084b2ab72dfe 100644
--- a/llvm/test/CodeGen/SBF/load.ll
+++ b/llvm/test/CodeGen/SBF/load.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -march=sbf | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+mem-encoding | FileCheck %s
 
 define i16 @am1(i16* %a) nounwind {
   %1 = load i16, i16* %a
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index b2a7fbe5ff863..0fe748a6266f0 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -O2 -march=sbf -mcpu=sbfv2 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=sbfv2 -mattr=+mem-encoding < %s | FileCheck %s
 
 ; Function Attrs: nounwind uwtable
 define i32 @caller_no_alloca(i32 %a, i32 %b, i32 %c) #0 {
diff --git a/llvm/test/CodeGen/SBF/memcpy_16.ll b/llvm/test/CodeGen/SBF/memcpy_16.ll
index 4cfa911aab191..678fb7aa28790 100644
--- a/llvm/test/CodeGen/SBF/memcpy_16.ll
+++ b/llvm/test/CodeGen/SBF/memcpy_16.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -march=sbf -sbf-expand-memcpy-in-order | FileCheck %s
+; RUN: llc < %s -march=sbf -sbf-expand-memcpy-in-order -mattr=+mem-encoding | FileCheck %s
 
 ; Function Attrs: mustprogress nocallback nofree nounwind willreturn memory(argmem: readwrite)
 declare void @llvm.memcpy.p0.p0.i64(ptr noalias nocapture writeonly, ptr noalias nocapture readonly, i64, i1 immarg) #1
diff --git a/llvm/test/CodeGen/SBF/preprocess-loads.ll b/llvm/test/CodeGen/SBF/preprocess-loads.ll
index f36e2a976ec74..7c7dc12b7cd54 100644
--- a/llvm/test/CodeGen/SBF/preprocess-loads.ll
+++ b/llvm/test/CodeGen/SBF/preprocess-loads.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -O2 -march=sbf -filetype=asm < %s | FileCheck --check-prefix=CHECK %s
+; RUN: llc -O2 -march=sbf -filetype=asm -mattr=+mem-encoding < %s | FileCheck --check-prefix=CHECK %s
 
 %Pool = type <{ [0 x i8], [32 x i8], [0 x i8], i8, [0 x i8], [10 x %Decimal], [0 x i8] }>
 %Decimal = type { [0 x i32], i32, [0 x i32], i32, [0 x i32], i32, [0 x i32], i32, [0 x i32] }
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_3.ll b/llvm/test/CodeGen/SBF/remove_truncate_3.ll
index 336015266607b..ec8888cde7f2f 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_3.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_3.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+mem-encoding -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct xdp_md {
diff --git a/llvm/test/CodeGen/SBF/store-imm.ll b/llvm/test/CodeGen/SBF/store-imm.ll
index 37b0bb1a32edb..fe31bbbdbbebe 100644
--- a/llvm/test/CodeGen/SBF/store-imm.ll
+++ b/llvm/test/CodeGen/SBF/store-imm.ll
@@ -1,11 +1,15 @@
 ; RUN: llc < %s -march=sbf -mattr=+store-imm -show-mc-encoding | FileCheck %s
 ; RUN: llc < %s -march=sbf -mattr=+store-imm,+alu32 -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -march=sbf -mattr=+store-imm,+mem-encoding -show-mc-encoding | FileCheck --check-prefix=CHECK-V2 %s
 
 define void @byte(ptr %p0) {
 ; CHECK-LABEL: byte:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    stb [r1 + 0], 1       # encoding: [0x72,0x01,0x00,0x00,0x01,0x00,0x00,0x00]
 ; CHECK-NEXT:    stb [r1 + 1], 255     # encoding: [0x72,0x01,0x01,0x00,0xff,0x00,0x00,0x00]
+
+; CHECK-V2:    stb [r1 + 0], 1       # encoding: [0x27,0x01,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-V2:    stb [r1 + 1], 255     # encoding: [0x27,0x01,0x01,0x00,0xff,0x00,0x00,0x00]
   %p1 = getelementptr i8, ptr %p0, i32 1
   store volatile i8  1, ptr %p0, align 1
   store volatile i8 -1, ptr %p1, align 1
@@ -16,6 +20,9 @@ define void @half(ptr, ptr %p0) {
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    sth [r2 + 0], 1          # encoding: [0x6a,0x02,0x00,0x00,0x01,0x00,0x00,0x00]
 ; CHECK-NEXT:    sth [r2 + 2], 65535      # encoding: [0x6a,0x02,0x02,0x00,0xff,0xff,0x00,0x00]
+
+; CHECK-V2:    sth [r2 + 0], 1          # encoding: [0x37,0x02,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-V2:    sth [r2 + 2], 65535      # encoding: [0x37,0x02,0x02,0x00,0xff,0xff,0x00,0x00]
   %p1 = getelementptr i8, ptr %p0, i32 2
   store volatile i16  1, ptr %p0, align 2
   store volatile i16 -1, ptr %p1, align 2
@@ -29,6 +36,12 @@ define void @word(ptr, ptr, ptr %p0) {
 ; CHECK-NEXT:    stw [r3 + 8], -2000000000  # encoding: [0x62,0x03,0x08,0x00,0x00,0x6c,0xca,0x88]
 ; CHECK-NEXT:    stw [r3 + 12], -1          # encoding: [0x62,0x03,0x0c,0x00,0xff,0xff,0xff,0xff]
 ; CHECK-NEXT:    stw [r3 + 12], 0           # encoding: [0x62,0x03,0x0c,0x00,0x00,0x00,0x00,0x00]
+
+; CHECK-V2:    stw [r3 + 0], 1            # encoding: [0x87,0x03,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-V2:    stw [r3 + 4], -1           # encoding: [0x87,0x03,0x04,0x00,0xff,0xff,0xff,0xff]
+; CHECK-V2:    stw [r3 + 8], -2000000000  # encoding: [0x87,0x03,0x08,0x00,0x00,0x6c,0xca,0x88]
+; CHECK-V2:    stw [r3 + 12], -1          # encoding: [0x87,0x03,0x0c,0x00,0xff,0xff,0xff,0xff]
+; CHECK-V2:    stw [r3 + 12], 0           # encoding: [0x87,0x03,0x0c,0x00,0x00,0x00,0x00,0x00]
   %p1 = getelementptr i8, ptr %p0, i32 4
   %p2 = getelementptr i8, ptr %p0, i32 8
   %p3 = getelementptr i8, ptr %p0, i32 12
@@ -48,6 +61,13 @@ define void @dword(ptr, ptr, ptr, ptr %p0) {
 ; CHECK-NEXT:    stdw [r4 + 16], -2000000000  # encoding: [0x7a,0x04,0x10,0x00,0x00,0x6c,0xca,0x88]
 ; CHECK-NEXT:    lddw r1, 4294967295          # encoding: [0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 ; CHECK-NEXT:    stxdw [r4 + 24], r1          # encoding: [0x7b,0x14,0x18,0x00,0x00,0x00,0x00,0x00]
+
+; CHECK-V2:    stdw [r4 + 0], 1             # encoding: [0x97,0x04,0x00,0x00,0x01,0x00,0x00,0x00]
+; CHECK-V2:    stdw [r4 + 8], -1            # encoding: [0x97,0x04,0x08,0x00,0xff,0xff,0xff,0xff]
+; CHECK-V2:    stdw [r4 + 16], 2000000000   # encoding: [0x97,0x04,0x10,0x00,0x00,0x94,0x35,0x77]
+; CHECK-V2:    stdw [r4 + 16], -2000000000  # encoding: [0x97,0x04,0x10,0x00,0x00,0x6c,0xca,0x88]
+; CHECK-V2:    lddw r1, 4294967295          # encoding: [0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-V2:    stxdw [r4 + 24], r1          # encoding: [0x9f,0x14,0x18,0x00,0x00,0x00,0x00,0x00]
   %p1 = getelementptr i8, ptr %p0, i32 8
   %p2 = getelementptr i8, ptr %p0, i32 16
   %p3 = getelementptr i8, ptr %p0, i32 24
@@ -66,6 +86,10 @@ define void @unaligned(ptr %p0) {
 ; CHECK-NEXT:  sth [r1 + 0], 65534          # encoding: [0x6a,0x01,0x00,0x00,0xfe,0xff,0x00,0x00]
 ; CHECK-NEXT:  stw [r1 + 8], -2             # encoding: [0x62,0x01,0x08,0x00,0xfe,0xff,0xff,0xff]
 ; CHECK-NEXT:  stdw [r1 + 16], -2           # encoding: [0x7a,0x01,0x10,0x00,0xfe,0xff,0xff,0xff]
+
+; CHECK-V2:  sth [r1 + 0], 65534          # encoding: [0x37,0x01,0x00,0x00,0xfe,0xff,0x00,0x00]
+; CHECK-V2:  stw [r1 + 8], -2             # encoding: [0x87,0x01,0x08,0x00,0xfe,0xff,0xff,0xff]
+; CHECK-V2:  stdw [r1 + 16], -2           # encoding: [0x97,0x01,0x10,0x00,0xfe,0xff,0xff,0xff]
   %p1 = getelementptr i8, ptr %p0, i32 8
   %p2 = getelementptr i8, ptr %p0, i32 16
   store volatile i16 -2, ptr %p0, align 1
diff --git a/llvm/test/CodeGen/SBF/undef.ll b/llvm/test/CodeGen/SBF/undef.ll
index e3fcffdd92e75..1bf9360e1419b 100644
--- a/llvm/test/CodeGen/SBF/undef.ll
+++ b/llvm/test/CodeGen/SBF/undef.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -march=sbf | FileCheck -check-prefixes=CHECK %s
+; RUN: llc < %s -march=sbf -mattr=+mem-encoding | FileCheck -check-prefixes=CHECK %s
 
 %struct.bpf_map_def = type { i32, i32, i32, i32 }
 %struct.__sk_buff = type opaque
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-ldst-new.txt b/llvm/test/MC/Disassembler/SBF/sbf-ldst-new.txt
new file mode 100644
index 0000000000000..54f903f72cc11
--- /dev/null
+++ b/llvm/test/MC/Disassembler/SBF/sbf-ldst-new.txt
@@ -0,0 +1,62 @@
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+mem-encoding,+pqr-instr \
+# RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+alu32,+mem-encoding,+pqr-instr \
+# RUN:                          | FileCheck %s --check-prefix=CHECK32-NEW
+
+
+# CHECK-NEW: ldxb r6, [r1 + 17]
+# CHECK-NEW: ldxb r1, [r10 - 3]
+# CHECK-NEW: ldxh r8, [r2 + 32]
+# CHECK-NEW: ldxw r4, [r3 + 64]
+# CHECK-NEW: ldxdw r0, [r4 + 128]
+0x2c,0x16,0x11,0x00,0x00,0x00,0x00,0x00
+0x2c,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00
+0x3c,0x28,0x20,0x00,0x00,0x00,0x00,0x00
+0x8c,0x34,0x40,0x00,0x00,0x00,0x00,0x00
+0x9c,0x40,0x80,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK32-NEW: ldxb w6, [r1 + 17]
+# CHECK32-NEW: ldxb w1, [r10 - 3]
+# CHECK32-NEW: ldxh w8, [r2 + 32]
+# CHECK32-NEW: ldxw w4, [r3 + 64]
+0x2c,0x16,0x11,0x00,0x00,0x00,0x00,0x00
+0x2c,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00
+0x3c,0x28,0x20,0x00,0x00,0x00,0x00,0x00
+0x8c,0x34,0x40,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK-NEW: stxb [r1 + 17], r6
+# CHECK-NEW: stxb [r10 - 3], r1
+# CHECK-NEW: stxh [r2 + 32], r8
+# CHECK-NEW: stxw [r3 + 64], r4
+# CHECK-NEW: stxdw [r4 + 128], r0
+0x2f,0x61,0x11,0x00,0x00,0x00,0x00,0x00
+0x2f,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00
+0x3f,0x82,0x20,0x00,0x00,0x00,0x00,0x00
+0x8f,0x43,0x40,0x00,0x00,0x00,0x00,0x00
+0x9f,0x04,0x80,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK32-NEW: stxb [r1 + 17], w6
+# CHECK32-NEW: stxb [r10 - 3], w1
+# CHECK32-NEW: stxh [r2 + 32], w8
+# CHECK32-NEW: stxw [r3 + 64], w4
+0x2f,0x61,0x11,0x00,0x00,0x00,0x00,0x00
+0x2f,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00
+0x3f,0x82,0x20,0x00,0x00,0x00,0x00,0x00
+0x8f,0x43,0x40,0x00,0x00,0x00,0x00,0x00
+
+
+
+# CHECK-NEW: stb [r10 - 8], 2
+# CHECK-NEW: sth [r9 + 4], -20
+# CHECK-NEW: stw [r4 - 16], 34
+# CHECK-NEW: stdw [r1 + 24], 65534
+0x27,0x0a,0xf8,0xff,0x02,0x00,0x00,0x00
+0x37,0x09,0x04,0x00,0xec,0xff,0xff,0xff
+0x87,0x04,0xf0,0xff,0x22,0x00,0x00,0x00
+0x97,0x01,0x18,0x00,0xfe,0xff,0x00,0x00
\ No newline at end of file
diff --git a/llvm/test/MC/SBF/sbf-ldst-new.s b/llvm/test/MC/SBF/sbf-ldst-new.s
new file mode 100644
index 0000000000000..5c2ac216f709f
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-ldst-new.s
@@ -0,0 +1,91 @@
+# RUN: llvm-mc %s -triple=sbf-solana-solana -mattr=+mem-encoding,+pqr-instr --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana -mcpu=sbfv2 -mattr=+mem-encoding,+pqr-instr -filetype=obj \
+# RUN:     | llvm-objdump --mattr=+mem-encoding,+pqr-instr -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
+# RUN: llvm-mc %s -triple=sbf-solana-solana -mattr=+alu32,+mem-encoding,+pqr-instr --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK32-ASM-NEW
+# RUN: llvm-mc %s -triple=sbf-solana-solana -mcpu=sbfv2 -mattr=+alu32,+mem-encoding,+pqr-instr -filetype=obj \
+# RUN:     | llvm-objdump --mattr=+mem-encoding,+pqr-instr,+alu32 -d -r - \
+# RUN:     | FileCheck --check-prefix=CHECK32-OBJ-NEW %s
+
+
+
+# CHECK-OBJ-NEW: ldxb r6, [r1 + 0x11]
+# CHECK-OBJ-NEW: ldxb r1, [r10 - 0x3]
+# CHECK-OBJ-NEW: ldxh r8, [r2 + 0x20]
+# CHECK-OBJ-NEW: ldxw r4, [r3 + 0x40]
+# CHECK-OBJ-NEW: ldxdw r0, [r4 + 0x80]
+# CHECK-ASM-NEW: encoding: [0x2c,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x2c,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x3c,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x8c,0x34,0x40,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x9c,0x40,0x80,0x00,0x00,0x00,0x00,0x00]
+ldxb r6, [r1 + 17]
+ldxb r1, [r10 - 3]
+ldxh r8, [r2 + 32]
+ldxw r4, [r3 + 64]
+ldxdw r0, [r4 + 128]
+
+
+
+# CHECK32-OBJ-NEW: ldxb w6, [r1 + 0x11]
+# CHECK32-OBJ-NEW: ldxb w1, [r10 - 0x3]
+# CHECK32-OBJ-NEW: ldxh w8, [r2 + 0x20]
+# CHECK32-OBJ-NEW: ldxw w4, [r3 + 0x40]
+# CHECK32-ASM-NEW: encoding: [0x2c,0x16,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x2c,0xa1,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x3c,0x28,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x8c,0x34,0x40,0x00,0x00,0x00,0x00,0x00]
+ldxb w6, [r1 + 17]
+ldxb w1, [r10 - 3]
+ldxh w8, [r2 + 32]
+ldxw w4, [r3 + 64]
+
+
+
+# CHECK-OBJ-NEW: stxb [r1 + 0x11], r6
+# CHECK-OBJ-NEW: stxb [r10 - 0x3], r1
+# CHECK-OBJ-NEW: stxh [r2 + 0x20], r8
+# CHECK-OBJ-NEW: stxw [r3 + 0x40], r4
+# CHECK-OBJ-NEW: stxdw [r4 + 0x80], r0
+# CHECK-ASM-NEW: encoding: [0x2f,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x2f,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x3f,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x8f,0x43,0x40,0x00,0x00,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x9f,0x04,0x80,0x00,0x00,0x00,0x00,0x00]
+stxb [r1 + 17], r6
+stxb [r10 - 3], r1
+stxh [r2 + 32], r8
+stxw [r3 + 64], r4
+stxdw [r4 + 128], r0
+
+
+
+# CHECK32-OBJ-NEW: stxb [r1 + 0x11], w6
+# CHECK32-OBJ-NEW: stxb [r10 - 0x3], w1
+# CHECK32-OBJ-NEW: stxh [r2 + 0x20], w8
+# CHECK32-OBJ-NEW: stxw [r3 + 0x40], w4
+# CHECK32-ASM-NEW: encoding: [0x2f,0x61,0x11,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x2f,0x1a,0xfd,0xff,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x3f,0x82,0x20,0x00,0x00,0x00,0x00,0x00]
+# CHECK32-ASM-NEW: encoding: [0x8f,0x43,0x40,0x00,0x00,0x00,0x00,0x00]
+stxb [r1 + 17], w6
+stxb [r10 - 3], w1
+stxh [r2 + 32], w8
+stxw [r3 + 64], w4
+
+
+
+# CHECK-OBJ-NEW: stb [r10 - 0x8], 0x2
+# CHECK-OBJ-NEW: sth [r9 + 0x4], -0x14
+# CHECK-OBJ-NEW: stw [r4 - 0x10], 0x22
+# CHECK-OBJ-NEW: stdw [r1 + 0x18], 0xfffe
+# CHECK-ASM-NEW: encoding: [0x27,0x0a,0xf8,0xff,0x02,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x37,0x09,0x04,0x00,0xec,0xff,0xff,0xff]
+# CHECK-ASM-NEW: encoding: [0x87,0x04,0xf0,0xff,0x22,0x00,0x00,0x00]
+# CHECK-ASM-NEW: encoding: [0x97,0x01,0x18,0x00,0xfe,0xff,0x00,0x00]
+stb [r10 - 8], 2
+sth [r9 + 4], -20
+stw [r4 - 16], 34
+stdw [r1 + 24], 65534
\ No newline at end of file

From 3b6b9fb8ae9cf4748f9ccee53da1dd47111489e7 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:38:05 -0300
Subject: [PATCH 064/114] [SOL] Implement return instruction (#120)

---
 llvm/lib/Target/SBF/SBFInstrInfo.td         | 23 ++++++++++++++++++---
 llvm/lib/Target/SBF/SBFSubtarget.h          |  1 +
 llvm/test/CodeGen/SBF/objdump_cond_op.ll    |  2 +-
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll  |  2 +-
 llvm/test/CodeGen/SBF/objdump_static_var.ll |  2 +-
 llvm/test/CodeGen/SBF/objdump_trivial.ll    |  4 ++--
 llvm/test/CodeGen/SBF/return_instr.ll       | 14 +++++++++++++
 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt   |  3 +++
 llvm/test/MC/SBF/sbf-return.s               |  6 ++++++
 9 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/return_instr.ll
 create mode 100644 llvm/test/MC/SBF/sbf-return.s

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 057c92327a929..b9e667070d9b5 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -69,6 +69,8 @@ def SBFExplicitSignExt : Predicate<"Subtarget->getHasExplicitSignExt()">;
 def SBFNoExplicitSignExt : Predicate<"!Subtarget->getHasExplicitSignExt()">;
 def SBFNewMemEncoding : Predicate<"Subtarget->getNewMemEncoding()">, AssemblerPredicate<(all_of FeatureNewMemEncoding)>;
 def SBFOldMemEncoding : Predicate<"!Subtarget->getNewMemEncoding()">;
+def SBFHasStaticSyscalls : Predicate<"Subtarget->getHasStaticSyscalls()">;
+def SBFNoStaticSyscalls : Predicate<"!Subtarget->getHasStaticSyscalls()">;
 
 def brtarget : Operand<OtherVT> {
   let PrintMethod = "printBrTargetOperand";
@@ -854,7 +856,7 @@ class NOP_I<string OpcodeStr>
 let hasSideEffects = 0, isCodeGenOnly = 1 in
   def NOP : NOP_I<"nop">;
 
-class RET<string OpcodeStr>
+class EXIT<string OpcodeStr>
     : TYPE_ALU_JMP<SBF_EXIT.Value, SBF_K.Value,
                    (outs),
                    (ins),
@@ -865,8 +867,23 @@ class RET<string OpcodeStr>
 }
 
 let isReturn = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1,
-    isNotDuplicable = 1 in {
-  def RET : RET<"exit">;
+    isNotDuplicable = 1, Predicates = [SBFNoStaticSyscalls] in {
+  def EXIT : EXIT<"exit">;
+}
+
+class RETURN<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_EXIT.Value, SBF_X.Value,
+                   (outs),
+                   (ins),
+                   !strconcat(OpcodeStr, ""),
+                   [(SBFretglue)]> {
+  let Inst{31-0} = 0;
+  let SBFClass = SBF_JMP;
+}
+
+let isReturn = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1,
+    isNotDuplicable = 1, Predicates = [SBFHasStaticSyscalls] in {
+  def RETURN : RETURN<"return">;
 }
 
 // ADJCALLSTACKDOWN/UP pseudo insns
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index f30fcf5160709..518ca7e2e193c 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -107,6 +107,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasStoreImm() const { return HasStoreImm; }
   bool getHasExplicitSignExt() const { return HasExplicitSignExt; }
   bool getNewMemEncoding() const { return NewMemEncoding; }
+  bool getHasStaticSyscalls() const { return HasStaticSyscalls; }
   const SBFInstrInfo *getInstrInfo() const override { return &InstrInfo; }
   const SBFFrameLowering *getFrameLowering() const override {
     return &FrameLowering;
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index d753f24656512..ecabfee937e28 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -67,6 +67,6 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
   ret i32 %16
 ; CHECK-LABEL: <LBB0_5>:
-; CHECK: exit
+; CHECK: return
 }
 attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
index a887dc2d8f38a..085d617baa792 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -33,6 +33,6 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
   ret i32 %14
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: exit
+; CHECK: return
 }
 attributes #0 = { norecurse nounwind readnone }
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index 26d645ae8147f..f65e775e3afc7 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -23,7 +23,7 @@ define dso_local i32 @test() local_unnamed_addr #0 {
   %4 = add i32 %2, %3
 ; CHECK: add64 r0, r1
   ret i32 %4
-; CHECK: exit
+; CHECK: return
 }
 
 attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_trivial.ll b/llvm/test/CodeGen/SBF/objdump_trivial.ll
index ba3006923e5a5..4cc2140198338 100644
--- a/llvm/test/CodeGen/SBF/objdump_trivial.ll
+++ b/llvm/test/CodeGen/SBF/objdump_trivial.ll
@@ -2,9 +2,9 @@
 
 ; CHECK: jsgt r2, r1,
 ; CHECK: call 0x1
-; CHECK: exit
+; CHECK: return
 ; CHECK: call 0x2
-; CHECK: exit
+; CHECK: return
 
 define void @foo(i32 %a) {
 %b = icmp sgt i32 %a, -1
diff --git a/llvm/test/CodeGen/SBF/return_instr.ll b/llvm/test/CodeGen/SBF/return_instr.ll
new file mode 100644
index 0000000000000..b3dcd72410142
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/return_instr.ll
@@ -0,0 +1,14 @@
+; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck --check-prefix=CHECK-V1 %s
+; RUN: llc < %s -march=sbf -mattr=+static-syscalls -show-mc-encoding | FileCheck --check-prefix=CHECK-V2 %s
+
+define dso_local i64 @rem(i64 %a) local_unnamed_addr #0 {
+entry:
+; CHECK-LABEL: rem
+  %rem = urem i64 %a, 15
+
+; CHECK-V1: exit    # encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-V2: return  # encoding: [0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+
+
+  ret i64 %rem
+}
\ No newline at end of file
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
index 33a35d36a7a63..278ed8d3774da 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
@@ -108,3 +108,6 @@
 
 # CHECK-NEW: exit
 0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+
+# CHECK-NEW: return
+0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/sbf-return.s b/llvm/test/MC/SBF/sbf-return.s
new file mode 100644
index 0000000000000..11e333f76983e
--- /dev/null
+++ b/llvm/test/MC/SBF/sbf-return.s
@@ -0,0 +1,6 @@
+# RUN: llvm-mc -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj -o %t %s
+# RUN: llvm-objdump -d -r %t | FileCheck --check-prefix=CHECK %s
+
+return
+
+// CHECK: 9d 00 00 00 00 00 00 00	return
\ No newline at end of file

From a2c0d8489a39e9d595c7757ac57b422cc7a38238 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 19 Dec 2024 11:33:17 -0300
Subject: [PATCH 065/114] [SOL] Implement syscall instruction (#121)

* Implement static syscalls

* Rename syscall and return

* Remove external call from v3 and use pointer value directly
---
 .../SBF/Disassembler/SBFDisassembler.cpp      |  4 +-
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 11 +++-
 llvm/lib/Target/SBF/SBFISelLowering.h         |  3 +-
 llvm/lib/Target/SBF/SBFInstrFormats.td        | 27 +++++-----
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 22 +++++++-
 llvm/test/CodeGen/SBF/call_internal.ll        | 15 +++---
 llvm/test/CodeGen/SBF/static_syscall.ll       | 25 ++++++++++
 llvm/test/CodeGen/SBF/static_syscall_2.ll     | 50 +++++++++++++++++++
 llvm/test/MC/Disassembler/SBF/sbf-jmp.txt     |  6 +++
 llvm/test/MC/SBF/insn-unit.s                  |  4 +-
 llvm/test/MC/SBF/sbf-jmp.s                    |  4 +-
 .../{sbf-return.s => sbf-return-syscall.s}    |  2 +
 12 files changed, 143 insertions(+), 30 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/static_syscall.ll
 create mode 100644 llvm/test/CodeGen/SBF/static_syscall_2.ll
 rename llvm/test/MC/SBF/{sbf-return.s => sbf-return-syscall.s} (77%)

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index f9489bc85df3e..327b6a9b8588a 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -69,6 +69,7 @@ class SBFDisassembler : public MCDisassembler {
   uint8_t getInstMode(uint64_t Inst) const { return (Inst >> 61) & 0x7; };
   bool isMov32(uint64_t Inst) const { return (Inst >> 56) == 0xb4; }
   bool isNewMem(uint64_t Inst) const;
+  bool isSyscallOrExit(uint64_t Inst) const { return (Inst >> 56) == 0x95; }
 };
 
 } // end anonymous namespace
@@ -202,7 +203,8 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
     Result =
         decodeInstruction(DecoderTableSBFALU32MEMv264,
                           Instr, Insn, Address, this, STI);
-  else if (isNewMem(Insn) && STI.hasFeature(SBF::FeatureNewMemEncoding))
+  else if ((isNewMem(Insn) && STI.hasFeature(SBF::FeatureNewMemEncoding)) ||
+           (isSyscallOrExit(Insn) && STI.hasFeature(SBF::FeatureStaticSyscalls)))
     Result =
         decodeInstruction(DecoderTableSBFv264,
                           Instr, Insn, Address, this, STI);
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 94b4c3f2bbcc6..fd160e6032b8f 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -592,11 +592,16 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // If the callee is a GlobalAddress node (quite common, every direct call is)
   // turn it into a TargetGlobalAddress node so that legalize doesn't hack it.
   // Likewise ExternalSymbol -> TargetExternalSymbol.
+  unsigned NodeCode = SBFISD::CALL;
   if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee)) {
     Callee = DAG.getTargetGlobalAddress(G->getGlobal(), CLI.DL, PtrVT,
                                         G->getOffset(), 0);
   } else if (ExternalSymbolSDNode *E = dyn_cast<ExternalSymbolSDNode>(Callee)) {
     Callee = DAG.getTargetExternalSymbol(E->getSymbol(), PtrVT, 0);
+  } else if (isa<ConstantSDNode>(Callee) && Subtarget->getHasStaticSyscalls()) {
+    // When static syscalls are enabled and we have a constant operand for call,
+    // we emit a syscall.
+    NodeCode = SBFISD::SYSCALL;
   }
 
   // Returns a chain & a flag for retval copy to use.
@@ -610,14 +615,14 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   for (auto &Reg : RegsToPass)
     Ops.push_back(DAG.getRegister(Reg.first, Reg.second.getValueType()));
 
-  if (HasStackArgs) {
+  if (HasStackArgs && !Subtarget->getHasDynamicFrames()) {
     Ops.push_back(DAG.getRegister(SBF::R5, MVT::i64));
   }
 
   if (InGlue.getNode())
     Ops.push_back(InGlue);
 
-  Chain = DAG.getNode(SBFISD::CALL, CLI.DL, NodeTys, Ops);
+  Chain = DAG.getNode(NodeCode, CLI.DL, NodeTys, Ops);
   InGlue = Chain.getValue(1);
 
   DAG.addNoMergeSiteInfo(Chain.getNode(), CLI.NoMerge);
@@ -919,6 +924,8 @@ const char *SBFTargetLowering::getTargetNodeName(unsigned Opcode) const {
     return "SBFISD::Wrapper";
   case SBFISD::MEMCPY:
     return "SBFISD::MEMCPY";
+  case SBFISD::SYSCALL:
+    return "SBFISD::SYSCALL";
   }
   return nullptr;
 }
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index ef4449bada44b..561af2a0aa569 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -28,7 +28,8 @@ enum NodeType : unsigned {
   SELECT_CC,
   BR_CC,
   Wrapper,
-  MEMCPY
+  MEMCPY,
+  SYSCALL,
 };
 }
 
diff --git a/llvm/lib/Target/SBF/SBFInstrFormats.td b/llvm/lib/Target/SBF/SBFInstrFormats.td
index ae49010b6772f..8821ed39b3375 100644
--- a/llvm/lib/Target/SBF/SBFInstrFormats.td
+++ b/llvm/lib/Target/SBF/SBFInstrFormats.td
@@ -72,19 +72,20 @@ class SBFJumpOp<bits<4> val> {
   bits<4> Value = val;
 }
 
-def SBF_JA   : SBFJumpOp<0x0>;
-def SBF_JEQ  : SBFJumpOp<0x1>;
-def SBF_JGT  : SBFJumpOp<0x2>;
-def SBF_JGE  : SBFJumpOp<0x3>;
-def SBF_JNE  : SBFJumpOp<0x5>;
-def SBF_JSGT : SBFJumpOp<0x6>;
-def SBF_JSGE : SBFJumpOp<0x7>;
-def SBF_CALL : SBFJumpOp<0x8>;
-def SBF_EXIT : SBFJumpOp<0x9>;
-def SBF_JLT  : SBFJumpOp<0xa>;
-def SBF_JLE  : SBFJumpOp<0xb>;
-def SBF_JSLT : SBFJumpOp<0xc>;
-def SBF_JSLE : SBFJumpOp<0xd>;
+def SBF_JA      : SBFJumpOp<0x0>;
+def SBF_JEQ     : SBFJumpOp<0x1>;
+def SBF_JGT     : SBFJumpOp<0x2>;
+def SBF_JGE     : SBFJumpOp<0x3>;
+def SBF_JNE     : SBFJumpOp<0x5>;
+def SBF_JSGT    : SBFJumpOp<0x6>;
+def SBF_JSGE    : SBFJumpOp<0x7>;
+def SBF_CALL    : SBFJumpOp<0x8>;
+def SBF_EXIT    : SBFJumpOp<0x9>;
+def SBF_JLT     : SBFJumpOp<0xa>;
+def SBF_JLE     : SBFJumpOp<0xb>;
+def SBF_JSLT    : SBFJumpOp<0xc>;
+def SBF_JSLE    : SBFJumpOp<0xd>;
+def SBF_SYSCALL : SBFJumpOp<0x9>;
 
 class SBFWidthModifer<bits<2> val> {
   bits<2> Value = val;
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index b9e667070d9b5..734fe58e13498 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -32,10 +32,13 @@ def SDT_SBFMEMCPY       : SDTypeProfile<0, 4, [SDTCisVT<0, i64>,
                                                SDTCisVT<1, i64>,
                                                SDTCisVT<2, i64>,
                                                SDTCisVT<3, i64>]>;
+def SDT_SBFSyscall      : SDTypeProfile<0, 1, [SDTCisVT<0, i64>]>;
 
 def SBFcall         : SDNode<"SBFISD::CALL", SDT_SBFCall,
                              [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                               SDNPVariadic]>;
+def SBFSyscall     : SDNode<"SBFISD::SYSCALL", SDT_SBFSyscall,
+                            [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>;
 def SBFretglue     : SDNode<"SBFISD::RET_GLUE", SDTNone,
                              [SDNPHasChain, SDNPOptInGlue, SDNPVariadic]>;
 def SBFcallseq_start: SDNode<"ISD::CALLSEQ_START", SDT_SBFCallSeqStart,
@@ -801,6 +804,19 @@ class CALL<string OpcodeStr>
   let SBFClass = SBF_JMP;
 }
 
+class SYSCALL<string OpcodeStr>
+    : TYPE_ALU_JMP<SBF_SYSCALL.Value, SBF_K.Value,
+                   (outs),
+                   (ins i64imm:$imm),
+                   !strconcat(OpcodeStr, " $imm"),
+                   []> {
+  bits<32> imm;
+
+  let Inst{31-0} = imm;
+  let SBFClass = SBF_JMP;
+}
+
+
 class CALLX<string OpcodeStr>
     : TYPE_ALU_JMP<SBF_CALL.Value, SBF_X.Value,
                    (outs),
@@ -838,6 +854,7 @@ let isCall=1, hasDelaySlot=0, Uses = [R10],
   def JALX    : CALLX<"callx">, Requires<[SBFNoCallxSrc]>;
   let DecoderNamespace = "SBFv2" in {
     def JALX_v2 : CALLX_SRC_REG<"callx">, Requires<[SBFCallxSrc]>;
+    def SYSCALL_v3 : SYSCALL<"syscall">, Requires<[SBFHasStaticSyscalls]>;
   }
 }
 
@@ -883,7 +900,7 @@ class RETURN<string OpcodeStr>
 
 let isReturn = 1, isTerminator = 1, hasDelaySlot=0, isBarrier = 1,
     isNotDuplicable = 1, Predicates = [SBFHasStaticSyscalls] in {
-  def RETURN : RETURN<"return">;
+  def RETURN_v3 : RETURN<"return">;
 }
 
 // ADJCALLSTACKDOWN/UP pseudo insns
@@ -946,9 +963,10 @@ def : Pat<(i64 (and (i64 GPR:$src), 0xffffFFFF)),
 // Calls
 def : Pat<(SBFcall tglobaladdr:$dst), (JAL tglobaladdr:$dst)>;
 def : Pat<(SBFcall texternalsym:$dst), (JAL texternalsym:$dst)>;
-def : Pat<(SBFcall imm:$dst), (JAL imm:$dst)>;
+def : Pat<(SBFcall imm:$dst), (JAL imm:$dst)>, Requires<[SBFNoStaticSyscalls]>;
 def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>, Requires<[SBFNoCallxSrc]>;
 def : Pat<(SBFcall GPR:$dst), (JALX_v2 GPR:$dst)>, Requires<[SBFCallxSrc]>;
+def : Pat<(SBFSyscall imm:$imm), (SYSCALL_v3 imm:$imm)>, Requires<[SBFHasStaticSyscalls]>;
 
 // Loads
 let Predicates = [SBFNoALU32, SBFOldMemEncoding] in {
diff --git a/llvm/test/CodeGen/SBF/call_internal.ll b/llvm/test/CodeGen/SBF/call_internal.ll
index 8d92c6dc3063a..8b181c5c07e77 100644
--- a/llvm/test/CodeGen/SBF/call_internal.ll
+++ b/llvm/test/CodeGen/SBF/call_internal.ll
@@ -1,8 +1,8 @@
-; RUN: llc < %s -march=sbf --show-mc-encoding | FileCheck --check-prefix=CHECK-ASM %s
-; RUN: llc -march=sbf --filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-OBJ %s
-; RUN: llc < %s -march=sbf -mcpu=sbfv2 --show-mc-encoding | FileCheck --check-prefix=CHECK-ASM %s
+; RUN: llc < %s -march=sbf --show-mc-encoding | FileCheck --check-prefixes=CHECK-ASM,CHECK-ASM-V0 %s
+; RUN: llc -march=sbf --filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefixes=CHECK-OBJ,CHECK-OBJ-V0 %s
+; RUN: llc < %s -march=sbf -mcpu=sbfv2 --show-mc-encoding | FileCheck --check-prefixes=CHECK-ASM,CHECK-ASM-V3 %s
 ; RUN: llc -march=sbf -mcpu=sbfv2 --filetype=obj -o - %s | llvm-objdump -d -
-;                                       | FileCheck --check-prefix=CHECK-OBJ %s
+;                                       | FileCheck --check-prefixes=CHECK-OBJ,CHECK-OBJ-V3 %s
 
 @.str = private unnamed_addr constant [5 x i8] c"foo\0A\00", align 1
 
@@ -16,8 +16,11 @@ entry:
 ; Function Attrs: nounwind
 define dso_local i64 @entrypoint(ptr noundef %input) local_unnamed_addr #1 {
 entry:
-; CHECK-ASM: call 1811268606      # encoding: [0x85,0x00,0x00,0x00,0xfe,0xc3,0xf5,0x6b]
-; CHECK-OBJ: 85 00 00 00 fe c3 f5 6b	call 0x6bf5c3fe
+; CHECK-ASM-V0: call 1811268606         # encoding: [0x85,0x00,0x00,0x00,0xfe,0xc3,0xf5,0x6b]
+; CHECK-ASM-V3: syscall 1811268606      # encoding: [0x95,0x00,0x00,0x00,0xfe,0xc3,0xf5,0x6b]
+
+; CHECK-OBJ-V0: 85 00 00 00 fe c3 f5 6b	call 0x6bf5c3fe
+; CHECK-OBJ-V3: 95 00 00 00 fe c3 f5 6b	syscall 0x6bf5c3fe
 
   tail call void inttoptr (i64 1811268606 to ptr)(ptr noundef nonnull @.str, i64 noundef 4) #3
   %add.ptr = getelementptr inbounds i8, ptr %input, i64 4
diff --git a/llvm/test/CodeGen/SBF/static_syscall.ll b/llvm/test/CodeGen/SBF/static_syscall.ll
new file mode 100644
index 0000000000000..fe5a66660e96a
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/static_syscall.ll
@@ -0,0 +1,25 @@
+; RUN: llc -march=sbf < %s | FileCheck --check-prefix=CHECK-V0 %s
+; RUN: llc -march=sbf -mattr=+static-syscalls -show-mc-encoding < %s | FileCheck --check-prefix=CHECK-V3 %s
+
+
+; Function Attrs: nounwind
+define dso_local i32 @test(i32 noundef %a, i32 noundef %b) {
+entry:
+; CHECK-LABEL: test
+
+; CHECK-V0: call 2
+; CHECK-V3 syscall 2   # encoding: [0x95,0x00,0x00,0x00,0x01,0x00,0x00,0x00]
+  %syscall_1 = tail call i32 inttoptr (i64 2 to ptr)(i32 noundef %a, i32 noundef %b)
+
+; CHECK-V0: call 11
+; CHECK-V3: syscall 11  # encoding: [0x95,0x00,0x00,0x00,0x0b,0x00,0x00,0x00]
+  %syscall_2 = tail call i32 inttoptr (i64 11 to ptr)(i32 noundef %a, i32 noundef %b)
+
+; CHECK-V0: call 112
+; CHECK-V3: syscall 112
+  %syscall_3 = tail call i32 inttoptr (i64 112 to ptr)(i32 noundef %a, i32 noundef %b)
+
+  %add_1 = add i32 %syscall_1, %syscall_2
+  %add_2 = add i32 %add_1, %syscall_3
+  ret i32 %add_1
+}
diff --git a/llvm/test/CodeGen/SBF/static_syscall_2.ll b/llvm/test/CodeGen/SBF/static_syscall_2.ll
new file mode 100644
index 0000000000000..6c7ac56b5a873
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/static_syscall_2.ll
@@ -0,0 +1,50 @@
+; RUN: llc -march=sbf -mattr=+static-syscalls < %s | FileCheck --check-prefix=CHECK %s
+
+; Syscall declaration in C:
+;
+; int c_declaration(int a, int b) {
+;    int (*const syscall)(int a, int b) = (void*)50;
+;    return syscall(a, b);
+; }
+; The following is the unoptimized output from clang:
+
+define dso_local i32 @c_declaration(i32 noundef %a, i32 noundef %b) #0 {
+entry:
+  %a.addr = alloca i32, align 4
+  %b.addr = alloca i32, align 4
+  %syscall = alloca ptr, align 8
+  store i32 %a, ptr %a.addr, align 4
+  store i32 %b, ptr %b.addr, align 4
+  store ptr inttoptr (i64 50 to ptr), ptr %syscall, align 8
+  %0 = load i32, ptr %a.addr, align 4
+  %1 = load i32, ptr %b.addr, align 4
+
+; Ensure the syscall instruction is emitted
+; CHECK: syscall 50
+
+  %call = call i32 inttoptr (i64 50 to ptr)(i32 noundef %0, i32 noundef %1)
+  ret i32 %call
+}
+
+; Syscall declaration in Rust:
+;
+;  #[no_mangle]
+;  pub unsafe fn rust_declaration(b: u64) -> u32 {
+;      let syscall : extern "C" fn(b: u64) -> u32 = core::mem::transmute(60u64);
+;      return syscall(b);
+;  }
+; The following is the unoptimized output from rustc:
+
+define i32 @rust_declaration(i64 %b) unnamed_addr {
+start:
+  %syscall.dbg.spill = alloca [8 x i8], align 8
+  %b.dbg.spill = alloca [8 x i8], align 8
+  store i64 %b, ptr %b.dbg.spill, align 8
+  store ptr getelementptr (i8, ptr null, i64 60), ptr %syscall.dbg.spill, align 8
+
+; Ensure the syscall instruction is emitted
+; CHECK: syscall 60
+
+  %_0 = call i32 getelementptr (i8, ptr null, i64 60)(i64 %b)
+  ret i32 %_0
+}
\ No newline at end of file
diff --git a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
index 278ed8d3774da..a51c1230ea430 100644
--- a/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
+++ b/llvm/test/MC/Disassembler/SBF/sbf-jmp.txt
@@ -1,5 +1,7 @@
 # RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana \
 # RUN:                          | FileCheck %s --check-prefix=CHECK-NEW
+# RUN: llvm-mc --disassemble %s -triple=sbf-solana-solana -mattr=+static-syscalls \
+# RUN:                          | FileCheck %s --check-prefix=CHECK-V2
 
 # TODO: Test immediate field ranges.
 
@@ -109,5 +111,9 @@
 # CHECK-NEW: exit
 0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 
+# CHECK-V2: syscall 5
+0x95,0x00,0x00,0x00,0x05,0x00,0x00,0x00
+
+
 # CHECK-NEW: return
 0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x00
diff --git a/llvm/test/MC/SBF/insn-unit.s b/llvm/test/MC/SBF/insn-unit.s
index ed24fdcf0b522..54e51b437b195 100644
--- a/llvm/test/MC/SBF/insn-unit.s
+++ b/llvm/test/MC/SBF/insn-unit.s
@@ -45,10 +45,8 @@
 // ======== BPF_JMP Class ========
   ja Llabel0               // BPF_JA
   call 1                     // BPF_CALL
-  exit                       // BPF_EXIT
-// CHECK: 05 00 1a 00 00 00 00 00 	ja +0x1a
+// CHECK: 05 00 19 00 00 00 00 00 	ja +0x19
 // CHECK: 85 00 00 00 01 00 00 00 	call 0x1
-// CHECK: 95 00 00 00 00 00 00 00 	exit
 
   jeq r0, r1, Llabel0   // BPF_JEQ  | BPF_X
   jne r3, r4, Llabel0   // BPF_JNE  | BPF_X
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index ac1dbdde2b929..308e40eeeceb4 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -163,6 +163,6 @@ call 8
 # CHECK-ASM-OLD: encoding: [0x8d,0x00,0x00,0x00,0x04,0x00,0x00,0x00]
 callx r4
 
-# CHECK-OBJ-NEW: exit
-# CHECK-ASM-NEW: encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+# CHECK-OBJ-OLD: exit
+# CHECK-ASM-OLD: encoding: [0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 exit
diff --git a/llvm/test/MC/SBF/sbf-return.s b/llvm/test/MC/SBF/sbf-return-syscall.s
similarity index 77%
rename from llvm/test/MC/SBF/sbf-return.s
rename to llvm/test/MC/SBF/sbf-return-syscall.s
index 11e333f76983e..9f3b9ca00004a 100644
--- a/llvm/test/MC/SBF/sbf-return.s
+++ b/llvm/test/MC/SBF/sbf-return-syscall.s
@@ -1,6 +1,8 @@
 # RUN: llvm-mc -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj -o %t %s
 # RUN: llvm-objdump -d -r %t | FileCheck --check-prefix=CHECK %s
 
+syscall 9
 return
 
+// CHECK:  95 00 00 00 09 00 00 00 syscall 0x9
 // CHECK: 9d 00 00 00 00 00 00 00	return
\ No newline at end of file

From dd98e4a265c30da171d16fff1ac58474bff9441e Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 3 Jan 2025 09:51:21 -0300
Subject: [PATCH 066/114] [SOL] Simplify code emission for syscalls (#122)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp |  9 +--------
 llvm/lib/Target/SBF/SBFISelLowering.h   |  1 -
 llvm/lib/Target/SBF/SBFInstrInfo.td     |  5 +----
 llvm/test/CodeGen/SBF/static_syscall.ll | 13 ++++++++++---
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index fd160e6032b8f..f0b8e2cf31215 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -592,16 +592,11 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // If the callee is a GlobalAddress node (quite common, every direct call is)
   // turn it into a TargetGlobalAddress node so that legalize doesn't hack it.
   // Likewise ExternalSymbol -> TargetExternalSymbol.
-  unsigned NodeCode = SBFISD::CALL;
   if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee)) {
     Callee = DAG.getTargetGlobalAddress(G->getGlobal(), CLI.DL, PtrVT,
                                         G->getOffset(), 0);
   } else if (ExternalSymbolSDNode *E = dyn_cast<ExternalSymbolSDNode>(Callee)) {
     Callee = DAG.getTargetExternalSymbol(E->getSymbol(), PtrVT, 0);
-  } else if (isa<ConstantSDNode>(Callee) && Subtarget->getHasStaticSyscalls()) {
-    // When static syscalls are enabled and we have a constant operand for call,
-    // we emit a syscall.
-    NodeCode = SBFISD::SYSCALL;
   }
 
   // Returns a chain & a flag for retval copy to use.
@@ -622,7 +617,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   if (InGlue.getNode())
     Ops.push_back(InGlue);
 
-  Chain = DAG.getNode(NodeCode, CLI.DL, NodeTys, Ops);
+  Chain = DAG.getNode(SBFISD::CALL, CLI.DL, NodeTys, Ops);
   InGlue = Chain.getValue(1);
 
   DAG.addNoMergeSiteInfo(Chain.getNode(), CLI.NoMerge);
@@ -924,8 +919,6 @@ const char *SBFTargetLowering::getTargetNodeName(unsigned Opcode) const {
     return "SBFISD::Wrapper";
   case SBFISD::MEMCPY:
     return "SBFISD::MEMCPY";
-  case SBFISD::SYSCALL:
-    return "SBFISD::SYSCALL";
   }
   return nullptr;
 }
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index 561af2a0aa569..4db49e50a6fc0 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -29,7 +29,6 @@ enum NodeType : unsigned {
   BR_CC,
   Wrapper,
   MEMCPY,
-  SYSCALL,
 };
 }
 
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 734fe58e13498..aa5376d67ba40 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -32,13 +32,10 @@ def SDT_SBFMEMCPY       : SDTypeProfile<0, 4, [SDTCisVT<0, i64>,
                                                SDTCisVT<1, i64>,
                                                SDTCisVT<2, i64>,
                                                SDTCisVT<3, i64>]>;
-def SDT_SBFSyscall      : SDTypeProfile<0, 1, [SDTCisVT<0, i64>]>;
 
 def SBFcall         : SDNode<"SBFISD::CALL", SDT_SBFCall,
                              [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
                               SDNPVariadic]>;
-def SBFSyscall     : SDNode<"SBFISD::SYSCALL", SDT_SBFSyscall,
-                            [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>;
 def SBFretglue     : SDNode<"SBFISD::RET_GLUE", SDTNone,
                              [SDNPHasChain, SDNPOptInGlue, SDNPVariadic]>;
 def SBFcallseq_start: SDNode<"ISD::CALLSEQ_START", SDT_SBFCallSeqStart,
@@ -966,7 +963,7 @@ def : Pat<(SBFcall texternalsym:$dst), (JAL texternalsym:$dst)>;
 def : Pat<(SBFcall imm:$dst), (JAL imm:$dst)>, Requires<[SBFNoStaticSyscalls]>;
 def : Pat<(SBFcall GPR:$dst), (JALX GPR:$dst)>, Requires<[SBFNoCallxSrc]>;
 def : Pat<(SBFcall GPR:$dst), (JALX_v2 GPR:$dst)>, Requires<[SBFCallxSrc]>;
-def : Pat<(SBFSyscall imm:$imm), (SYSCALL_v3 imm:$imm)>, Requires<[SBFHasStaticSyscalls]>;
+def : Pat<(SBFcall imm:$imm), (SYSCALL_v3 imm:$imm)>, Requires<[SBFHasStaticSyscalls]>;
 
 // Loads
 let Predicates = [SBFNoALU32, SBFOldMemEncoding] in {
diff --git a/llvm/test/CodeGen/SBF/static_syscall.ll b/llvm/test/CodeGen/SBF/static_syscall.ll
index fe5a66660e96a..9f60ff5a9c243 100644
--- a/llvm/test/CodeGen/SBF/static_syscall.ll
+++ b/llvm/test/CodeGen/SBF/static_syscall.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=sbf < %s | FileCheck --check-prefix=CHECK-V0 %s
-; RUN: llc -march=sbf -mattr=+static-syscalls -show-mc-encoding < %s | FileCheck --check-prefix=CHECK-V3 %s
+; RUN: llc -march=sbf < %s | FileCheck --check-prefixes=CHECK,CHECK-V0 %s
+; RUN: llc -march=sbf -mattr=+static-syscalls -show-mc-encoding < %s | FileCheck --check-prefixes=CHECK,CHECK-V3 %s
 
 
 ; Function Attrs: nounwind
@@ -19,7 +19,14 @@ entry:
 ; CHECK-V3: syscall 112
   %syscall_3 = tail call i32 inttoptr (i64 112 to ptr)(i32 noundef %a, i32 noundef %b)
 
+; CHECK: mov64 r1, 89
+; CHECK: mov64 r2, 87
+; CHECK-V0: call 112
+; CHECK-V3: syscall 112
+  %syscall_4 = tail call i32 inttoptr (i64 112 to ptr)(i32 89,  i32 87)
+
   %add_1 = add i32 %syscall_1, %syscall_2
   %add_2 = add i32 %add_1, %syscall_3
-  ret i32 %add_1
+  %add_3 = add i32 %add_2, %syscall_4
+  ret i32 %add_3
 }

From d3ed90197ffa43252cd818d58ed7015ad3778545 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:10:25 -0300
Subject: [PATCH 067/114] [SOL] Split features into SBF versions (#124)

---
 llvm/include/llvm/BinaryFormat/ELF.h          |  5 +-
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |  4 +-
 .../SBF/MCTargetDesc/SBFELFObjectWriter.cpp   | 12 ++-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      | 13 +++-
 .../Target/SBF/MCTargetDesc/SBFMCTargetDesc.h |  2 +-
 llvm/lib/Target/SBF/SBFSubtarget.cpp          | 17 +----
 llvm/lib/Target/SBF/SBFTargetFeatures.td      | 17 +++--
 llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll    | 16 ++--
 .../CodeGen/SBF/32-bit-subreg-peephole.ll     | 21 ++---
 .../SBF/CORE/simplifypatable-nullptr.ll       |  5 +-
 llvm/test/CodeGen/SBF/call_internal.ll        |  4 +-
 llvm/test/CodeGen/SBF/callx.ll                |  6 +-
 llvm/test/CodeGen/SBF/cc_args.ll              | 76 +++++++++----------
 llvm/test/CodeGen/SBF/many_args_new_conv.ll   | 34 +++------
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      | 31 ++++----
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll    |  6 +-
 llvm/test/CodeGen/SBF/objdump_imm_hex.ll      | 30 ++++----
 llvm/test/CodeGen/SBF/objdump_static_var.ll   | 12 +--
 llvm/test/CodeGen/SBF/objdump_trivial.ll      |  4 +-
 llvm/test/CodeGen/SBF/pqr-class.ll            |  2 +-
 llvm/test/CodeGen/SBF/reloc-3.ll              |  2 +-
 llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll      |  8 +-
 llvm/test/CodeGen/SBF/reloc-btf.ll            |  2 +-
 llvm/test/CodeGen/SBF/reloc.ll                |  2 +-
 llvm/test/CodeGen/SBF/sdiv.ll                 |  4 +-
 llvm/test/CodeGen/SBF/select_ri.ll            |  2 +-
 llvm/test/CodeGen/SBF/spill-alu32.ll          | 12 +--
 .../CodeGen/SBF/sub_reversed_immediate.ll     |  2 +-
 llvm/test/MC/SBF/elf-flags.s                  | 24 +++++-
 llvm/test/MC/SBF/elf-header.s                 | 10 +--
 llvm/test/MC/SBF/insn-unit-32.s               | 12 ++-
 llvm/test/MC/SBF/sbf-jmp.s                    |  4 +-
 llvm/test/MC/SBF/sbf-return-syscall.s         |  2 +-
 llvm/tools/llvm-objdump/llvm-objdump.cpp      | 17 ++++-
 34 files changed, 219 insertions(+), 201 deletions(-)

diff --git a/llvm/include/llvm/BinaryFormat/ELF.h b/llvm/include/llvm/BinaryFormat/ELF.h
index b594a7734cbc7..74627bed3339a 100644
--- a/llvm/include/llvm/BinaryFormat/ELF.h
+++ b/llvm/include/llvm/BinaryFormat/ELF.h
@@ -953,7 +953,10 @@ enum : unsigned {
 
 // SBF specific e_flags
 enum : unsigned {
-  EF_SBF_V2 = 0x20,
+  EF_SBF_V0 = 0x00,
+  EF_SBF_V1 = 0x01,
+  EF_SBF_V2 = 0x02,
+  EF_SBF_V3 = 0x03,
 };
 
 // ELF Relocation types for SBF.
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 2090878d20c1b..628a82d235440 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -26,7 +26,6 @@ class SBFAsmBackend : public MCAsmBackend {
 public:
   SBFAsmBackend(endianness Endian, const MCSubtargetInfo &STI)
       : MCAsmBackend(Endian),
-        isSBFv2(STI.getCPU() == "sbfv2"),
         relocAbs64(STI.hasFeature(SBF::FeatureRelocAbs64)) {}
   ~SBFAsmBackend() override = default;
 
@@ -50,7 +49,6 @@ class SBFAsmBackend : public MCAsmBackend {
   bool writeNopData(raw_ostream &OS, uint64_t Count,
                     const MCSubtargetInfo *STI) const override;
 private:
-  bool isSBFv2;
   bool relocAbs64;
 };
 
@@ -107,7 +105,7 @@ void SBFAsmBackend::applyFixup(const MCAssembler &Asm, const MCFixup &Fixup,
 
 std::unique_ptr<MCObjectTargetWriter>
 SBFAsmBackend::createObjectTargetWriter() const {
-  return createSBFELFObjectWriter(0, relocAbs64, isSBFv2);
+  return createSBFELFObjectWriter(0, relocAbs64);
 }
 
 MCAsmBackend *llvm::createSBFAsmBackend(const Target &T,
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
index ea5307ed13767..15c1ae681402d 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFELFObjectWriter.cpp
@@ -22,7 +22,7 @@ namespace {
 
 class SBFELFObjectWriter : public MCELFObjectTargetWriter {
 public:
-  SBFELFObjectWriter(uint8_t OSABI, bool relocAbs64, bool isSBFv2);
+  SBFELFObjectWriter(uint8_t OSABI, bool relocAbs64);
   ~SBFELFObjectWriter() override = default;
 
 protected:
@@ -47,10 +47,8 @@ bool SBFELFObjectWriter::needsRelocateWithSymbol(const MCValue &Val,
   return true;
 }
 
-SBFELFObjectWriter::SBFELFObjectWriter(uint8_t OSABI,
-                                       bool relocAbs64, bool isSBFv2)
-  : MCELFObjectTargetWriter(/*Is64Bit*/ true, OSABI,
-                            isSBFv2 ? ELF::EM_SBF : ELF::EM_BPF,
+SBFELFObjectWriter::SBFELFObjectWriter(uint8_t OSABI, bool relocAbs64)
+  : MCELFObjectTargetWriter(/*Is64Bit*/ true, OSABI,ELF::EM_SBF,
                             /*HasRelocationAddend*/ false),
       relocAbs64(relocAbs64) {}
 
@@ -110,6 +108,6 @@ unsigned SBFELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
 }
 
 std::unique_ptr<MCObjectTargetWriter>
-llvm::createSBFELFObjectWriter(uint8_t OSABI, bool useRelocAbs64, bool isSBFv2) {
-  return std::make_unique<SBFELFObjectWriter>(OSABI, useRelocAbs64, isSBFv2);
+llvm::createSBFELFObjectWriter(uint8_t OSABI, bool useRelocAbs64) {
+  return std::make_unique<SBFELFObjectWriter>(OSABI, useRelocAbs64);
 }
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index e92e2fcb534e4..621145e116594 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -67,9 +67,18 @@ static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
   if (RelaxAll)
     S->getAssembler().setRelaxAll(true);
   const MCSubtargetInfo *STI = Ctx.getSubtargetInfo();
-  if (STI->getCPU() == "sbfv2") {
-    S->getAssembler().setELFHeaderEFlags(llvm::ELF::EF_SBF_V2);
+
+  StringRef CPU = STI->getCPU();
+  unsigned EFlag = llvm::ELF::EF_SBF_V0;
+  if (CPU == "v1") {
+    EFlag = llvm::ELF::EF_SBF_V1;
+  } else if (CPU == "v2") {
+    EFlag = llvm::ELF::EF_SBF_V2;
+  } else if (CPU == "v3") {
+    EFlag = llvm::ELF::EF_SBF_V3;
   }
+  S->getAssembler().setELFHeaderEFlags(EFlag);
+
   return S;
 }
 
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
index f6cc55b67d247..99f04358160ed 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.h
@@ -43,7 +43,7 @@ MCAsmBackend *createSBFbeAsmBackend(const Target &T, const MCSubtargetInfo &STI,
                                     const MCTargetOptions &Options);
 
 std::unique_ptr<MCObjectTargetWriter>
-createSBFELFObjectWriter(uint8_t OSABI, bool useRelocAbs64, bool isSBFv2);
+createSBFELFObjectWriter(uint8_t OSABI, bool useRelocAbs64);
 } // namespace llvm
 
 // Defines symbolic names for SBF registers.  This defines a mapping from
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 5d3e24fef099c..d6821041a4f5d 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -36,10 +36,10 @@ SBFSubtarget &SBFSubtarget::initializeSubtargetDependencies(const Triple &TT,
 
 void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
-  HasJmpExt = false;
   UseDwarfRIS = false;
 
   // SBFv2 features
+  HasJmpExt = false;
   HasDynamicFrames = false;
   DisableNeg = false;
   ReverseSubImm = false;
@@ -50,24 +50,11 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasAlu32 = false;
   HasExplicitSignExt = false;
   NewMemEncoding = false;
+  HasStaticSyscalls = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
   ParseSubtargetFeatures(CPU, /*TuneCPU*/ CPU, FS);
-
-  if (CPU == "v2") {
-    HasJmpExt = true;
-  }
-
-  if (CPU == "v3") {
-    HasJmpExt = true;
-    HasAlu32 = true;
-  }
-
-  if (CPU == "sbfv2") {
-    if (!HasDynamicFrames)
-      report_fatal_error("sbfv2 requires dynamic-frames\n", false);
-  }
 }
 
 SBFSubtarget::SBFSubtarget(const Triple &TT, const std::string &CPU,
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index a11b0aacbbd17..a1ff0b940a425 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -49,13 +49,18 @@ def FeatureExplicitSext : SubtargetFeature<"explicit-sext", "HasExplicitSignExt"
 def FeatureNewMemEncoding : SubtargetFeature<"mem-encoding", "NewMemEncoding",
                                        "true", "Enable the new encoding for memory instructions">;
 
+def FeatureJumpExt : SubtargetFeature<"jmp-ext", "HasJmpExt",
+                                       "true", "Enable jumps with less than and less than or equal">;
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
 def : Proc<"generic", []>;
-def : Proc<"v1", []>;
-def : Proc<"v2", []>;
-def : Proc<"v3", [ALU32]>;
-def : Proc<"sbfv2", [FeatureDynamicFrames, FeatureRelocAbs64, FeatureStaticSyscalls,
-                        FeatureDisableNeg, FeatureReverseSubImm, FeatureDisableLddw, FeatureCallxRegSrc,
-                          FeaturePqrInstr, FeatureExplicitSext]>;
\ No newline at end of file
+
+def : Proc<"v1", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt]>;
+def : Proc<"v2", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt, FeatureDisableLddw,
+                  FeatureNewMemEncoding, FeatureCallxRegSrc, FeaturePqrInstr, FeatureExplicitSext,
+                  FeatureDisableNeg, FeatureReverseSubImm, ALU32]>;
+def : Proc<"v3", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt, FeatureDisableLddw,
+                  FeatureNewMemEncoding, FeatureCallxRegSrc, FeaturePqrInstr, FeatureExplicitSext,
+                  FeatureDisableNeg, FeatureReverseSubImm, ALU32, FeatureStaticSyscalls, FeatureRelocAbs64]>;
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
index 91183a6a09ead..6713375dbfa4d 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll
@@ -1,5 +1,5 @@
-; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck %s
-; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck --check-prefixes=CHECK,CHECK-V0 %s
+; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck --check-prefixes=CHECK,CHECK-V3 %s
 ;
 ; int mov(int a)
 ; {
@@ -130,7 +130,8 @@
 define dso_local i32 @mov(i32 returned %a) local_unnamed_addr #0 {
 entry:
   ret i32 %a
-; CHECK: mov32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-V0: mov32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-V3: mov64 w{{[0-9]+}}, w{{[0-9]+}}
 }
 
 ; Function Attrs: norecurse nounwind readnone
@@ -208,7 +209,8 @@ entry:
 define dso_local i32 @rem(i32 %a, i32 %b) local_unnamed_addr #0 {
 entry:
   %rem = urem i32 %a, %b
-; CHECK: mod32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-V0: mod32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-V3: urem32 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %rem
 }
 
@@ -216,7 +218,8 @@ entry:
 define dso_local i32 @rem_i(i32 %a) local_unnamed_addr #0 {
 entry:
   %rem = urem i32 %a, 15
-; CHECK: mod32 w{{[0-9]+}}, 15
+; CHECK-V0: mod32 w{{[0-9]+}}, 15
+; CHECK-V3: urem32 w{{[0-9]+}}, 15
   ret i32 %rem
 }
 
@@ -320,6 +323,7 @@ entry:
 define dso_local i32 @neg(i32 %a) local_unnamed_addr #0 {
 entry:
   %sub = sub nsw i32 0, %a
-; CHECK: mov32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-V0: mov32 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-V3: mov64 w{{[0-9]+}}, w{{[0-9]+}}
   ret i32 %sub
 }
diff --git a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
index 6ade7e00390d0..325374059c60a 100644
--- a/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
+++ b/llvm/test/CodeGen/SBF/32-bit-subreg-peephole.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=sbf -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=v2 < %s | FileCheck %s
 ;
 ; long long select_u(unsigned a, unsigned b, long long c, long long d)
 ; {
@@ -47,7 +47,7 @@ define dso_local i64 @select_u(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_add
 entry:
   %cmp = icmp ugt i32 %a, %b
   %c.d = select i1 %cmp, i64 %c, i64 %d
-; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
 ; CHECK: {{jlt|jgt}}  r{{[0-9]+}}, r{{[0-9]+}},
@@ -59,7 +59,7 @@ define dso_local i64 @select_u_2(i32 %a, i64 %b, i64 %c, i64 %d) local_unnamed_a
 ; CHECK-LABEL: select_u_2:
 entry:
   %conv = zext i32 %a to i64
-; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
   %cmp = icmp ugt i64 %conv, %b
@@ -73,8 +73,8 @@ define dso_local i64 @select_s(i32 %a, i32 %b, i64 %c, i64 %d) local_unnamed_add
 entry:
   %cmp = icmp sgt i32 %a, %b
   %c.d = select i1 %cmp, i64 %c, i64 %d
-; CHECK: lsh64 r{{[0-9]+}}, 32
-; CHECK-NEXT: arsh64 r{{[0-9]+}}, 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK-NEXT: mov32 r{{[0-9]+}}, w{{[0-9]+}}
 ; CHECK: {{jslt|jsgt}} r{{[0-9]+}}, r{{[0-9]+}},
   ret i64 %c.d
 }
@@ -88,11 +88,12 @@ entry:
   %cmp = icmp ult i32 %conv, 10
 ; %call comes from function call returning i64 so the high bits will need
 ; to be cleared.
-; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: and32 w{{[0-9]+}}, -1
 ; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
   %b.c = select i1 %cmp, i32 %b, i32 %c
-; CHECK: {{jlt|jgt}} r{{[0-9]+}}, {{[0-9]+}},
+; CHECK: {{jlt|jgt}} r{{[0-9]+}}, 10,
   ret i32 %b.c
 }
 
@@ -103,7 +104,7 @@ define dso_local i32* @inc_p(i32* readnone %p, i32 %a) local_unnamed_addr #0 {
 ; CHECK-LABEL: inc_p:
 entry:
   %idx.ext = zext i32 %a to i64
-; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov64 r{{[0-9]+}}, r{{[0-9]+}}
 ; CHECK-NOT: lsh32 r{{[0-9]+}}, 32
 ; CHECK-NOT: rsh32 r{{[0-9]+}}, 32
   %add.ptr = getelementptr inbounds i32, i32* %p, i64 %idx.ext
@@ -117,8 +118,8 @@ entry:
   %cmp = icmp sgt i32 %call, 6
 ; The shifts can't be optimized out because %call comes from function call
 ; return i32 so the high bits might be invalid.
-; CHECK: lsh64 r{{[0-9]+}}, 32
-; CHECK-NEXT: arsh64 r{{[0-9]+}}, 32
+; CHECK: mov64 w{{[0-9]+}}, w{{[0-9]+}}
+; CHECK: mov32 r{{[0-9]+}}, w{{[0-9]+}}
   %cond = zext i1 %cmp to i32
 ; CHECK: {{jslt|jsgt}} r{{[0-9]+}}, {{[0-9]+}},
   ret i32 %cond
diff --git a/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll b/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
index 162f98a5902fa..c92249161de63 100644
--- a/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
+++ b/llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll
@@ -41,7 +41,7 @@ entry:
   br i1 %tobool.not, label %if.end, label %cleanup, !dbg !42
 
 ; CHECK-LABEL: test
-; CHECK:       ldxdw r1, [r1 + 8]
+; CHECK:       ldxdw r1, [r1 + 0]
 ; CHECK:       jne r1, 0,
 
 if.end:                                           ; preds = %entry
@@ -53,7 +53,8 @@ if.end:                                           ; preds = %entry
   %tobool1.not = icmp eq ptr %7, null, !dbg !46
   br i1 %tobool1.not, label %if.then2, label %cleanup, !dbg !48
 
-; CHECK:       mov64 r1, 8
+; CHECK:       mov32 r1,
+; CHECK:       hor64 r1,
 ; CHECK:       ldxdw r1, [r1 + 0]
 ; CHECK:       jne r1, 0,
 
diff --git a/llvm/test/CodeGen/SBF/call_internal.ll b/llvm/test/CodeGen/SBF/call_internal.ll
index 8b181c5c07e77..d4e1dc7844fd4 100644
--- a/llvm/test/CodeGen/SBF/call_internal.ll
+++ b/llvm/test/CodeGen/SBF/call_internal.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=sbf --show-mc-encoding | FileCheck --check-prefixes=CHECK-ASM,CHECK-ASM-V0 %s
 ; RUN: llc -march=sbf --filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefixes=CHECK-OBJ,CHECK-OBJ-V0 %s
-; RUN: llc < %s -march=sbf -mcpu=sbfv2 --show-mc-encoding | FileCheck --check-prefixes=CHECK-ASM,CHECK-ASM-V3 %s
-; RUN: llc -march=sbf -mcpu=sbfv2 --filetype=obj -o - %s | llvm-objdump -d -
+; RUN: llc < %s -march=sbf -mcpu=v3 --show-mc-encoding | FileCheck --check-prefixes=CHECK-ASM,CHECK-ASM-V3 %s
+; RUN: llc -march=sbf -mcpu=v3 --filetype=obj -o - %s | llvm-objdump -d -
 ;                                       | FileCheck --check-prefixes=CHECK-OBJ,CHECK-OBJ-V3 %s
 
 @.str = private unnamed_addr constant [5 x i8] c"foo\0A\00", align 1
diff --git a/llvm/test/CodeGen/SBF/callx.ll b/llvm/test/CodeGen/SBF/callx.ll
index bebcf4a11d4cb..5923cdc155843 100644
--- a/llvm/test/CodeGen/SBF/callx.ll
+++ b/llvm/test/CodeGen/SBF/callx.ll
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=sbf --show-mc-encoding \
-; RUN:      | FileCheck %s -check-prefixes=CHECK-v1
-; RUN: llc < %s -march=sbf --mcpu=sbfv2 --show-mc-encoding \
+; RUN:      | FileCheck %s -check-prefixes=CHECK-v0
+; RUN: llc < %s -march=sbf --mcpu=v2 --show-mc-encoding \
 ; RUN:      | FileCheck %s -check-prefixes=CHECK-v2
 ; source:
 ;   int test(int (*f)(void)) { return f(); }
@@ -9,7 +9,7 @@
 define dso_local i32 @test(i32 ()* nocapture %f) local_unnamed_addr #0 {
 entry:
   %call = tail call i32 %f() #1
-; CHECK-v1: callx r{{[0-9]+}} # encoding: [0x8d,0x00,0x00,0x00,0x0{{[0-9]|a|b}},0x00,0x00,0x00]
+; CHECK-v0: callx r{{[0-9]+}} # encoding: [0x8d,0x00,0x00,0x00,0x0{{[0-9]|a|b}},0x00,0x00,0x00]
 ; CHECK-v2: callx r{{[0-9]+}} # encoding: [0x8d,0x{{[0-9]}}0,0x00,0x00,0x00,0x00,0x00,0x00]
   ret i32 %call
 }
diff --git a/llvm/test/CodeGen/SBF/cc_args.ll b/llvm/test/CodeGen/SBF/cc_args.ll
index 13cee14aa0373..8803133f57406 100644
--- a/llvm/test/CodeGen/SBF/cc_args.ll
+++ b/llvm/test/CodeGen/SBF/cc_args.ll
@@ -1,18 +1,18 @@
-; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck --check-prefix=CHECK-v1 %s
-; RUN: llc < %s -march=sbf -mcpu=sbfv2 -show-mc-encoding | FileCheck --check-prefix=CHECK-v2 %s
+; RUN: llc < %s -march=sbf -show-mc-encoding | FileCheck --check-prefix=CHECK-v0 %s
+; RUN: llc < %s -march=sbf -mcpu=v2 -show-mc-encoding | FileCheck --check-prefix=CHECK-v2 %s
 
 define void @test() #0 {
 entry:
 ; CHECK-LABEL: test:
 
-; CHECK-v1: mov64 r1, 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
-; CHECK-v2: mov64 r1, 123
-; CHECK-v1: call f_i16
+; CHECK-v0: mov64 r1, 123 # encoding: [0xb7,0x01,0x00,0x00,0x7b,0x00,0x00,0x00]
+; CHECK-v2: mov32 w1, 123
+; CHECK-v0: call f_i16
   call void @f_i16(i16 123)
 
-; CHECK-v1: mov64 r1, 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
-; CHECK-v2: mov64 r1, 12345678
-; CHECK-v1: call f_i32
+; CHECK-v0: mov64 r1, 12345678 # encoding: [0xb7,0x01,0x00,0x00,0x4e,0x61,0xbc,0x00]
+; CHECK-v2: mov32 w1, 12345678
+; CHECK-v0: call f_i32
   call void @f_i32(i32 12345678)
 
 ; 72623859790382856 = 0x0102030405060708
@@ -22,19 +22,19 @@ entry:
 ; CHECK-v2: mov32 r1, 84281096  # encoding: [0xb4,0x01,0x00,0x00,0x08,0x07,0x06,0x05]
 ; CHECK-v2: hor64 r1, 16909060  # encoding: [0xf7,0x01,0x00,0x00,0x04,0x03,0x02,0x01]
 
-; CHECK-v1: lddw r1, 72623859790382856 # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
-; CHECK-v1: call f_i64
+; CHECK-v0: lddw r1, 72623859790382856 # encoding: [0x18,0x01,0x00,0x00,0x08,0x07,0x06,0x05,0x00,0x00,0x00,0x00,0x04,0x03,0x02,0x01]
+; CHECK-v0: call f_i64
   call void @f_i64(i64 72623859790382856)
 
-; CHECK-v1: mov64 r1, 1234
-; CHECK-v1: mov64 r2, 5678
-; CHECK-v1: call f_i32_i32
+; CHECK-v0: mov64 r1, 1234
+; CHECK-v0: mov64 r2, 5678
+; CHECK-v0: call f_i32_i32
   call void @f_i32_i32(i32 1234, i32 5678)
 
-; CHECK-v1: mov64 r1, 2
-; CHECK-v1: mov64 r2, 3
-; CHECK-v1: mov64 r3, 4
-; CHECK-v1: call f_i16_i32_i16
+; CHECK-v0: mov64 r1, 2
+; CHECK-v0: mov64 r2, 3
+; CHECK-v0: mov64 r3, 4
+; CHECK-v0: call f_i16_i32_i16
   call void @f_i16_i32_i16(i16 2, i32 3, i16 4)
 
 ; 7262385979038285 = 0x0019CD1A00809A4D
@@ -43,10 +43,10 @@ entry:
 ; CHECK-v2: mov32 r2, 8428109
 ; CHECK-v2: hor64 r2, 1690906
 
-; CHECK-v1: mov64 r1, 5
-; CHECK-v1: lddw r2, 7262385979038285
-; CHECK-v1: mov64 r3, 6
-; CHECK-v1: call f_i16_i64_i16
+; CHECK-v0: mov64 r1, 5
+; CHECK-v0: lddw r2, 7262385979038285
+; CHECK-v0: mov64 r3, 6
+; CHECK-v0: call f_i16_i64_i16
   call void @f_i16_i64_i16(i16 5, i64 7262385979038285, i16 6)
 
   ret void
@@ -57,53 +57,53 @@ entry:
 @g_i64 = common global i64 0, align 4
 
 define void @f_i16(i16 %a) #0 {
-; CHECK-v1: f_i16:
-; CHECK-v1: stxh [r2 + 0], r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v0: f_i16:
+; CHECK-v0: stxh [r2 + 0], r1 # encoding: [0x6b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i16 %a, i16* @g_i16, align 2
   ret void
 }
 
 define void @f_i32(i32 %a) #0 {
-; CHECK-v1: f_i32:
-; CHECK-v1: stxw [r2 + 0], r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v0: f_i32:
+; CHECK-v0: stxw [r2 + 0], r1 # encoding: [0x63,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i32 %a, i32* @g_i32, align 2
   ret void
 }
 
 define void @f_i64(i64 %a) #0 {
-; CHECK-v1: f_i64:
-; CHECK-v1: stxdw [r2 + 0], r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v0: f_i64:
+; CHECK-v0: stxdw [r2 + 0], r1  # encoding: [0x7b,0x12,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i64 %a, i64* @g_i64, align 2
   ret void
 }
 
 define void @f_i32_i32(i32 %a, i32 %b) #0 {
-; CHECK-v1: f_i32_i32:
-; CHECK-v1: stxw [r3 + 0], r1
+; CHECK-v0: f_i32_i32:
+; CHECK-v0: stxw [r3 + 0], r1
   store volatile i32 %a, i32* @g_i32, align 4
-; CHECK-v1: stxw [r3 + 0], r2
+; CHECK-v0: stxw [r3 + 0], r2
   store volatile i32 %b, i32* @g_i32, align 4
   ret void
 }
 
 define void @f_i16_i32_i16(i16 %a, i32 %b, i16 %c) #0 {
-; CHECK-v1: f_i16_i32_i16:
-; CHECK-v1: stxh [r4 + 0], r1
+; CHECK-v0: f_i16_i32_i16:
+; CHECK-v0: stxh [r4 + 0], r1
   store volatile i16 %a, i16* @g_i16, align 2
-; CHECK-v1: stxw [r1 + 0], r2
+; CHECK-v0: stxw [r1 + 0], r2
   store volatile i32 %b, i32* @g_i32, align 4
-; CHECK-v1: stxh [r4 + 0], r3
+; CHECK-v0: stxh [r4 + 0], r3
   store volatile i16 %c, i16* @g_i16, align 2
   ret void
 }
 
 define void @f_i16_i64_i16(i16 %a, i64 %b, i16 %c) #0 {
-; CHECK-v1: f_i16_i64_i16:
-; CHECK-v1: stxh [r4 + 0], r1
+; CHECK-v0: f_i16_i64_i16:
+; CHECK-v0: stxh [r4 + 0], r1
   store volatile i16 %a, i16* @g_i16, align 2
-; CHECK-v1: stxdw [r1 + 0], r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
+; CHECK-v0: stxdw [r1 + 0], r2 # encoding: [0x7b,0x21,0x00,0x00,0x00,0x00,0x00,0x00]
   store volatile i64 %b, i64* @g_i64, align 8
-; CHECK-v1: stxh [r4 + 0], r3
+; CHECK-v0: stxh [r4 + 0], r3
   store volatile i16 %c, i16* @g_i16, align 2
   ret void
 }
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index 0fe748a6266f0..6cd295e00bfd4 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -1,5 +1,5 @@
-; RUN: llc -O2 -march=sbf -mcpu=sbfv2 < %s | FileCheck %s
-; RUN: llc -O2 -march=sbf -mcpu=sbfv2 -mattr=+mem-encoding < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=v1 < %s | FileCheck %s
+; RUN: llc -O2 -march=sbf -mcpu=v1 -mattr=+mem-encoding < %s | FileCheck %s
 
 ; Function Attrs: nounwind uwtable
 define i32 @caller_no_alloca(i32 %a, i32 %b, i32 %c) #0 {
@@ -10,16 +10,11 @@ entry:
 ; CHECK-NOT: add64 r10
 
 ; Saving arguments on the stack
-; CHECK: mov64 r4, 55
-; CHECK: stxdw [r10 - 32], r4
-; CHECK: mov64 r4, 60
-; CHECK: stxdw [r10 - 40], r4
-; CHECK: mov64 r4, 50
-; CHECK: stxdw [r10 - 24], r4
-; CHECK: mov64 r4, 4
-; CHECK: stxdw [r10 - 16], r4
-; CHECK: mov64 r4, 3
-; CHECK: stxdw [r10 - 8], r4
+; CHECK: stdw [r10 - 32], 55
+; CHECK: stdw [r10 - 40], 60
+; CHECK: stdw [r10 - 24], 50
+; CHECK: stdw [r10 - 16], 4
+; CHECK: stdw [r10 - 8], 3
 ; CHECK: mov64 r4, 1
 ; CHECK: mov64 r5, 2
 ; CHECK: call callee_alloca
@@ -35,22 +30,17 @@ define i32 @caller_alloca(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK: ldxw r1, [r10 + 60]
 
 ; Saving arguments in the callee's frame
-; CHECK: mov64 r4, 55
 
 ; Offset in the callee: frame_size - 32
-; CHECK: stxdw [r10 - 32], r4
-; CHECK: mov64 r4, 60
+; CHECK: stdw [r10 - 32], 55
 ; Offset in the callee: frame_size - 40
-; CHECK: stxdw [r10 - 40], r4
-; CHECK: mov64 r4, 50
+; CHECK: stdw [r10 - 40], 60
 ; Offset in the callee: frame_size - 24
-; CHECK: stxdw [r10 - 24], r4
-; CHECK: mov64 r4, 4
+; CHECK: stdw [r10 - 24], 50
 ; Offset in the callee: frame_size - 16
-; CHECK: stxdw [r10 - 16], r4
-; CHECK: mov64 r4, 3
+; CHECK: stdw [r10 - 16], 4
 ; Offset in the callee: frame_size - 8
-; CHECK: stxdw [r10 - 8], r4
+; CHECK: stdw [r10 - 8], 3
 ; CHECK: mov64 r4, 1
 ; CHECK: mov64 r5, 2
 ; CHECK: call callee_no_alloca
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index ecabfee937e28..627f60f00876d 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=v2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; Source Code:
 ; int gbl;
@@ -25,48 +25,45 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %6 = shl i32 %5, 1
   %7 = mul i32 %6, %5
   br label %13
-; CHECK: lsh64 r1, 0x20
-; CHECK: rsh64 r1, 0x20
-; CHECK: jne r1, 0x2, +0x6 <LBB0_2>
+; CHECK: mov32 w3, w1
+; CHECK: jne r3, 0x2, +0x6 <LBB0_2>
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i32 %0, %1
   %10 = load i32, i32* @gbl, align 4
   br i1 %9, label %15, label %11
 
-; CHECK: mov32 r1, 0x0
+; CHECK: mov32 w1, 0x0
 ; CHECK: hor64 r1, 0x0
-; CHECK: ldxw r0, [r1 + 0x0]
-; CHECK: mul64 r0, r0
-; CHECK: lsh64 r0, 0x1
-; CHECK: ja +0x7 <LBB0_4>
+; CHECK: ldxw w0, [r1 + 0x0]
+; CHECK: lmul32 w0, w0
+; CHECK: lsh32 w0, 0x1
+; CHECK: ja +0x5 <LBB0_4>
 
 ; <label>:11:                                     ; preds = %8
   %12 = shl nsw i32 %10, 2
   br label %13
 
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: mov32 r3, 0x0
+; CHECK: mov32 w3, 0x0
 ; CHECK: hor64 r3, 0x0
-; CHECK: ldxw r0, [r3 + 0x0]
-; CHECK: lsh64 r2, 0x20
-; CHECK: rsh64 r2, 0x20
+; CHECK: ldxw w0, [r3 + 0x0]
 ; CHECK: jeq r1, r2, +0x4 <LBB0_5>
-; CHECK: lsh64 r0, 0x2
+; CHECK: lsh32 w0, 0x2
 
 ; <label>:13:                                     ; preds = %4, %11
   %14 = phi i32 [ %12, %11 ], [ %7, %4 ]
   store i32 %14, i32* @gbl, align 4
   br label %15
 ; CHECK-LABEL: <LBB0_4>:
-; CHECK: mov32 r1, 0x0
+; CHECK: mov32 w1, 0x0
 ; CHECK: hor64 r1, 0x0
-; CHECK: stxw [r1 + 0x0], r0
+; CHECK: stxw [r1 + 0x0], w0
 
 ; <label>:15:                                     ; preds = %8, %13
   %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
   ret i32 %16
 ; CHECK-LABEL: <LBB0_5>:
-; CHECK: return
+; CHECK: exit
 }
 attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
index 085d617baa792..4f01d8b2d452a 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=v1 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
 ; Source Code:
 ; int test(int a, int b) {
@@ -27,12 +27,12 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %12 = icmp slt i32 %10, %11
   br i1 %12, label %5, label %13
 ; CHECK: mov64 r1, r3
-; CHECK: jsgt r2, r3, -0xa <LBB0_1>
+; CHECK: jslt r3, r2, -0xa <LBB0_1>
 
 ; <label>:13:                                     ; preds = %5, %2
   %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
   ret i32 %14
 ; CHECK-LABEL: <LBB0_2>:
-; CHECK: return
+; CHECK: exit
 }
 attributes #0 = { norecurse nounwind readnone }
diff --git a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
index a840258825c79..00f4b7c494345 100644
--- a/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
+++ b/llvm/test/CodeGen/SBF/objdump_imm_hex.ll
@@ -1,6 +1,6 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-DEC %s
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d --print-imm-hex - | FileCheck --check-prefix=CHECK-HEX %s
-; RUN: llc < %s -march=sbf -mcpu=sbfv2 -show-mc-encoding | FileCheck --check-prefix=CHECK-REL %s
+; RUN: llc -march=sbf -mcpu=v2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-DEC %s
+; RUN: llc -march=sbf -mcpu=v2 -filetype=obj -o - %s | llvm-objdump -d --print-imm-hex - | FileCheck --check-prefix=CHECK-HEX %s
+; RUN: llc < %s -march=sbf -mcpu=v2 -show-mc-encoding | FileCheck --check-prefix=CHECK-REL %s
 
 ; Source Code:
 ; int gbl;
@@ -26,38 +26,38 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
 ; CHECK-LABEL: test
   %3 = icmp eq i64 %0, -6067004223159161907
   br i1 %3, label %4, label %8
-; CHECK-DEC: b4 03 00 00 cd ab cd ab	mov32 r3, -0x54325433
+; CHECK-DEC: b4 03 00 00 cd ab cd ab	mov32 w3, -0x54325433
 ; CHECK-DEC: f7 03 00 00 cd ab cd ab	hor64 r3, -0x54325433
 ; CHECK-DEC: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
-; CHECK-HEX: b4 03 00 00 cd ab cd ab	mov32 r3, -0x54325433
+; CHECK-HEX: b4 03 00 00 cd ab cd ab	mov32 w3, -0x54325433
 ; CHECK-HEX: f7 03 00 00 cd ab cd ab	hor64 r3, -0x54325433
 ; CHECK-HEX: 5d 31 07 00 00 00 00 00         jne r1, r3, +0x7
 
 ; <label>:4:                                      ; preds = %2
-; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
+; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
 ; CHECK-DEC: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
-; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
+; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
 ; CHECK-HEX: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
 ; CHECK-REL:   fixup A - offset: 0, value: gbl, kind: FK_SecRel_8
   %5 = load i32, i32* @gbl, align 4
   %6 = shl i32 %5, 1
-; CHECK-DEC: 67 01 00 00 01 00 00 00         lsh64 r1, 0x1
-; CHECK-HEX: 67 01 00 00 01 00 00 00         lsh64 r1, 0x1
+; CHECK-DEC: 64 01 00 00 01 00 00 00         lsh32 w1, 0x1
+; CHECK-HEX: 64 01 00 00 01 00 00 00         lsh32 w1, 0x1
   %7 = mul i32 %6, %5
   br label %13
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i64 %1, 188899839028173
-; CHECK-DEC: b4 01 00 00 cd ab cd ab	mov32 r1, -0x54325433
+; CHECK-DEC: b4 01 00 00 cd ab cd ab	mov32 w1, -0x54325433
 ; CHECK-DEC: f7 01 00 00 cd ab 00 00	hor64 r1, 0xabcd
-; CHECK-HEX: b4 01 00 00 cd ab cd ab	mov32 r1, -0x54325433
+; CHECK-HEX: b4 01 00 00 cd ab cd ab	mov32 w1, -0x54325433
 ; CHECK-HEX: f7 01 00 00 cd ab 00 00	hor64 r1, 0xabcd
   br i1 %9, label %10, label %16
 
 ; <label>:10:                                     ; preds = %8
-; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
+; CHECK-DEC: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
 ; CHECK-DEC: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
-; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 r1, 0x0
+; CHECK-HEX: b4 01 00 00 00 00 00 00	mov32 w1, 0x0
 ; CHECK-HEX: f7 01 00 00 00 00 00 00	hor64 r1, 0x0
 ; CHECK-REL: fixup A - offset: 0, value: gbl, kind: FK_SecRel_8
   %11 = load i32, i32* @gbl, align 4
@@ -68,8 +68,8 @@ define i32 @test(i64, i64) local_unnamed_addr #0 {
   %14 = phi i32 [ %12, %10 ], [ %7, %4 ]
   %15 = phi i32 [ 2, %10 ], [ 1, %4 ]
   store i32 %14, i32* @gbl, align 4
-; CHECK-DEC: 63 12 00 00 00 00 00 00         stxw [r2 + 0x0], r1
-; CHECK-HEX: 63 12 00 00 00 00 00 00         stxw [r2 + 0x0], r1
+; CHECK-DEC: 8f 12 00 00 00 00 00 00         stxw [r2 + 0x0], w1
+; CHECK-HEX: 8f 12 00 00 00 00 00 00         stxw [r2 + 0x0], w1
   br label %16
 
 ; <label>:16:                                     ; preds = %13, %8
diff --git a/llvm/test/CodeGen/SBF/objdump_static_var.ll b/llvm/test/CodeGen/SBF/objdump_static_var.ll
index f65e775e3afc7..ec5c87e4e2a8e 100644
--- a/llvm/test/CodeGen/SBF/objdump_static_var.ll
+++ b/llvm/test/CodeGen/SBF/objdump_static_var.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK %s
+; RUN: llc -march=sbf -mcpu=v2 -filetype=obj -o - %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK %s
 
 ; src:
 ;   static volatile long a = 2;
@@ -10,20 +10,20 @@
 ; Function Attrs: norecurse nounwind
 define dso_local i32 @test() local_unnamed_addr #0 {
   %1 = load volatile i64, i64* @a, align 8, !tbaa !2
-; CHECK: mov32 r1, 0x0
+; CHECK: mov32 w1, 0x0
 ; CHECK: R_SBF_64_64	a
 ; CHECK: hor64 r1, 0x0
 ; CHECK: ldxdw r1, [r1 + 0x0]
   %2 = load volatile i32, i32* @b, align 4, !tbaa !6
-; CHECK: mov32 r2, 0x0
+; CHECK: mov32 w2, 0x0
 ; CHECK: R_SBF_64_64	b
 ; CHECK: hor64 r2, 0x0
-; CHECK: ldxw r0, [r2 + 0x0]
+; CHECK: ldxw w0, [r2 + 0x0]
   %3 = trunc i64 %1 to i32
   %4 = add i32 %2, %3
-; CHECK: add64 r0, r1
+; CHECK: add32 w0, w1
   ret i32 %4
-; CHECK: return
+; CHECK: exit
 }
 
 attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_trivial.ll b/llvm/test/CodeGen/SBF/objdump_trivial.ll
index 4cc2140198338..388c3be7a373b 100644
--- a/llvm/test/CodeGen/SBF/objdump_trivial.ll
+++ b/llvm/test/CodeGen/SBF/objdump_trivial.ll
@@ -1,6 +1,6 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
+; RUN: llc -march=sbf -mcpu=v3 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
-; CHECK: jsgt r2, r1,
+; CHECK: jslt r1, 0x0,
 ; CHECK: call 0x1
 ; CHECK: return
 ; CHECK: call 0x2
diff --git a/llvm/test/CodeGen/SBF/pqr-class.ll b/llvm/test/CodeGen/SBF/pqr-class.ll
index 5e43b15b84c2a..279ec819d0834 100644
--- a/llvm/test/CodeGen/SBF/pqr-class.ll
+++ b/llvm/test/CodeGen/SBF/pqr-class.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -mattr=+alu32 < %s | FileCheck --check-prefix=CHECK-v2 %s
+; RUN: llc -march=sbf -mcpu=v2 -mattr=+alu32 < %s | FileCheck --check-prefix=CHECK-v2 %s
 ; RUN: llc -march=sbf -mattr=+alu32 < %s | FileCheck --check-prefix=CHECK-v1 %s
 
 ; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
diff --git a/llvm/test/CodeGen/SBF/reloc-3.ll b/llvm/test/CodeGen/SBF/reloc-3.ll
index c9cecf6e1564e..8c7dc7fb86d73 100644
--- a/llvm/test/CodeGen/SBF/reloc-3.ll
+++ b/llvm/test/CodeGen/SBF/reloc-3.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj -o %t.el < %s
+; RUN: llc -march=sbf -mcpu=v3 -filetype=obj -o %t.el < %s
 ; RUN: llvm-readelf -r %t.el | FileCheck %s
 
 ; source code:
diff --git a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
index 46318a1c36878..a55b1307a8fd8 100644
--- a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
+++ b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-BPF %s
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBFv2 %s
+; RUN: llc -march=sbf -mcpu=v3 -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBFv3 %s
 
 @.str = private unnamed_addr constant [25 x i8] c"reloc_64_relative_data.c\00", align 1
 @FILE = dso_local constant i64 ptrtoint ([25 x i8]* @.str to i64), align 8
@@ -14,7 +14,7 @@ entry:
 }
 
 ; CHECK-RELOC-BPF:   RELOCATION RECORDS FOR [.data.rel.ro]:
-; CHECK-RELOC-BPF:   0000000000000000 R_BPF_64_64 .L.str
+; CHECK-RELOC-BPF:   0000000000000000 R_SBF_64_64 .L.str
 
-; CHECK-RELOC-SBFv2: RELOCATION RECORDS FOR [.data.rel.ro]:
-; CHECK-RELOC-SBFv2: 0000000000000000 R_SBF_64_ABS64 .L.str
+; CHECK-RELOC-SBFv3: RELOCATION RECORDS FOR [.data.rel.ro]:
+; CHECK-RELOC-SBFv3: 0000000000000000 R_SBF_64_ABS64 .L.str
diff --git a/llvm/test/CodeGen/SBF/reloc-btf.ll b/llvm/test/CodeGen/SBF/reloc-btf.ll
index 61cdd1460005d..579fba7cc99ac 100644
--- a/llvm/test/CodeGen/SBF/reloc-btf.ll
+++ b/llvm/test/CodeGen/SBF/reloc-btf.ll
@@ -1,4 +1,4 @@
-; RUN: llc -sbf-enable-btf-emission -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -sbf-enable-btf-emission -march=sbf -mcpu=v3 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 ; Function Attrs: norecurse nounwind readnone
 define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
diff --git a/llvm/test/CodeGen/SBF/reloc.ll b/llvm/test/CodeGen/SBF/reloc.ll
index 524a3da9db836..9c0b789151321 100644
--- a/llvm/test/CodeGen/SBF/reloc.ll
+++ b/llvm/test/CodeGen/SBF/reloc.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=sbfv2 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
+; RUN: llc -march=sbf -mcpu=v3 -filetype=obj < %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-RELOC %s
 
 %struct.bpf_context = type { i64, i64, i64, i64, i64, i64, i64 }
 %struct.sk_buff = type { i64, i64, i64, i64, i64, i64, i64 }
diff --git a/llvm/test/CodeGen/SBF/sdiv.ll b/llvm/test/CodeGen/SBF/sdiv.ll
index e00f751f8fc66..0be998ca25dc0 100644
--- a/llvm/test/CodeGen/SBF/sdiv.ll
+++ b/llvm/test/CodeGen/SBF/sdiv.ll
@@ -1,10 +1,10 @@
 ; RUN: llc -march=sbf < %s | FileCheck %s -check-prefixes=CHECK-SBF
-; RUN: llc -march=sbf -mcpu=sbfv2 < %s | FileCheck %s -check-prefixes=CHECK-SBFV2
+; RUN: llc -march=sbf -mcpu=v2 < %s | FileCheck %s -check-prefixes=CHECK-SBFV2
 
 ; Function Attrs: norecurse nounwind readnone
 define i32 @test(i32 %len) #0 {
   %1 = sdiv i32 %len, 15
 ; CHECK-SBF: call __divdi3
-; CHECK-SBFV2: sdiv64 r0, 15
+; CHECK-SBFV2: sdiv32 w0, 15
   ret i32 %1
 }
diff --git a/llvm/test/CodeGen/SBF/select_ri.ll b/llvm/test/CodeGen/SBF/select_ri.ll
index b21274085ce97..b9d710e268d46 100644
--- a/llvm/test/CodeGen/SBF/select_ri.ll
+++ b/llvm/test/CodeGen/SBF/select_ri.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=sbf -mcpu=v2 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -march=sbf -mcpu=v1 -verify-machineinstrs | FileCheck %s
 ;
 ; Source file:
 ; int b, c;
diff --git a/llvm/test/CodeGen/SBF/spill-alu32.ll b/llvm/test/CodeGen/SBF/spill-alu32.ll
index d8c6ebf83cb31..ed96651a8b491 100644
--- a/llvm/test/CodeGen/SBF/spill-alu32.ll
+++ b/llvm/test/CodeGen/SBF/spill-alu32.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=sbf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -march=sbf -mcpu=v2 < %s | FileCheck %s
 ;
 ; Source code:
 ;   void foo(int, int, int, long, int);
@@ -17,11 +17,11 @@ entry:
   tail call void @foo(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) #2
   tail call void asm sideeffect "", "~{r0},~{r1},~{r2},~{r3},~{r4},~{r5},~{r6},~{r7},~{r8},~{r9},~{memory}"() #2
 
-; CHECK:        stxw [r10 - 8], w5
-; CHECK:        stxdw [r10 - 16], r4
-; CHECK:        stxw [r10 - 24], w3
-; CHECK:        stxw [r10 - 32], w2
-; CHECK:        stxw [r10 - 40], w1
+; CHECK:        stxw [r10 + 56], w5
+; CHECK:        stxdw [r10 + 48], r4
+; CHECK:        stxw [r10 + 40], w3
+; CHECK:        stxw [r10 + 32], w2
+; CHECK:        stxw [r10 + 24], w1
 ; CHECK:        call foo
 
   tail call void @foo(i32 %a, i32 %b, i32 %c, i64 %d, i32 %e) #2
diff --git a/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll b/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll
index 8040eb767b728..9aff3ce8b3d8b 100644
--- a/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll
+++ b/llvm/test/CodeGen/SBF/sub_reversed_immediate.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=sbf -mattr=+alu32 | FileCheck  --check-prefix=CHECK-v1 %s
-; RUN: llc < %s -march=sbf -mattr=+alu32 -mcpu=sbfv2 | FileCheck  --check-prefix=CHECK-v2 %s
+; RUN: llc < %s -march=sbf -mcpu=v2 | FileCheck  --check-prefix=CHECK-v2 %s
 
 
 ; Function Attrs: norecurse nounwind readnone
diff --git a/llvm/test/MC/SBF/elf-flags.s b/llvm/test/MC/SBF/elf-flags.s
index 75089706a18e5..a0a975959ccbd 100644
--- a/llvm/test/MC/SBF/elf-flags.s
+++ b/llvm/test/MC/SBF/elf-flags.s
@@ -1,15 +1,31 @@
 # RUN: llvm-mc -triple=sbf-solana-solana -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-NONE %s
-# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=sbfv2 -filetype=obj < %s \
+# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v1 -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
-# RUN:   | FileCheck -check-prefix=CHECK-SBFV2 %s
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV1 %s
+# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v1 -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV1 %s
+# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v3 -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV3 %s
+
 
 # CHECK-NONE:       Flags [ (0x0)
 # CHECK-NONE-NEXT:  ]
 
-# CHECK-SBFV2:       Flags [ (0x20)
-# CHECK-SBFV2-NEXT:    0x20
+# CHECK-SBFV1:       Flags [ (0x1)
+# CHECK-SBFV1-NEXT:    0x1
+# CHECK-SBFV1-NEXT:  ]
+
+# CHECK-SBFV2:       Flags [ (0x2)
+# CHECK-SBFV2-NEXT:    0x2
 # CHECK-SBFV2-NEXT:  ]
 
+# CHECK-SBFV3:       Flags [ (0x3)
+# CHECK-SBFV3-NEXT:    0x1
+# CHECK-SBFV3-NEXT:    0x2
+# CHECK-SBFV3-NEXT:  ]
+
 mov64 r0, r0
diff --git a/llvm/test/MC/SBF/elf-header.s b/llvm/test/MC/SBF/elf-header.s
index ab09d7ba99b24..526e7f729857f 100644
--- a/llvm/test/MC/SBF/elf-header.s
+++ b/llvm/test/MC/SBF/elf-header.s
@@ -1,4 +1,8 @@
-# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana --mcpu=sbfv2 | llvm-readobj -h - \
+# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana --mcpu=v1 | llvm-readobj -h - \
+# RUN:     | FileCheck %s
+# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana --mcpu=v2 | llvm-readobj -h - \
+# RUN:     | FileCheck %s
+# RUN: llvm-mc %s -filetype=obj -triple=sbf-solana-solana --mcpu=v3 | llvm-readobj -h - \
 # RUN:     | FileCheck %s
 
 # CHECK: Format: elf64-sbf
@@ -16,7 +20,3 @@
 # CHECK:   Type: Relocatable (0x1)
 # CHECK:   Machine: EM_SBF (0x107)
 # CHECK:   Version: 1
-# CHECK:   Flags [ (0x20)
-# CHECK:     0x20
-# CHECK:   ]
-# CHECK: }
diff --git a/llvm/test/MC/SBF/insn-unit-32.s b/llvm/test/MC/SBF/insn-unit-32.s
index b44bbc375f40e..a3ebffc61328c 100644
--- a/llvm/test/MC/SBF/insn-unit-32.s
+++ b/llvm/test/MC/SBF/insn-unit-32.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc -triple sbf --mcpu=sbfv2 -filetype=obj -o %t %s
-# RUN: llvm-objdump  -d -r %t | FileCheck %s --check-prefixes=CHECK,CHECK-alu64
-# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck %s --check-prefixes=CHECK,CHECK-alu32
+# RUN: llvm-mc -triple sbf -filetype=obj -o %t %s
+# RUN: llvm-objdump  -d -r %t | FileCheck %s
+# RUN: llvm-objdump  --mattr=+alu32 -d -r %t | FileCheck %s
 
 // ======== BPF_ALU Class ========
   neg32 w1    // BPF_NEG
@@ -51,8 +51,6 @@
 // CHECK: 64 06 00 00 3f 00 00 00      lsh32 w6, 0x3f
 // CHECK: 74 07 00 00 20 00 00 00      rsh32 w7, 0x20
 // CHECK: a4 08 00 00 00 00 00 00      xor32 w8, 0x0
-// CHECK-alu64: b4 09 00 00 01 00 00 00      mov32 r9, 0x1
-// CHECK-alu64: b4 09 00 00 ff ff ff ff      mov32 r9, -0x1
-// CHECK-alu32: b4 09 00 00 01 00 00 00      mov32 w9, 0x1
-// CHECK-alu32: b4 09 00 00 ff ff ff ff      mov32 w9, -0x1
+// CHECK: b4 09 00 00 01 00 00 00      mov32 w9, 0x1
+// CHECK: b4 09 00 00 ff ff ff ff      mov32 w9, -0x1
 // CHECK: c4 0a 00 00 40 00 00 00      arsh32 w10, 0x40
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index 308e40eeeceb4..a781f9b31d1f0 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -1,8 +1,8 @@
-# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 --show-encoding \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=v3 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
 # RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-OLD
-# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
+# RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=v3 -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
 # RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
diff --git a/llvm/test/MC/SBF/sbf-return-syscall.s b/llvm/test/MC/SBF/sbf-return-syscall.s
index 9f3b9ca00004a..1e13462e1b48a 100644
--- a/llvm/test/MC/SBF/sbf-return-syscall.s
+++ b/llvm/test/MC/SBF/sbf-return-syscall.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj -o %t %s
+# RUN: llvm-mc -triple=sbf-solana-solana --mcpu=v3 -filetype=obj -o %t %s
 # RUN: llvm-objdump -d -r %t | FileCheck --check-prefix=CHECK %s
 
 syscall 9
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 98937d99f9c53..71ef454401383 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -2588,11 +2588,22 @@ static void disassembleObject(ObjectFile *Obj, bool InlineRelocs) {
   }
 
   // The SBF target specifies the cpu type as an ELF flag, which is not parsed automatically in LLVM objdump.
-  // We must set the CPU type here so that the disassembler can decode the SBFv2 features correctly.
+  // We must set the CPU type here so that the disassembler can decode the newer SBF features correctly.
   if (MCPU.empty() && Obj->isELF() && Obj->getArch() == Triple::sbf) {
     const auto *Elf64 = dyn_cast<ELF64LEObjectFile>(Obj);
-    if (Elf64->getPlatformFlags() & ELF::EF_SBF_V2) {
-      MCPU = "sbfv2";
+    switch (Elf64->getPlatformFlags()) {
+      case llvm::ELF::EF_SBF_V1:
+        MCPU = "v1";
+        break;
+      case llvm::ELF::EF_SBF_V2:
+        MCPU = "v2";
+        break;
+      case llvm::ELF::EF_SBF_V3:
+        MCPU = "v3";
+        break;
+      default:
+        MCPU = "generic";
+        break;
     }
   }
 

From 49158d0eab6f6b0d4c991ff1dbf251adfd323e26 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:04:55 -0300
Subject: [PATCH 068/114] [SOL] Remove unused function (#125)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index f0b8e2cf31215..1adbdccf0a471 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -39,18 +39,6 @@ static void fail(const SDLoc &DL, SelectionDAG &DAG, const Twine &Msg) {
       DiagnosticInfoUnsupported(MF.getFunction(), Msg, DL.getDebugLoc()));
 }
 
-static void fail(const SDLoc &DL, SelectionDAG &DAG, const char *Msg,
-                 SDValue Val) {
-  MachineFunction &MF = DAG.getMachineFunction();
-  std::string Str;
-  raw_string_ostream OS(Str);
-  OS << Msg;
-  Val->print(OS);
-  OS.flush();
-  DAG.getContext()->diagnose(
-      DiagnosticInfoUnsupported(MF.getFunction(), Str, DL.getDebugLoc()));
-}
-
 SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
                                      const SBFSubtarget &STI)
     : TargetLowering(TM), Subtarget(&STI) {

From 142c0a6e7f98d2ca272bc7b54bbf388b07b8ef5c Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:48:08 -0300
Subject: [PATCH 069/114] [SOL] Expand mulh for 32-bit (#127)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp |  5 ++
 llvm/test/CodeGen/SBF/mulh.ll           | 62 +++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 llvm/test/CodeGen/SBF/mulh.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 1adbdccf0a471..241baf6bfb305 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -112,6 +112,11 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     setOperationAction(ISD::SELECT_CC, VT, Custom);
   }
 
+  if (STI.getHasPqrClass() && STI.getHasAlu32()) {
+    setOperationAction(ISD::MULHU, MVT::i32, Expand);
+    setOperationAction(ISD::MULHS, MVT::i32, Expand);
+  }
+
   if (STI.getHasAlu32()) {
     setOperationAction(ISD::BSWAP, MVT::i32, Promote);
     setOperationAction(ISD::BR_CC, MVT::i32, Custom);
diff --git a/llvm/test/CodeGen/SBF/mulh.ll b/llvm/test/CodeGen/SBF/mulh.ll
new file mode 100644
index 0000000000000..23415859df215
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/mulh.ll
@@ -0,0 +1,62 @@
+; RUN: llc -O2 -march=sbf -mcpu=v2 < %s | FileCheck %s
+
+define dso_local i32 @test_32_unsigned(i32 noundef %a, i32 noundef %b) {
+entry:
+; CHECK-LABEL: test_32_unsigned
+  %conv = zext i32 %a to i64
+  %conv1 = zext i32 %b to i64
+  %mul = mul nuw i64 %conv1, %conv
+  %shr = lshr i64 %mul, 32
+  %conv2 = trunc i64 %shr to i32
+  ret i32 %conv2
+
+; CHECK: mov64 w0, w2
+; CHECK: lmul64 r0, r1
+; CHECK: rsh64 r0, 32
+; CHECK: and32 w0, -1
+}
+
+define dso_local i32 @test_32_signed(i32 noundef %a, i32 noundef %b) {
+entry:
+
+; CHECK-LABEL: test_32_signed
+  %conv = sext i32 %a to i64
+  %conv1 = sext i32 %b to i64
+  %mul = mul nsw i64 %conv1, %conv
+  %shr = lshr i64 %mul, 32
+  %conv2 = trunc i64 %shr to i32
+  ret i32 %conv2
+
+; CHECK: mov32 r1, w1
+; CHECK: mov32 r0, w2
+; CHECK: lmul64 r0, r1
+; CHECK: rsh64 r0, 32
+; CHECK: and32 w0, -1
+
+}
+
+define dso_local i64 @test_64_unsigned(i64 noundef %a, i64 noundef %b)  {
+entry:
+; CHECK-LABEL: test_64_unsigned
+  %conv = zext i64 %a to i128
+  %conv1 = zext i64 %b to i128
+  %mul = mul nuw i128 %conv1, %conv
+  %shr = lshr i128 %mul, 64
+  %conv2 = trunc i128 %shr to i64
+  ret i64 %conv2
+
+; CHECK: uhmul64 r0, r1
+}
+
+define dso_local i64 @test_64_signed(i64 noundef %a, i64 noundef %b) {
+entry:
+; CHECK-LABEL: test_64_signed
+  %conv = sext i64 %a to i128
+  %conv1 = sext i64 %b to i128
+  %mul = mul nsw i128 %conv1, %conv
+  %shr = lshr i128 %mul, 64
+  %conv2 = trunc i128 %shr to i64
+  ret i64 %conv2
+
+; CHECK: shmul64 r0, r1
+}
\ No newline at end of file

From c0826a6ff9a015e2aa16997259c16b16559e5ea8 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Sat, 18 Jan 2025 14:48:28 -0300
Subject: [PATCH 070/114] [SOL] Add return instructions for functions that end
 with unreachable (#128)

---
 llvm/lib/Target/SBF/SBFMIPeephole.cpp       | 50 ++++++++++++++++++++-
 llvm/test/CodeGen/SBF/unreachable_return.ll | 17 +++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/unreachable_return.ll

diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index 13caaf29f8b52..49c58ab18c062 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -131,6 +131,8 @@ struct SBFMIPreEmitPeephole : public MachineFunctionPass {
   static char ID;
   MachineFunction *MF;
   const TargetRegisterInfo *TRI;
+  const SBFInstrInfo *TII;
+  const SBFSubtarget *SubTarget;
 
   SBFMIPreEmitPeephole() : MachineFunctionPass(ID) {
     initializeSBFMIPreEmitPeepholePass(*PassRegistry::getPassRegistry());
@@ -141,6 +143,7 @@ struct SBFMIPreEmitPeephole : public MachineFunctionPass {
   void initialize(MachineFunction &MFParm);
 
   bool eliminateRedundantMov();
+  bool addReturn();
 
 public:
 
@@ -151,17 +154,60 @@ struct SBFMIPreEmitPeephole : public MachineFunctionPass {
 
     initialize(MF);
 
-    return eliminateRedundantMov();
+    bool PeepholeExecuted = false;
+    if (SubTarget->getHasStaticSyscalls())
+      PeepholeExecuted |= addReturn();
+
+    PeepholeExecuted |= eliminateRedundantMov();
+
+    return PeepholeExecuted;
   }
 };
 
 // Initialize class variables.
 void SBFMIPreEmitPeephole::initialize(MachineFunction &MFParm) {
   MF = &MFParm;
-  TRI = MF->getSubtarget<SBFSubtarget>().getRegisterInfo();
+  SubTarget = &MF->getSubtarget<SBFSubtarget>();
+  TRI = SubTarget->getRegisterInfo();
+  TII = SubTarget->getInstrInfo();
   LLVM_DEBUG(dbgs() << "*** SBF PreEmit peephole pass ***\n\n");
 }
 
+bool SBFMIPreEmitPeephole::addReturn() {
+  bool Added = false;
+
+  // In SBFv3, every function must either end with either a JA or a RETURN
+  // instruction. When we call a function that will never return the control
+  // flow (e.g. when the callee aborts execution), the caller last instruction
+  // will be a CALL, failing validation.
+  //
+  // Although we can change ISelLowering and manually add the return for an
+  // LLVM-IR unreachable instruction, LLVM codegen uses the target machine's
+  // return instruction to determine whether a function needs an epilogue,
+  // increasing code size more, even when we know the call won't transfer
+  // control back to the caller.
+  //
+  // In that case, we can analyze every function before emitting machine code
+  // and include a useless return instruction.
+
+  for (MachineBasicBlock &MBB: *MF) {
+    if (!MBB.succ_empty() || MBB.empty())
+      continue;
+
+    MachineInstr &MI = MBB.back();
+    unsigned Opcode = MI.getOpcode();
+    if (Opcode == SBF::JAL ||
+        Opcode == SBF::JALX ||
+        Opcode == SBF::JALX_v2 ||
+        Opcode == SBF::SYSCALL_v3) {
+      BuildMI(&MBB, MI.getDebugLoc(), TII->get(SBF::RETURN_v3));
+      Added = true;
+    }
+  }
+
+  return Added;
+}
+
 bool SBFMIPreEmitPeephole::eliminateRedundantMov() {
   MachineInstr* ToErase = nullptr;
   bool Eliminated = false;
diff --git a/llvm/test/CodeGen/SBF/unreachable_return.ll b/llvm/test/CodeGen/SBF/unreachable_return.ll
new file mode 100644
index 0000000000000..db1ac3f1c1027
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/unreachable_return.ll
@@ -0,0 +1,17 @@
+; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+
+declare void @dummy_func(i8, ptr, ptr, ptr, ptr, ptr, ptr)
+
+define internal fastcc void @test_func(ptr %0, ptr %1, ptr %args, ptr %2) {
+start:
+; CHECK: add64 r10, -64
+  %right = alloca [8 x i8], align 8
+  %left = alloca [8 x i8], align 8
+  store ptr %0, ptr %left, align 8
+  store ptr %1, ptr %right, align 8
+  call void @dummy_func(i8 0, ptr %left, ptr %left, ptr %right, ptr %right, ptr %args, ptr %2)
+  unreachable
+; CHECK: call dummy_func
+; CHECK-NOT: add64 r10, 64
+; CHECK: return
+}
\ No newline at end of file

From 9e3a910cb16398df9760b8d76fbd53d2babff653 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 21 Jan 2025 15:28:09 -0300
Subject: [PATCH 071/114] [SOL] Define page and base sizes for SBF (#129)

---
 lld/ELF/Arch/SBF.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
index 7f3921c0b46f3..6c4aab1153d02 100644
--- a/lld/ELF/Arch/SBF.cpp
+++ b/lld/ELF/Arch/SBF.cpp
@@ -38,6 +38,9 @@ class SBF final : public TargetInfo {
 SBF::SBF(Ctx &ctx) : TargetInfo(ctx) {
   relativeRel = R_SBF_64_RELATIVE;
   symbolicRel = R_SBF_64_64;
+  defaultCommonPageSize = 8;
+  defaultMaxPageSize = 8;
+  defaultImageBase = 0;
 }
 
 RelExpr SBF::getRelExpr(RelType type, const Symbol &s,
@@ -78,7 +81,6 @@ int64_t SBF::getImplicitAddend(const uint8_t *buf, RelType type) const {
   default:
     return 0;
   }
-  return 0;
 }
 
 void SBF::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {

From 34f08d12d26a0db53be0e83f9f9fe5214b84d962 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 23 Jan 2025 12:33:56 -0300
Subject: [PATCH 072/114] [SOL] Correctly disassemble store imm (#131)

---
 .../SBF/Disassembler/SBFDisassembler.cpp      | 17 ++++++++++----
 llvm/test/CodeGen/SBF/store-imm.ll            | 22 +++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
index 327b6a9b8588a..377309414e462 100644
--- a/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
+++ b/llvm/lib/Target/SBF/Disassembler/SBFDisassembler.cpp
@@ -70,6 +70,7 @@ class SBFDisassembler : public MCDisassembler {
   bool isMov32(uint64_t Inst) const { return (Inst >> 56) == 0xb4; }
   bool isNewMem(uint64_t Inst) const;
   bool isSyscallOrExit(uint64_t Inst) const { return (Inst >> 56) == 0x95; }
+  bool isAlu32NewLoadStoreReg(uint64_t Inst) const;
 };
 
 } // end anonymous namespace
@@ -172,6 +173,14 @@ bool SBFDisassembler::isNewMem(uint64_t Inst) const {
   return MSB == 0x2 || MSB == 0x3 || MSB == 0x8 || MSB == 0x9;
 }
 
+bool SBFDisassembler::isAlu32NewLoadStoreReg(uint64_t Inst) const {
+  bool IsNotDw = (Inst >> 60) != 0x9;
+  bool IsNotStoreImm = (Inst >> 56 & 0xf) != 0x7;
+  return isNewMem(Inst) && IsNotDw && IsNotStoreImm &&
+      STI.hasFeature(SBF::FeatureNewMemEncoding) &&
+      STI.hasFeature(SBF::ALU32);
+}
+
 DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
                                              ArrayRef<uint8_t> Bytes,
                                              uint64_t Address,
@@ -197,17 +206,17 @@ DecodeStatus SBFDisassembler::getInstruction(MCInst &Instr, uint64_t &Size,
            STI.hasFeature(SBF::FeatureDisableLddw))
     Result =
         decodeInstruction(DecoderTableSBFv264, Instr, Insn, Address, this, STI);
-  else if (isNewMem(Insn) && (Insn >> 60) != 0x9 &&
-           STI.hasFeature(SBF::FeatureNewMemEncoding) &&
-           STI.hasFeature(SBF::ALU32))
+  else if (isAlu32NewLoadStoreReg(Insn)) {
     Result =
         decodeInstruction(DecoderTableSBFALU32MEMv264,
                           Instr, Insn, Address, this, STI);
+  }
   else if ((isNewMem(Insn) && STI.hasFeature(SBF::FeatureNewMemEncoding)) ||
-           (isSyscallOrExit(Insn) && STI.hasFeature(SBF::FeatureStaticSyscalls)))
+           (isSyscallOrExit(Insn) && STI.hasFeature(SBF::FeatureStaticSyscalls))) {
     Result =
         decodeInstruction(DecoderTableSBFv264,
                           Instr, Insn, Address, this, STI);
+  }
   else
     Result =
         decodeInstruction(DecoderTableSBF64, Instr, Insn, Address, this, STI);
diff --git a/llvm/test/CodeGen/SBF/store-imm.ll b/llvm/test/CodeGen/SBF/store-imm.ll
index fe31bbbdbbebe..fd2092977442f 100644
--- a/llvm/test/CodeGen/SBF/store-imm.ll
+++ b/llvm/test/CodeGen/SBF/store-imm.ll
@@ -1,6 +1,7 @@
 ; RUN: llc < %s -march=sbf -mattr=+store-imm -show-mc-encoding | FileCheck %s
 ; RUN: llc < %s -march=sbf -mattr=+store-imm,+alu32 -show-mc-encoding | FileCheck %s
 ; RUN: llc < %s -march=sbf -mattr=+store-imm,+mem-encoding -show-mc-encoding | FileCheck --check-prefix=CHECK-V2 %s
+; RUN: llc -march=sbf -mcpu=v3 -filetype=obj -o - %s | llvm-objdump -d --no-print-imm-hex - | FileCheck --check-prefix=CHECK-DUMP %s
 
 define void @byte(ptr %p0) {
 ; CHECK-LABEL: byte:
@@ -10,6 +11,10 @@ define void @byte(ptr %p0) {
 
 ; CHECK-V2:    stb [r1 + 0], 1       # encoding: [0x27,0x01,0x00,0x00,0x01,0x00,0x00,0x00]
 ; CHECK-V2:    stb [r1 + 1], 255     # encoding: [0x27,0x01,0x01,0x00,0xff,0x00,0x00,0x00]
+
+; CHECK-DUMP: stb [r1 + 0], 1
+; CHECK-DUMP: stb [r1 + 1], 255
+
   %p1 = getelementptr i8, ptr %p0, i32 1
   store volatile i8  1, ptr %p0, align 1
   store volatile i8 -1, ptr %p1, align 1
@@ -23,6 +28,10 @@ define void @half(ptr, ptr %p0) {
 
 ; CHECK-V2:    sth [r2 + 0], 1          # encoding: [0x37,0x02,0x00,0x00,0x01,0x00,0x00,0x00]
 ; CHECK-V2:    sth [r2 + 2], 65535      # encoding: [0x37,0x02,0x02,0x00,0xff,0xff,0x00,0x00]
+
+; CHECK-DUMP:    sth [r2 + 0], 1
+; CHECK-DUMP:    sth [r2 + 2], 65535
+
   %p1 = getelementptr i8, ptr %p0, i32 2
   store volatile i16  1, ptr %p0, align 2
   store volatile i16 -1, ptr %p1, align 2
@@ -42,6 +51,13 @@ define void @word(ptr, ptr, ptr %p0) {
 ; CHECK-V2:    stw [r3 + 8], -2000000000  # encoding: [0x87,0x03,0x08,0x00,0x00,0x6c,0xca,0x88]
 ; CHECK-V2:    stw [r3 + 12], -1          # encoding: [0x87,0x03,0x0c,0x00,0xff,0xff,0xff,0xff]
 ; CHECK-V2:    stw [r3 + 12], 0           # encoding: [0x87,0x03,0x0c,0x00,0x00,0x00,0x00,0x00]
+
+; CHECK-DUMP:    stw [r3 + 0], 1
+; CHECK-DUMP:    stw [r3 + 4], -1
+; CHECK-DUMP:    stw [r3 + 8], -2000000000
+; CHECK-DUMP:    stw [r3 + 12], -1
+; CHECK-DUMP:    stw [r3 + 12], 0
+
   %p1 = getelementptr i8, ptr %p0, i32 4
   %p2 = getelementptr i8, ptr %p0, i32 8
   %p3 = getelementptr i8, ptr %p0, i32 12
@@ -68,6 +84,12 @@ define void @dword(ptr, ptr, ptr, ptr %p0) {
 ; CHECK-V2:    stdw [r4 + 16], -2000000000  # encoding: [0x97,0x04,0x10,0x00,0x00,0x6c,0xca,0x88]
 ; CHECK-V2:    lddw r1, 4294967295          # encoding: [0x18,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
 ; CHECK-V2:    stxdw [r4 + 24], r1          # encoding: [0x9f,0x14,0x18,0x00,0x00,0x00,0x00,0x00]
+
+; CHECK-DUMP:    stdw [r4 + 0], 1
+; CHECK-DUMP:    stdw [r4 + 8], -1
+; CHECK-DUMP:    stdw [r4 + 16], 2000000000
+; CHECK-DUMP:    stdw [r4 + 16], -2000000000
+
   %p1 = getelementptr i8, ptr %p0, i32 8
   %p2 = getelementptr i8, ptr %p0, i32 16
   %p3 = getelementptr i8, ptr %p0, i32 24

From 440b6d3d4ad72ee7341ff1af73bdb9ac266553f2 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:48:35 -0300
Subject: [PATCH 073/114] [SOL] Remove `atomic_load_sub` from SBF (#132)

* Remove atomic sub lowering

* Use v4 for artifact actions
---
 llvm/lib/Target/SBF/SBFInstrInfo.td | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index aa5376d67ba40..e15149f1818b4 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -1099,13 +1099,6 @@ let Constraints = "$dst = $val" in {
   def XFXORD : XFALU64<SBF_DW, SBF_XOR, "xor", atomic_load_xor_64>;
 }
 
-// atomic_load_sub can be represented as a neg followed
-// by an atomic_load_add.
-def : Pat<(atomic_load_sub_32 ADDRri:$addr, GPR32:$val),
-          (XFADDW32 ADDRri:$addr, (NEG_32 GPR32:$val))>;
-def : Pat<(atomic_load_sub_64 ADDRri:$addr, GPR:$val),
-          (XFADDD ADDRri:$addr, (NEG_64 GPR:$val))>;
-
 let usesCustomInserter = 1, isCodeGenOnly = 1 in {
   def ATOMIC_FENCE : Pseudo<
     (outs),

From 4176755fac7573cbbe6d308ae153ee3451e10e7f Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:47:05 -0300
Subject: [PATCH 074/114] [SOL] Use the value size for lowering arguments

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp       |  2 +-
 llvm/test/CodeGen/SBF/many_args_value_size.ll | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/CodeGen/SBF/many_args_value_size.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 241baf6bfb305..64b2b52d42ba5 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -407,7 +407,7 @@ SDValue SBFTargetLowering::LowerFormalArguments(
       if (Subtarget->getHasDynamicFrames()) {
         // In the new convention, arguments are in at the end of the callee
         // frame.
-        uint64_t Size = PtrVT.getFixedSizeInBits() / 8;
+        uint64_t Size = VA.getLocVT().getFixedSizeInBits() / 8;
         int64_t Offset = -static_cast<int64_t>(VA.getLocMemOffset() + Size);
         int FrameIndex =
             MF.getFrameInfo().CreateFixedObject(Size, Offset, false);
diff --git a/llvm/test/CodeGen/SBF/many_args_value_size.ll b/llvm/test/CodeGen/SBF/many_args_value_size.ll
new file mode 100644
index 0000000000000..4ec88671b0993
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/many_args_value_size.ll
@@ -0,0 +1,54 @@
+; RUN: llc -march=sbf -mcpu=v2 < %s | FileCheck %s
+
+define i64 @test_func(i64 %a, i64 %b, i64 %c, i64 %d, i64 %e) {
+start:
+; CHECK-LABEL: test_func:
+
+; CHECK: stw [r10 - 20], 300
+; CHECK: stdw [r10 - 32], 5400
+; CHECK: stw [r10 - 12], 65516
+; CHECK: stw [r10 - 4], 5
+
+  %res = call i64 @func(i64 %a, i64 %b, i64 %c, i64 %d, i64 %e, i8 5, i16 -20, i32 300, i64 5400)
+  ret i64 %res
+}
+
+define i64 @func(i64 %a, i64 %b, i64 %c, i64 %d, i64 %e, i8 %b8, i16 %b16, i32 %b32, i64 %b64) {
+start:
+; CHECK-LABEL: func:
+; CHECK: add64 r10, -64
+  %a1 = add i64 %a, %b
+  %a2 = sub i64 %a1, %c
+  %a3 = mul i64 %a2, %d
+  %a4 = add i64 %a3, %e
+
+; -64 + 32 = -32, so this is 5400 in %a5
+; CHECK: ldxdw r4, [r10 + 32]
+
+; -64 + 60 = -4, so this is 5 in %b8
+; CHECK: ldxw w4, [r10 + 60]
+  %c0 = trunc i64 %a to i8
+  %b1 = add i8 %b8, %c0
+
+; -64 + 52 = -12, so this is -20 in %b16
+; ldxw w1, [r10 + 52]
+  %c1 = trunc i64 %b to i16
+  %b2 = add i16 %b16, %c1
+
+; -64 + 44 = -20, so this is 300 in %b32
+; CHECK: ldxw w1, [r10 + 44]
+  %c2 = trunc i64 %c to i32
+  %b3 = add i32 %b32, %c2
+
+  %a5 = add i64 %a4, %b64
+  %b4 = sext i8 %b1 to i64
+  %a6 = sub i64 %a5, %b4
+
+  %b5 = sext i16 %b2 to i64
+  %a7 = mul i64 %a6, %b5
+
+  %b6 = sext i32 %b3 to i64
+  %a8 = add i64 %a7, %b6
+
+  ret i64 %a8
+}
\ No newline at end of file

From 70017d4368000dba5dc866abfa40e49d66988fb7 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 11 Feb 2025 15:08:20 -0300
Subject: [PATCH 075/114] [SOL] Fine tune memory operations threshold (#134)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp | 23 ++++++++++++++---------
 llvm/test/CodeGen/SBF/i128.ll           |  5 ++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 64b2b52d42ba5..1497361548813 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -170,15 +170,20 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 0;
     MaxLoadsPerMemcmp = 0;
   } else {
-    auto SelectionDAGInfo = STI.getSelectionDAGInfo();
-    // inline memcpy() for kernel to see explicit copy
-    unsigned CommonMaxStores =
-      SelectionDAGInfo->getCommonMaxStoresPerMemFunc();
-
-    MaxStoresPerMemset = MaxStoresPerMemsetOptSize = CommonMaxStores;
-    MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = CommonMaxStores;
-    MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = CommonMaxStores;
-    MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = CommonMaxStores;
+    // A syscall consumes at least 10 CUs, so we should only invoke it when
+    // the number of instructions is at least 10.
+
+    // Memset translates to stdw or stdxw, so the maximum should be 10.
+    MaxStoresPerMemset = MaxStoresPerMemsetOptSize = 10;
+    // Each store in memcpy follows a load, so the maximum is 5.
+    MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = 5;
+    // Each store in memmove follows a load, so the maximum is 5.
+    MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 5;
+    // Memcmp expands to three instructions for each load:
+    // 1. One load for each pointer being compared.
+    // 2. One jne for each load.
+    // The limit here should be three, since 3*3 = 9;
+    MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = 3;
   }
 
   // CPU/Feature control
diff --git a/llvm/test/CodeGen/SBF/i128.ll b/llvm/test/CodeGen/SBF/i128.ll
index 1c2bedc77438a..8f0d8f6ebadb4 100644
--- a/llvm/test/CodeGen/SBF/i128.ll
+++ b/llvm/test/CodeGen/SBF/i128.ll
@@ -32,10 +32,9 @@ entry:
 }
 
 ; CHECK-LABEL: test
-; CHECK:       mov64 r7, r10
-; CHECK:       add64 r7, -32 
-; CHECK:       mov64 r1, r7
 ; CHECK:       stxw [r10 - 32], r{{[0-9]+}}
+; CHECK:       mov64 r1, r10
+; CHECK:       add64 r1, -32
 
 ; Function Attrs: argmemonly nounwind willreturn
 declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1

From f8f668219789c28cea98ab988445aef23fb99862 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 11 Feb 2025 21:34:12 -0300
Subject: [PATCH 076/114] [SOL] Remove expand in order option (#135)

---
 llvm/lib/Target/SBF/CMakeLists.txt            |  1 -
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 88 +++---------------
 llvm/lib/Target/SBF/SBFISelLowering.h         |  5 -
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          | 89 ------------------
 llvm/lib/Target/SBF/SBFInstrInfo.h            |  3 -
 llvm/lib/Target/SBF/SBFInstrInfo.td           | 15 ---
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp   | 48 ----------
 llvm/lib/Target/SBF/SBFSelectionDAGInfo.h     |  6 --
 .../CodeGen/SBF/memcpy-expand-in-order.ll     | 76 ---------------
 llvm/test/CodeGen/SBF/memcpy_16.ll            | 93 -------------------
 10 files changed, 15 insertions(+), 409 deletions(-)
 delete mode 100644 llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
 delete mode 100644 llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
 delete mode 100644 llvm/test/CodeGen/SBF/memcpy_16.ll

diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index 9e1111d368afb..ce6b51321e8fb 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -27,7 +27,6 @@ add_llvm_target(SBFCodeGen
   SBFMCInstLower.cpp
   SBFPreserveDIType.cpp
   SBFRegisterInfo.cpp
-  SBFSelectionDAGInfo.cpp
   SBFSubtarget.cpp
   SBFTargetMachine.cpp
   SBFMIPeephole.cpp
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 1497361548813..0ff998fb25043 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -29,10 +29,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "sbf-lower"
 
-static cl::opt<bool> SBFExpandMemcpyInOrder("sbf-expand-memcpy-in-order",
-  cl::Hidden, cl::init(false),
-  cl::desc("Expand memcpy into load/store pairs in order"));
-
 static void fail(const SDLoc &DL, SelectionDAG &DAG, const Twine &Msg) {
   MachineFunction &MF = DAG.getMachineFunction();
   DAG.getContext()->diagnose(
@@ -153,38 +149,20 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
   setMinFunctionAlignment(Align(8));
   setPrefFunctionAlignment(Align(8));
 
-  if (SBFExpandMemcpyInOrder) {
-    // LLVM generic code will try to expand memcpy into load/store pairs at this
-    // stage which is before quite a few IR optimization passes, therefore the
-    // loads and stores could potentially be moved apart from each other which
-    // will cause trouble to memcpy pattern matcher inside kernel eBPF JIT
-    // compilers.
-    //
-    // When -sbf-expand-memcpy-in-order specified, we want to defer the expand
-    // of memcpy to later stage in IR optimization pipeline so those load/store
-    // pairs won't be touched and could be kept in order. Hence, we set
-    // MaxStoresPerMem* to zero to disable the generic getMemcpyLoadsAndStores
-    // code path, and ask LLVM to use target expander EmitTargetCodeForMemcpy.
-    MaxStoresPerMemset = MaxStoresPerMemsetOptSize = 0;
-    MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = 0;
-    MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 0;
-    MaxLoadsPerMemcmp = 0;
-  } else {
-    // A syscall consumes at least 10 CUs, so we should only invoke it when
-    // the number of instructions is at least 10.
-
-    // Memset translates to stdw or stdxw, so the maximum should be 10.
-    MaxStoresPerMemset = MaxStoresPerMemsetOptSize = 10;
-    // Each store in memcpy follows a load, so the maximum is 5.
-    MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = 5;
-    // Each store in memmove follows a load, so the maximum is 5.
-    MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 5;
-    // Memcmp expands to three instructions for each load:
-    // 1. One load for each pointer being compared.
-    // 2. One jne for each load.
-    // The limit here should be three, since 3*3 = 9;
-    MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = 3;
-  }
+  // A syscall consumes at least 10 CUs, so we should only invoke it when
+  // the number of instructions is at least 10.
+
+  // Memset translates to stdw or stdxw, so the maximum should be 10.
+  MaxStoresPerMemset = MaxStoresPerMemsetOptSize = 10;
+  // Each store in memcpy follows a load, so the maximum is 5.
+  MaxStoresPerMemcpy = MaxStoresPerMemcpyOptSize = 5;
+  // Each store in memmove follows a load, so the maximum is 5.
+  MaxStoresPerMemmove = MaxStoresPerMemmoveOptSize = 5;
+  // Memcmp expands to three instructions for each load:
+  // 1. One load for each pointer being compared.
+  // 2. One jne for each load.
+  // The limit here should be three, since 3*3 = 9;
+  MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = 3;
 
   // CPU/Feature control
   HasAlu32 = STI.getHasAlu32();
@@ -915,8 +893,6 @@ const char *SBFTargetLowering::getTargetNodeName(unsigned Opcode) const {
     return "SBFISD::BR_CC";
   case SBFISD::Wrapper:
     return "SBFISD::Wrapper";
-  case SBFISD::MEMCPY:
-    return "SBFISD::MEMCPY";
   }
   return nullptr;
 }
@@ -966,37 +942,6 @@ SBFTargetLowering::EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB,
   return PromotedReg2;
 }
 
-MachineBasicBlock *
-SBFTargetLowering::EmitInstrWithCustomInserterMemcpy(MachineInstr &MI,
-                                                     MachineBasicBlock *BB)
-                                                     const {
-  MachineFunction *MF = MI.getParent()->getParent();
-  MachineRegisterInfo &MRI = MF->getRegInfo();
-  MachineInstrBuilder MIB(*MF, MI);
-  unsigned ScratchReg;
-
-  // This function does custom insertion during lowering SBFISD::MEMCPY which
-  // only has two register operands from memcpy semantics, the copy source
-  // address and the copy destination address.
-  //
-  // Because we will expand SBFISD::MEMCPY into load/store pairs, we will need
-  // a third scratch register to serve as the destination register of load and
-  // source register of store.
-  //
-  // The scratch register here is with the Define | Dead | EarlyClobber flags.
-  // The EarlyClobber flag has the semantic property that the operand it is
-  // attached to is clobbered before the rest of the inputs are read. Hence it
-  // must be unique among the operands to the instruction. The Define flag is
-  // needed to coerce the machine verifier that an Undef value isn't a problem
-  // as we anyway is loading memory into it. The Dead flag is needed as the
-  // value in scratch isn't supposed to be used by any other instruction.
-  ScratchReg = MRI.createVirtualRegister(&SBF::GPRRegClass);
-  MIB.addReg(ScratchReg,
-             RegState::Define | RegState::Dead | RegState::EarlyClobber);
-
-  return BB;
-}
-
 MachineBasicBlock *
 SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
                                                MachineBasicBlock *BB) const {
@@ -1008,7 +953,6 @@ SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
                        Opc == SBF::Select_32 ||
                        Opc == SBF::Select_32_64);
 
-  bool isMemcpyOp = Opc == SBF::MEMCPY;
   bool isAtomicFence = Opc == SBF::ATOMIC_FENCE;
 
 #ifndef NDEBUG
@@ -1018,12 +962,10 @@ SBFTargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
                        Opc == SBF::Select_Ri_32_64);
 
 
-  assert((isSelectRROp || isSelectRIOp || isMemcpyOp || isAtomicFence) &&
+  assert((isSelectRROp || isSelectRIOp || isAtomicFence) &&
          "Unexpected instr type to insert");
 #endif
 
-  if (isMemcpyOp)
-    return EmitInstrWithCustomInserterMemcpy(MI, BB);
 
   if (isAtomicFence) {
     // this is currently a nop
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index 4db49e50a6fc0..e35c4753b3294 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -28,7 +28,6 @@ enum NodeType : unsigned {
   SELECT_CC,
   BR_CC,
   Wrapper,
-  MEMCPY,
 };
 }
 
@@ -159,10 +158,6 @@ class SBFTargetLowering : public TargetLowering {
   unsigned EmitSubregExt(MachineInstr &MI, MachineBasicBlock *BB, unsigned Reg,
                          bool isSigned) const;
 
-  MachineBasicBlock * EmitInstrWithCustomInserterMemcpy(MachineInstr &MI,
-                                                        MachineBasicBlock *BB)
-                                                        const;
-
 };
 }
 
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index b001fd9cdce8a..7c70e6680d2cc 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -51,95 +51,6 @@ void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
     llvm_unreachable("Impossible reg-to-reg copy");
 }
 
-void SBFInstrInfo::expandMEMCPY(MachineBasicBlock::iterator MI) const {
-  Register DstReg = MI->getOperand(0).getReg();
-  Register SrcReg = MI->getOperand(1).getReg();
-  uint64_t CopyLen = MI->getOperand(2).getImm();
-  uint64_t Alignment = MI->getOperand(3).getImm();
-  Register ScratchReg = MI->getOperand(4).getReg();
-  MachineBasicBlock *BB = MI->getParent();
-  DebugLoc dl = MI->getDebugLoc();
-  unsigned LdOpc, StOpc;
-
-#define MEM_SWITCH(X) \
-LdOpc = NewMemEncoding ? SBF::LD##X##_V2 : SBF::LD##X##_V1; \
-StOpc = NewMemEncoding ? SBF::ST##X##_V2 : SBF::ST##X##_V1;
-
-  unsigned BytesPerOp = std::min(static_cast<unsigned>(Alignment), 8u);
-  switch (Alignment) {
-  case 1:
-    MEM_SWITCH(B)
-    break;
-  case 2:
-    MEM_SWITCH(H)
-    break;
-  case 4:
-    MEM_SWITCH(W)
-    break;
-  case 8:
-  case 16:
-    MEM_SWITCH(D)
-    break;
-  default:
-    llvm_unreachable("unsupported memcpy alignment");
-  }
-
-  unsigned IterationNum = (CopyLen >> Log2_64(BytesPerOp));
-  for (unsigned I = 0; I < IterationNum; ++I) {
-    BuildMI(*BB, MI, dl, get(LdOpc))
-        .addReg(ScratchReg, RegState::Define)
-        .addReg(SrcReg)
-        .addImm(I * BytesPerOp);
-    BuildMI(*BB, MI, dl, get(StOpc))
-        .addReg(ScratchReg, RegState::Kill)
-        .addReg(DstReg)
-        .addImm(I * BytesPerOp);
-  }
-
-  unsigned BytesLeft = CopyLen - IterationNum * BytesPerOp;
-  unsigned Offset;
-  if (BytesLeft == 0) {
-    BB->erase(MI);
-    return;
-  }
-
-  if (BytesLeft < 2) {
-    Offset = CopyLen - 1;
-    MEM_SWITCH(B)
-  } else if (BytesLeft <= 2) {
-    Offset = CopyLen - 2;
-    MEM_SWITCH(H)
-  } else if (BytesLeft <= 4) {
-    Offset = CopyLen - 4;
-    MEM_SWITCH(W)
-  } else if (BytesLeft <= 8) {
-    Offset = CopyLen - 8;
-    MEM_SWITCH(D)
-  } else {
-    llvm_unreachable("There cannot be more than 8 bytes left");
-  }
-
-  BuildMI(*BB, MI, dl, get(LdOpc))
-      .addReg(ScratchReg, RegState::Define)
-      .addReg(SrcReg)
-      .addImm(Offset);
-  BuildMI(*BB, MI, dl, get(StOpc))
-      .addReg(ScratchReg, RegState::Kill)
-      .addReg(DstReg)
-      .addImm(Offset);
-
-  BB->erase(MI);
-}
-
-bool SBFInstrInfo::expandPostRAPseudo(MachineInstr &MI) const {
-  if (MI.getOpcode() == SBF::MEMCPY) {
-    expandMEMCPY(MI);
-    return true;
-  }
-
-  return false;
-}
-
 void SBFInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
                                        MachineBasicBlock::iterator I,
                                        Register SrcReg, bool IsKill, int FI,
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index a6ee6ad4767f2..76163e7e828a2 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -33,8 +33,6 @@ class SBFInstrInfo : public SBFGenInstrInfo {
                    const DebugLoc &DL, MCRegister DestReg, MCRegister SrcReg,
                    bool KillSrc) const override;
 
-  bool expandPostRAPseudo(MachineInstr &MI) const override;
-
   void storeRegToStackSlot(MachineBasicBlock &MBB,
                            MachineBasicBlock::iterator MBBI, Register SrcReg,
                            bool isKill, int FrameIndex,
@@ -61,7 +59,6 @@ class SBFInstrInfo : public SBFGenInstrInfo {
   void initializeTargetFeatures(bool HasExplicitSext, bool NewMemEncoding);
 
 private:
-  void expandMEMCPY(MachineBasicBlock::iterator) const;
   bool HasExplicitSignExt;
   bool NewMemEncoding;
 };
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index e15149f1818b4..7f8fc8bdf7847 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -28,10 +28,6 @@ def SDT_SBFBrCC         : SDTypeProfile<0, 4, [SDTCisSameAs<0, 1>,
                                                SDTCisVT<3, OtherVT>]>;
 def SDT_SBFWrapper      : SDTypeProfile<1, 1, [SDTCisSameAs<0, 1>,
                                                SDTCisPtrTy<0>]>;
-def SDT_SBFMEMCPY       : SDTypeProfile<0, 4, [SDTCisVT<0, i64>,
-                                               SDTCisVT<1, i64>,
-                                               SDTCisVT<2, i64>,
-                                               SDTCisVT<3, i64>]>;
 
 def SBFcall         : SDNode<"SBFISD::CALL", SDT_SBFCall,
                              [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
@@ -47,9 +43,6 @@ def SBFbrcc         : SDNode<"SBFISD::BR_CC", SDT_SBFBrCC,
 
 def SBFselectcc     : SDNode<"SBFISD::SELECT_CC", SDT_SBFSelectCC, [SDNPInGlue]>;
 def SBFWrapper      : SDNode<"SBFISD::Wrapper", SDT_SBFWrapper>;
-def SBFmemcpy       : SDNode<"SBFISD::MEMCPY", SDT_SBFMEMCPY,
-                             [SDNPHasChain, SDNPInGlue, SDNPOutGlue,
-                              SDNPMayStore, SDNPMayLoad]>;
 def SBFIsLittleEndian : Predicate<"CurDAG->getDataLayout().isLittleEndian()">;
 def SBFIsBigEndian    : Predicate<"!CurDAG->getDataLayout().isLittleEndian()">;
 def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
@@ -1463,11 +1456,3 @@ let Predicates = [SBFHasALU32, SBFNewMemEncoding] in {
   def : Pat<(i64 (extloadi32 ADDRri:$src)),
             (SUBREG_TO_REG (i64 0), (LDW32_V2 ADDRri:$src), sub_32)>;
 }
-
-let usesCustomInserter = 1, isCodeGenOnly = 1 in {
-    def MEMCPY : Pseudo<
-      (outs),
-      (ins GPR:$dst, GPR:$src, i64imm:$len, i64imm:$align, variable_ops),
-      "#memcpy dst: $dst, src: $src, len: $len, align: $align",
-      [(SBFmemcpy GPR:$dst, GPR:$src, imm:$len, imm:$align)]>;
-}
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
deleted file mode 100644
index 5e2b14507baed..0000000000000
--- a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===-- SBFSelectionDAGInfo.cpp - SBF SelectionDAG Info -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the SBFSelectionDAGInfo class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "SBFTargetMachine.h"
-#include "llvm/CodeGen/SelectionDAG.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "SBFSelectionDAGInfo.h"
-
-using namespace llvm;
-
-#define DEBUG_TYPE "sbf-selectiondag-info"
-
-SDValue SBFSelectionDAGInfo::EmitTargetCodeForMemcpy(
-    SelectionDAG &DAG, const SDLoc &dl, SDValue Chain, SDValue Dst, SDValue Src,
-    SDValue Size, Align Alignment, bool isVolatile, bool AlwaysInline,
-    MachinePointerInfo DstPtrInfo, MachinePointerInfo SrcPtrInfo) const {
-  // Requires the copy size to be a constant.
-  ConstantSDNode *ConstantSize = dyn_cast<ConstantSDNode>(Size);
-  if (!ConstantSize)
-    return SDValue();
-
-  unsigned CopyLen = ConstantSize->getZExtValue();
-  // If the alignment is greater than 8, we can only store and load 8 bytes at a
-  // time.
-  uint64_t BytesPerOp = std::min(Alignment.value(), static_cast<uint64_t>(8));
-  unsigned StoresNumEstimate =
-      alignTo(CopyLen, Alignment) >> Log2_64(BytesPerOp);
-  // Impose the same copy length limit as MaxStoresPerMemcpy.
-  if (StoresNumEstimate > getCommonMaxStoresPerMemFunc())
-    return SDValue();
-
-  SDVTList VTs = DAG.getVTList(MVT::Other, MVT::Glue);
-
-  Dst = DAG.getNode(SBFISD::MEMCPY, dl, VTs, Chain, Dst, Src,
-                    DAG.getConstant(CopyLen, dl, MVT::i64),
-                    DAG.getConstant(Alignment.value(), dl, MVT::i64));
-
-  return Dst.getValue(0);
-}
diff --git a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
index 8fc1638d49bb0..49fe4f4fb3d0f 100644
--- a/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
+++ b/llvm/lib/Target/SBF/SBFSelectionDAGInfo.h
@@ -20,12 +20,6 @@ namespace llvm {
 class SBFSelectionDAGInfo : public SelectionDAGTargetInfo {
 public:
   SBFSelectionDAGInfo() {}
-  SDValue EmitTargetCodeForMemcpy(SelectionDAG &DAG, const SDLoc &dl,
-                                  SDValue Chain, SDValue Dst, SDValue Src,
-                                  SDValue Size, Align Alignment,
-                                  bool isVolatile, bool AlwaysInline,
-                                  MachinePointerInfo DstPtrInfo,
-                                  MachinePointerInfo SrcPtrInfo) const override;
 
   unsigned getCommonMaxStoresPerMemFunc() const {
     return 4;
diff --git a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll b/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
deleted file mode 100644
index e081396d3fc49..0000000000000
--- a/llvm/test/CodeGen/SBF/memcpy-expand-in-order.ll
+++ /dev/null
@@ -1,76 +0,0 @@
-; RUN: llc < %s -march=sbf -verify-machineinstrs -sbf-expand-memcpy-in-order | FileCheck %s
-;
-; #define COPY_LEN	9
-;
-; void cal_align1(void *a, void *b)
-; {
-;   __builtin_memcpy(a, b, COPY_LEN);
-; }
-;
-; void cal_align2(short *a, short *b)
-; {
-;   __builtin_memcpy(a, b, COPY_LEN);
-; }
-;
-; #undef COPY_LEN
-; #define COPY_LEN	19
-; void cal_align4(int *a, int *b)
-; {
-;   __builtin_memcpy(a, b, COPY_LEN);
-; }
-;
-; #undef COPY_LEN
-; #define COPY_LEN	27
-; void cal_align8(long long *a, long long *b)
-; {
-;   __builtin_memcpy(a, b, COPY_LEN);
-; }
-
-; Function Attrs: nounwind
-define dso_local void @cal_align1(i8* nocapture %a, i8* nocapture readonly %b) local_unnamed_addr #0 {
-entry:
-  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %a, i8* align 1 %b, i64 9, i1 false)
-  ret void
-}
-
-; Function Attrs: argmemonly nounwind
-declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1
-
-; CHECK: call memcpy
-
-; Function Attrs: nounwind
-define dso_local void @cal_align2(i16* nocapture %a, i16* nocapture readonly %b) local_unnamed_addr #0 {
-entry:
-  %0 = bitcast i16* %a to i8*
-  %1 = bitcast i16* %b to i8*
-  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 2 %0, i8* align 2 %1, i64 9, i1 false)
-  ret void
-}
-; CHECK: call memcpy
-
-; Function Attrs: nounwind
-define dso_local void @cal_align4(i32* nocapture %a, i32* nocapture readonly %b) local_unnamed_addr #0 {
-entry:
-  %0 = bitcast i32* %a to i8*
-  %1 = bitcast i32* %b to i8*
-  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %0, i8* align 4 %1, i64 19, i1 false)
-  ret void
-}
-; CHECK: call memcpy
-
-; Function Attrs: nounwind
-define dso_local void @cal_align8(i64* nocapture %a, i64* nocapture readonly %b) local_unnamed_addr #0 {
-entry:
-  %0 = bitcast i64* %a to i8*
-  %1 = bitcast i64* %b to i8*
-  tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 %0, i8* align 8 %1, i64 27, i1 false)
-  ret void
-}
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG]]
-; CHECK: ldxdw [[SCRATCH_REG]], [[[SRC_REG]] + 8]
-; CHECK: stxdw [[[DST_REG]] + 8], [[SCRATCH_REG]]
-; CHECK: ldxdw [[SCRATCH_REG]], [[[SRC_REG]] + 16]
-; CHECK: stxdw [[[DST_REG]] + 16], [[SCRATCH_REG]]
-; CHECK: ldxw [[SCRATCH_REG]], [[[SRC_REG]] + 23]
-; CHECK: stxw [[[DST_REG]] + 23], [[SCRATCH_REG]]
diff --git a/llvm/test/CodeGen/SBF/memcpy_16.ll b/llvm/test/CodeGen/SBF/memcpy_16.ll
deleted file mode 100644
index 678fb7aa28790..0000000000000
--- a/llvm/test/CodeGen/SBF/memcpy_16.ll
+++ /dev/null
@@ -1,93 +0,0 @@
-; RUN: llc < %s -march=sbf -sbf-expand-memcpy-in-order | FileCheck %s
-; RUN: llc < %s -march=sbf -sbf-expand-memcpy-in-order -mattr=+mem-encoding | FileCheck %s
-
-; Function Attrs: mustprogress nocallback nofree nounwind willreturn memory(argmem: readwrite)
-declare void @llvm.memcpy.p0.p0.i64(ptr noalias nocapture writeonly, ptr noalias nocapture readonly, i64, i1 immarg) #1
-
-define void @memcpy_test_1(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
-entry:
-  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 32, i1 0)
-
-;  4 pairs of loads and stores
-; CHECK: memcpy_test_1
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 16]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 16], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 24]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 24], [[SCRATCH_REG:r[0-9]]]
-  ret void
-}
-
-define void @memcpy_test_2(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
-entry:
-  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 17, i1 0)
-
-; 2 pairs of loads and stores + 1 pair for the byte
-; CHECK: memcpy_test_2
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxb [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 16]
-; CHECK: stxb [[[DST_REG:r[0-9]]] + 16], [[SCRATCH_REG:r[0-9]]]
-  ret void
-}
-
-define void @memcpy_test_3(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
-entry:
-  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 18, i1 0)
-
-; 2 pairs of loads and stores + 1 pair for the 2 bytes
-; CHECK: memcpy_test_3
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxh [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 16]
-; CHECK: stxh [[[DST_REG:r[0-9]]] + 16], [[SCRATCH_REG:r[0-9]]]
-  ret void
-}
-
-define void @memcpy_test_4(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
-entry:
-  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 19, i1 0)
-
-; 2 pairs of loads and stores + 1 pair for the 3 bytes
-; CHECK: memcpy_test_4
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 15]
-; CHECK: stxw [[[DST_REG:r[0-9]]] + 15], [[SCRATCH_REG:r[0-9]]]
-  ret void
-}
-
-define void @memcpy_test_5(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
-entry:
-  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 21, i1 0)
-
-; 2 pairs of loads and stores + 1 pair for the 5 bytes
-; CHECK: memcpy_test_5
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 0]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 0], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 8]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 8], [[SCRATCH_REG:r[0-9]]]
-; CHECK: ldxdw [[SCRATCH_REG:r[0-9]]], [[[SRC_REG:r[0-9]]] + 13]
-; CHECK: stxdw [[[DST_REG:r[0-9]]] + 13], [[SCRATCH_REG:r[0-9]]]
-  ret void
-}
-
-define void @memcpy_test_6(ptr align 16 %a, ptr align 16 %b) local_unnamed_addr #0 {
-entry:
-  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %a, ptr align 16 %b, i64 33, i1 0)
-
-; More than 32 bytes, call memcpy
-; CHECK: memcpy_test_6
-; CHECK: mov64 r3, 33
-; CHECK: call memcpy
-  ret void
-}
\ No newline at end of file

From 318a2956b7dd683859e6726dbffb77bf66fcb680 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:00:50 -0300
Subject: [PATCH 077/114] [SOL] Create SBF sub architectures (#136)

* Split targets

* Use sbpf instead of sbf for triples
---
 llvm/include/llvm/TargetParser/Triple.h       |  5 +++
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |  4 ++-
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |  5 +--
 .../Target/SBF/TargetInfo/SBFTargetInfo.cpp   | 26 +++++++++++++++
 .../lib/Target/SBF/TargetInfo/SBFTargetInfo.h |  2 ++
 llvm/lib/TargetParser/Triple.cpp              | 17 +++++++++-
 llvm/test/CodeGen/SBF/many_args_new_conv.ll   |  1 +
 llvm/test/CodeGen/SBF/many_args_value_size.ll |  1 +
 llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll      |  1 +
 llvm/test/MC/SBF/elf-flags.s                  | 14 +++++++-
 llvm/test/MC/SBF/sbf-jmp.s                    |  2 ++
 llvm/unittests/TargetParser/TripleTest.cpp    | 33 +++++++++++++++++++
 12 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index d5a759a32b4dd..14290951015ea 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -165,6 +165,7 @@ class Triple {
     SPIRVSubArch_v15,
     SPIRVSubArch_v16,
 
+
     // DXIL sub-arch corresponds to its version.
     DXILSubArch_v1_0,
     DXILSubArch_v1_1,
@@ -176,6 +177,10 @@ class Triple {
     DXILSubArch_v1_7,
     DXILSubArch_v1_8,
     LatestDXILSubArch = DXILSubArch_v1_8,
+
+    SBFSubArch_v1,
+    SBFSubArch_v2,
+    SBFSubArch_v3,
   };
   enum VendorType {
     UnknownVendor,
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 621145e116594..778598e2ce8ae 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -54,7 +54,9 @@ static MCRegisterInfo *createSBFMCRegisterInfo(const Triple &TT) {
 
 static MCSubtargetInfo *createSBFMCSubtargetInfo(const Triple &TT,
                                                  StringRef CPU, StringRef FS) {
-  return createSBFMCSubtargetInfoImpl(TT, CPU, /*TuneCPU*/ CPU, FS);
+  std::string CpuStr = cpuFromSubArch(TT, CPU.str());
+  StringRef CpuRef = CpuStr;
+  return createSBFMCSubtargetInfoImpl(TT, CpuRef, /*TuneCPU*/ CpuRef, FS);
 }
 
 static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index d6821041a4f5d..51b533672d665 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -14,6 +14,7 @@
 #include "SBF.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/TargetParser/Host.h"
+#include "TargetInfo/SBFTargetInfo.h"
 
 using namespace llvm;
 
@@ -59,8 +60,8 @@ void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
 
 SBFSubtarget::SBFSubtarget(const Triple &TT, const std::string &CPU,
                            const std::string &FS, const TargetMachine &TM)
-    : SBFGenSubtargetInfo(TT, CPU, /*TuneCPU*/ CPU, FS), InstrInfo(),
-      FrameLowering(initializeSubtargetDependencies(TT, CPU, FS)),
+    : SBFGenSubtargetInfo(TT, cpuFromSubArch(TT, CPU), /*TuneCPU*/ cpuFromSubArch(TT, CPU), FS), InstrInfo(),
+      FrameLowering(initializeSubtargetDependencies(TT, cpuFromSubArch(TT, CPU), FS)),
       TLInfo(TM, *this) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
 }
diff --git a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
index 45c2f38e21fd3..43ab953ac2d3b 100644
--- a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
+++ b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
@@ -16,6 +16,32 @@ Target &llvm::getTheSBFXTarget() {
   return TheSBFTarget;
 }
 
+std::string llvm::cpuFromSubArch(const Triple &TT, const std::string &CPU) {
+  std::string CpuType;
+  switch (TT.getSubArch()) {
+  case Triple::SBFSubArch_v1:
+    CpuType = "v1";
+    break;
+  case Triple::SBFSubArch_v2:
+    CpuType = "v2";
+    break;
+  case Triple::SBFSubArch_v3:
+    CpuType = "v3";
+    break;
+  default:
+    break;
+  }
+
+  assert((CPU.empty() || CpuType.empty() || CPU == CpuType) &&
+         "Subarch type must match CPU type");
+
+  if (!CpuType.empty()) {
+    return CpuType;
+  }
+
+  return CPU;
+}
+
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTargetInfo() {
   TargetRegistry::RegisterTarget(
       getTheSBFXTarget(), "sbf", "SBF new (little endian)", "SBF",
diff --git a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h
index 5c18b063b83d1..c095135ddb4e2 100644
--- a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h
+++ b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.h
@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+#include "llvm/TargetParser/Triple.h"
 
 #ifndef LLVM_LIB_TARGET_SBF_TARGETINFO_SBFTARGETINFO_H
 #define LLVM_LIB_TARGET_SBF_TARGETINFO_SBFTARGETINFO_H
@@ -14,6 +15,7 @@ namespace llvm {
 class Target;
 
 Target &getTheSBFXTarget();
+std::string cpuFromSubArch(const Triple &TT, const std::string &CPU);
 } // namespace llvm
 
 #endif // LLVM_LIB_TARGET_SBF_TARGETINFO_SBFTARGETINFO_H
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index ae8be17f64c8d..46975af6e5361 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -414,6 +414,10 @@ static Triple::ArchType parseBPFArch(StringRef ArchName) {
     return Triple::bpfeb;
   } else if (ArchName == "bpf_le" || ArchName == "bpfel") {
     return Triple::bpfel;
+  } else if (ArchName.equals("sbf") || ArchName.equals("sbpf") ||
+             ArchName.equals("sbpfv1") || ArchName.equals("sbpfv2") ||
+             ArchName.equals("sbpfv3")) {
+    return Triple::sbf;
   } else {
     return Triple::UnknownArch;
   }
@@ -449,6 +453,8 @@ Triple::ArchType Triple::getArchTypeForLLVMName(StringRef Name) {
     .Case("riscv32", riscv32)
     .Case("riscv64", riscv64)
     .Case("hexagon", hexagon)
+    .Case("sbf", BPFArch)
+    .Case("sbpf", BPFArch)
     .Case("sparc", sparc)
     .Case("sparcel", sparcel)
     .Case("sparcv9", sparcv9)
@@ -640,7 +646,8 @@ static Triple::ArchType parseArch(StringRef ArchName) {
     if (ArchName.starts_with("arm") || ArchName.starts_with("thumb") ||
         ArchName.starts_with("aarch64"))
       return parseARMArch(ArchName);
-    if (ArchName.starts_with("bpf"))
+    if (ArchName.starts_with("bpf") || ArchName.starts_with("sbf") ||
+        ArchName.starts_with("sbpf"))
       return parseBPFArch(ArchName);
   }
 
@@ -821,6 +828,14 @@ static Triple::SubArchType parseSubArch(StringRef SubArchName) {
         .EndsWith("v1.8", Triple::DXILSubArch_v1_8)
         .Default(Triple::NoSubArch);
 
+  if (SubArchName.starts_with("sbpf")) {
+    return StringSwitch<Triple::SubArchType>(SubArchName)
+        .EndsWith("v1", Triple::SBFSubArch_v1)
+        .EndsWith("v2", Triple::SBFSubArch_v2)
+        .EndsWith("v3", Triple::SBFSubArch_v3)
+        .Default(Triple::NoSubArch);
+  }
+
   StringRef ARMSubArch = ARM::getCanonicalArchName(SubArchName);
 
   // For now, this is the small part. Early return.
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index 6cd295e00bfd4..231403a46bf6a 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -O2 -march=sbf -mcpu=v1 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=sbpfv1-solana-solana < %s | FileCheck %s
 ; RUN: llc -O2 -march=sbf -mcpu=v1 -mattr=+mem-encoding < %s | FileCheck %s
 
 ; Function Attrs: nounwind uwtable
diff --git a/llvm/test/CodeGen/SBF/many_args_value_size.ll b/llvm/test/CodeGen/SBF/many_args_value_size.ll
index 4ec88671b0993..e588cb3a14f58 100644
--- a/llvm/test/CodeGen/SBF/many_args_value_size.ll
+++ b/llvm/test/CodeGen/SBF/many_args_value_size.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -march=sbf -mcpu=v2 < %s | FileCheck %s
+; RUN: llc -mtriple=sbpfv2-solana-solana < %s | FileCheck %s
 
 define i64 @test_func(i64 %a, i64 %b, i64 %c, i64 %d, i64 %e) {
 start:
diff --git a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
index a55b1307a8fd8..66b01dbd06292 100644
--- a/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
+++ b/llvm/test/CodeGen/SBF/reloc-abs64-sbf.ll
@@ -1,5 +1,6 @@
 ; RUN: llc -march=sbf -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-BPF %s
 ; RUN: llc -march=sbf -mcpu=v3 -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBFv3 %s
+; RUN: llc -mtriple=sbpfv3-solana-solana -filetype=obj < %s | llvm-objdump -r - | tee -i /tmp/foo | FileCheck --check-prefix=CHECK-RELOC-SBFv3 %s
 
 @.str = private unnamed_addr constant [25 x i8] c"reloc_64_relative_data.c\00", align 1
 @FILE = dso_local constant i64 ptrtoint ([25 x i8]* @.str to i64), align 8
diff --git a/llvm/test/MC/SBF/elf-flags.s b/llvm/test/MC/SBF/elf-flags.s
index a0a975959ccbd..edbd20230a1c3 100644
--- a/llvm/test/MC/SBF/elf-flags.s
+++ b/llvm/test/MC/SBF/elf-flags.s
@@ -1,15 +1,27 @@
 # RUN: llvm-mc -triple=sbf-solana-solana -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-NONE %s
+# RUN: llvm-mc -triple=sbpf-solana-solana -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-NONE %s
 # RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v1 -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-SBFV1 %s
-# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v1 -filetype=obj < %s \
+# RUN: llvm-mc -triple=sbpfv1-solana-solana -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-SBFV1 %s
+# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v2 -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV2 %s
+# RUN: llvm-mc -triple=sbpfv2-solana-solana -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV2 %s
 # RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v3 -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-SBFV3 %s
+# RUN: llvm-mc -triple=sbpfv3-solana-solana -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV3 %s
 
 
 # CHECK-NONE:       Flags [ (0x0)
diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
index a781f9b31d1f0..0f03aed0a874f 100644
--- a/llvm/test/MC/SBF/sbf-jmp.s
+++ b/llvm/test/MC/SBF/sbf-jmp.s
@@ -1,5 +1,7 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=v3 --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
+# RUN: llvm-mc %s -triple=sbpfv3-solana-solana --show-encoding \
+# RUN:     | FileCheck %s --check-prefix=CHECK-ASM-NEW
 # RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-OLD
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=v3 -filetype=obj \
diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp
index 676c795378b30..c060835abfa69 100644
--- a/llvm/unittests/TargetParser/TripleTest.cpp
+++ b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -757,6 +757,33 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::SolanaOS, T.getOS());
   EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
 
+  T = Triple("sbpf-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
+  T = Triple("sbpfv1-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::SBFSubArch_v1, T.getSubArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
+  T = Triple("sbpfv2-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::SBFSubArch_v2, T.getSubArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
+  T = Triple("sbpfv3-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::SBFSubArch_v3, T.getSubArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
   T = Triple("sbf-unknown-unknown");
   EXPECT_EQ(Triple::sbf, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
@@ -769,6 +796,12 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::UnknownOS, T.getOS());
   EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
 
+  T = Triple("sbpf");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::UnknownOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
   T = Triple("riscv32-unknown-unknown");
   EXPECT_EQ(Triple::riscv32, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());

From ad714ac4d3ff415412a4e1aae34ce58885c34cb2 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.tnagel@gmail.com>
Date: Fri, 14 Feb 2025 17:11:27 -0300
Subject: [PATCH 078/114] [SOL] Adjustments after LLVM 19 upgrade

---
 .github/workflows/llvm-project-tests.yml      |   1 -
 clang/lib/Basic/Targets/BPF.h                 |  27 +++-
 lld/ELF/Arch/BPF.cpp                          | 147 ------------------
 lld/tools/lld/lld.cpp                         |  12 ++
 llvm/include/llvm/TargetParser/Triple.h       |   2 +
 llvm/lib/Analysis/TargetLibraryInfo.cpp       |   7 -
 llvm/lib/MC/MCObjectFileInfo.cpp              |   1 +
 llvm/lib/Target/BPF/BPFISelLowering.cpp       |   6 +-
 llvm/lib/Target/BPF/BPFRegisterInfo.cpp       |   2 -
 llvm/lib/Target/BPF/BPFSubtarget.cpp          |   8 +-
 llvm/lib/Target/BPF/BPFTargetMachine.cpp      |  15 +-
 .../Target/BPF/MCTargetDesc/BPFAsmBackend.cpp |   1 -
 .../lib/Target/BPF/TargetInfo/BPFTargetInfo.h |   1 +
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp |   8 +-
 llvm/lib/Target/SBF/BTFDebug.cpp              |   5 +-
 llvm/lib/Target/SBF/CMakeLists.txt            |  10 +-
 .../Target/SBF/Disassembler/CMakeLists.txt    |   1 +
 llvm/lib/Target/SBF/GISel/SBFCallLowering.cpp |  46 ++++++
 llvm/lib/Target/SBF/GISel/SBFCallLowering.h   |  39 +++++
 .../SBF/GISel/SBFInstructionSelector.cpp      |  93 +++++++++++
 .../lib/Target/SBF/GISel/SBFLegalizerInfo.cpp |  22 +++
 llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.h  |  28 ++++
 .../Target/SBF/GISel/SBFRegisterBankInfo.cpp  |  25 +++
 .../Target/SBF/GISel/SBFRegisterBankInfo.h    |  39 +++++
 llvm/lib/Target/SBF/GISel/SBFRegisterBanks.td |  15 ++
 .../Target/SBF/MCTargetDesc/CMakeLists.txt    |   1 +
 .../Target/SBF/MCTargetDesc/SBFAsmBackend.cpp |   5 +-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |   8 +-
 llvm/lib/Target/SBF/SBF.h                     |  10 +-
 llvm/lib/Target/SBF/SBF.td                    |   1 +
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |   5 +-
 llvm/lib/Target/SBF/SBFIRPeephole.cpp         |   4 +-
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |  21 ++-
 llvm/lib/Target/SBF/SBFInstrInfo.td           |  36 ++---
 llvm/lib/Target/SBF/SBFMIPeephole.cpp         |   2 -
 .../lib/Target/SBF/SBFMISimplifyPatchable.cpp |   1 +
 llvm/lib/Target/SBF/SBFSubtarget.cpp          |  12 ++
 llvm/lib/Target/SBF/SBFSubtarget.h            |  12 +-
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |   4 +-
 llvm/lib/Target/SBF/SBFTargetMachine.h        |   2 +-
 llvm/lib/TargetParser/Triple.cpp              |  17 +-
 llvm/test/CodeGen/BPF/cttz-ctlz.ll            |   1 +
 llvm/test/CodeGen/BPF/many_args1.ll           |   2 +-
 .../CodeGen/RISCV/rvv/known-never-zero.ll     |   1 +
 llvm/test/CodeGen/RISCV/shl-cttz.ll           |   1 +
 llvm/test/CodeGen/SBF/objdump_cond_op.ll      |   9 +-
 llvm/test/CodeGen/SBF/objdump_cond_op_2.ll    |   6 +-
 llvm/test/MC/RISCV/option-arch.s              |   1 -
 llvm/tools/opt/opt.cpp                        |   2 +
 49 files changed, 477 insertions(+), 248 deletions(-)
 delete mode 100644 lld/ELF/Arch/BPF.cpp
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFCallLowering.cpp
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFCallLowering.h
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFInstructionSelector.cpp
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.h
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.cpp
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.h
 create mode 100644 llvm/lib/Target/SBF/GISel/SBFRegisterBanks.td

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 048f8bb74ceae..36a2d641ed0e7 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -122,7 +122,6 @@ jobs:
           variant: ${{ matrix.compile_cache }}
       - name: Build and Test
         if: "!startsWith(matrix.os, 'windows')"
-        uses: llvm/actions/build-test-llvm-project@main
         env:
           # Workaround for https://github.com/actions/virtual-environments/issues/5900.
           # This should be a no-op for non-mac OSes
diff --git a/clang/lib/Basic/Targets/BPF.h b/clang/lib/Basic/Targets/BPF.h
index 27a4b5f314970..8be7b2be8dabc 100644
--- a/clang/lib/Basic/Targets/BPF.h
+++ b/clang/lib/Basic/Targets/BPF.h
@@ -22,10 +22,11 @@ namespace clang {
 namespace targets {
 
 class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
+  bool HasSolanaFeature = false;
   bool HasAlu32 = false;
 
 public:
-  BPFTargetInfo(const llvm::Triple &Triple, const TargetOptions &)
+  BPFTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : TargetInfo(Triple) {
     LongWidth = LongAlign = PointerWidth = PointerAlign = 64;
     SizeType = UnsignedLong;
@@ -34,10 +35,28 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
     IntMaxType = SignedLong;
     Int64Type = SignedLong;
     RegParmMax = 5;
+    if (Triple.getArch() == llvm::Triple::sbf) {
+      HasSolanaFeature = true;
+    } else {
+      for (auto& it : Opts.FeaturesAsWritten) {
+        if (it == "+solana") {
+          HasSolanaFeature = true;
+          break;
+        }
+      }
+    }
     if (Triple.getArch() == llvm::Triple::bpfeb) {
-      resetDataLayout("E-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      if (HasSolanaFeature) {
+        resetDataLayout("E-m:e-p:64:64-i64:64-n32:64-S128");
+      } else {
+        resetDataLayout("E-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      }
     } else {
-      resetDataLayout("e-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      if (HasSolanaFeature) {
+        resetDataLayout("e-m:e-p:64:64-i64:64-n32:64-S128");
+      } else {
+        resetDataLayout("e-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      }
     }
     MaxAtomicPromoteWidth = 64;
     MaxAtomicInlineWidth = 64;
@@ -115,6 +134,8 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
   std::pair<unsigned, unsigned> hardwareInterferenceSizes() const override {
     return std::make_pair(32, 32);
   }
+
+  bool hasBitIntType() const override { return HasSolanaFeature; }
 };
 } // namespace targets
 } // namespace clang
diff --git a/lld/ELF/Arch/BPF.cpp b/lld/ELF/Arch/BPF.cpp
deleted file mode 100644
index baecd8607cda5..0000000000000
--- a/lld/ELF/Arch/BPF.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-//===- BPF.cpp ------------------------------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "InputFiles.h"
-#include "Symbols.h"
-#include "Target.h"
-#include "lld/Common/ErrorHandler.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/Endian.h"
-
-using namespace llvm;
-using namespace llvm::object;
-using namespace llvm::support::endian;
-using namespace llvm::ELF;
-
-namespace lld {
-namespace elf {
-
-namespace {
-class BPF final : public TargetInfo {
-public:
-  BPF();
-  RelExpr getRelExpr(RelType type, const Symbol &s,
-                     const uint8_t *loc) const override;
-  RelType getDynRel(RelType type) const override;
-  int64_t getImplicitAddend(const uint8_t *buf, RelType type) const override;
-  void relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const override;
-  uint32_t calcEFlags() const override;
-};
-} // namespace
-
-BPF::BPF() {
-  relativeRel = R_BPF_64_RELATIVE;
-  symbolicRel = R_BPF_64_64;
-}
-
-RelExpr BPF::getRelExpr(RelType type, const Symbol &s,
-                        const uint8_t *loc) const {
-  switch (type) {
-    case R_BPF_64_32:
-      return R_PC;
-    case R_BPF_64_ABS32:
-    case R_BPF_64_NODYLD32:
-    case R_BPF_64_ABS64:
-    case R_BPF_64_64:
-      return R_ABS;
-    default:
-      error(getErrorLocation(loc) + "unrecognized reloc " + toString(type));
-  }
-  return R_NONE;
-}
-
-RelType BPF::getDynRel(RelType type) const {
-  switch (type) {
-    case R_BPF_64_ABS64:
-        // R_BPF_64_ABS64 is symbolic like R_BPF_64_64, which is set as our
-        // symbolicRel in the constructor. Return R_BPF_64_64 here so that if
-        // the symbol isn't preemptible, we emit a _RELATIVE relocation instead
-        // and skip emitting the symbol.
-        //
-        // See https://github.com/anza-xyz/llvm-project/blob/6b6aef5dbacef31a3c7b3a54f7f1ba54cafc7077/lld/ELF/Relocations.cpp#L1179
-        return R_BPF_64_64;
-    default:
-        return type;
-  }
-}
-
-int64_t BPF::getImplicitAddend(const uint8_t *buf, RelType type) const {
-  switch (type) {
-  case R_BPF_64_ABS32:
-    return SignExtend64<32>(read32le(buf));
-  default:
-    return 0;
-  }
-  return 0;
-}
-
-void BPF::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
-  switch (rel.type) {
-    case R_BPF_64_32: {
-      // Relocation of a symbol
-      write32le(loc + 4, ((val - 8) / 8) & 0xFFFFFFFF);
-      break;
-    }
-    case R_BPF_64_ABS32:
-    case R_BPF_64_NODYLD32: {
-      // Relocation used by .BTF.ext and DWARF
-      write32le(loc, val & 0xFFFFFFFF);
-      break;
-    }
-    case R_BPF_64_64: {
-      // Relocation of a lddw instruction
-      // 64 bit address is divided into the imm of this and the following
-      // instructions, lower 32 first.
-      write32le(loc + 4, val & 0xFFFFFFFF);
-      write32le(loc + 8 + 4, val >> 32);
-      break;
-    }
-    case R_BPF_64_ABS64: {
-      // The relocation type is used for normal 64-bit data. The
-      // actual to-be-relocated data is stored at r_offset and the
-      // read/write data bitsize is 64 (8 bytes). The relocation can
-      // be resolved with the symbol value plus implicit addend.
-      write64le(loc, val);
-      break;
-    }
-    default:
-      error(getErrorLocation(loc) + "unrecognized reloc " + toString(rel.type));
-  }
-}
-
-static uint32_t getEFlags(InputFile *file) {
-  if (config->ekind == ELF64BEKind)
-    return cast<ObjFile<ELF64BE>>(file)->getObj().getHeader().e_flags;
-  return cast<ObjFile<ELF64LE>>(file)->getObj().getHeader().e_flags;
-}
-
-uint32_t BPF::calcEFlags() const {
-  uint32_t ret = 0;
-
-  // Ensure that all the object files were compiled with the same flags, as
-  // different flags indicate different ABIs.
-  for (InputFile *f : ctx.objectFiles) {
-    uint32_t flags = getEFlags(f);
-    if (ret == 0) {
-      ret = flags;
-    } else if (ret != flags) {
-      error("can not link object files with incompatible flags");
-    }
-  }
-
-  return ret;
-}
-
-TargetInfo *getBPFTargetInfo() {
-  static BPF target;
-  return &target;
-}
-
-} // namespace elf
-} // namespace lld
diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp
index 9e2d9265aaa2f..4f8fa7e470fa4 100644
--- a/lld/tools/lld/lld.cpp
+++ b/lld/tools/lld/lld.cpp
@@ -37,6 +37,7 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PluginLoader.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/TargetSelect.h"
 #include "llvm/TargetParser/Host.h"
 #include "llvm/TargetParser/Triple.h"
 #include <cstdlib>
@@ -72,6 +73,17 @@ LLD_HAS_DRIVER(mingw)
 LLD_HAS_DRIVER(macho)
 LLD_HAS_DRIVER(wasm)
 
+// This function is called on startup. We need this for LTO since
+// LTO calls LLVM functions to compile bitcode files to native code.
+// Technically this can be delayed until we read bitcode files, but
+// we don't bother to do lazily because the initialization is fast.
+static void initLLVM() {
+  InitializeAllTargets();
+  InitializeAllTargetMCs();
+  InitializeAllAsmPrinters();
+  InitializeAllAsmParsers();
+}
+
 int lld_main(int argc, char **argv, const llvm::ToolContext &) {
   initLLVM();
   sys::Process::UseANSIEscapeCodes(true);
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index 14290951015ea..6980997eb7ccd 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -104,6 +104,7 @@ class Triple {
     wasm64,         // WebAssembly with 64-bit pointers
     renderscript32, // 32-bit RenderScript
     renderscript64, // 64-bit RenderScript
+    sbf,
     ve,             // NEC SX-Aurora Vector Engine
     LastArchType = ve
   };
@@ -244,6 +245,7 @@ class Triple {
     ShaderModel, // DirectX ShaderModel
     LiteOS,
     Serenity,
+    SolanaOS,
     Vulkan, // Vulkan SPIR-V
     LastOSType = Vulkan
   };
diff --git a/llvm/lib/Analysis/TargetLibraryInfo.cpp b/llvm/lib/Analysis/TargetLibraryInfo.cpp
index 136e333673b7e..8557901192e40 100644
--- a/llvm/lib/Analysis/TargetLibraryInfo.cpp
+++ b/llvm/lib/Analysis/TargetLibraryInfo.cpp
@@ -908,13 +908,6 @@ static void initializeLibCalls(TargetLibraryInfoImpl &TLI, const Triple &T,
   if (T.isOSAIX())
     TLI.setUnavailable(LibFunc_memrchr);
 
-
-  if (T.isBPF() || T.isSBF()) {
-    TLI.setUnavailable(LibFunc_rust_alloc);
-    TLI.setUnavailable(LibFunc_rust_dealloc);
-    TLI.setUnavailable(LibFunc_rust_realloc);
-  }
-
   TLI.addVectorizableFunctionsFromVecLib(ClVectorLibrary, T);
 }
 
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
index 150e38a94db6a..e7ab3bfefb7a3 100644
--- a/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -362,6 +362,7 @@ void MCObjectFileInfo::initELFMCObjectFileInfo(const Triple &T, bool Large) {
     break;
   case Triple::bpfel:
   case Triple::bpfeb:
+  case Triple::sbf:
     FDECFIEncoding = dwarf::DW_EH_PE_sdata8;
     break;
   case Triple::hexagon:
diff --git a/llvm/lib/Target/BPF/BPFISelLowering.cpp b/llvm/lib/Target/BPF/BPFISelLowering.cpp
index 456f5a672c2cc..1f5cadf37ab58 100644
--- a/llvm/lib/Target/BPF/BPFISelLowering.cpp
+++ b/llvm/lib/Target/BPF/BPFISelLowering.cpp
@@ -98,7 +98,7 @@ BPFTargetLowering::BPFTargetLowering(const TargetMachine &TM,
 
     setOperationAction(ISD::SDIVREM, VT, Expand);
     setOperationAction(ISD::UDIVREM, VT, Expand);
-    if (!STI.hasSdivSmod() && !Subtarget->isSolana()) {
+    if (!STI.hasSdivSmod()) {
       setOperationAction(ISD::SDIV, VT, Custom);
       setOperationAction(ISD::SREM, VT, Custom);
     }
@@ -279,6 +279,10 @@ void BPFTargetLowering::ReplaceNodeResults(
   switch (Opcode) {
   default:
     report_fatal_error("unhandled custom legalization: " + Twine(Opcode));
+  case ISD::ATOMIC_LOAD_ADD:
+  case ISD::ATOMIC_LOAD_AND:
+  case ISD::ATOMIC_LOAD_OR:
+  case ISD::ATOMIC_LOAD_XOR:
   case ISD::ATOMIC_SWAP:
   case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
     if (HasAlu32 || Opcode == ISD::ATOMIC_LOAD_ADD)
diff --git a/llvm/lib/Target/BPF/BPFRegisterInfo.cpp b/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
index 4f9135922d34a..307f278025ff4 100644
--- a/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
+++ b/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
@@ -31,8 +31,6 @@ static cl::opt<int>
                        cl::desc("Specify the BPF stack size limit"),
                        cl::init(512));
 
-unsigned BPFRegisterInfo::FrameLength = 512;
-
 BPFRegisterInfo::BPFRegisterInfo()
     : BPFGenRegisterInfo(BPF::R0) {}
 
diff --git a/llvm/lib/Target/BPF/BPFSubtarget.cpp b/llvm/lib/Target/BPF/BPFSubtarget.cpp
index a110cb2c8fff6..305e9a2bf2cda 100644
--- a/llvm/lib/Target/BPF/BPFSubtarget.cpp
+++ b/llvm/lib/Target/BPF/BPFSubtarget.cpp
@@ -51,9 +51,7 @@ BPFSubtarget &BPFSubtarget::initializeSubtargetDependencies(StringRef CPU,
   return *this;
 }
 
-void BPFSubtarget::initializeEnvironment(const Triple &TT) {
-  // TODO: jle: remove, sbf is now provided by the SBF backend.
-  IsSolana = false;
+void BPFSubtarget::initializeEnvironment() {
   HasJmpExt = false;
   HasJmp32 = false;
   HasAlu32 = false;
@@ -103,10 +101,6 @@ BPFSubtarget::BPFSubtarget(const Triple &TT, const std::string &CPU,
       FrameLowering(initializeSubtargetDependencies(CPU, FS)),
       TLInfo(TM, *this) {
   IsLittleEndian = TT.isLittleEndian();
-<<<<<<< HEAD
-=======
-  TSInfo.setSolanaFlag(false);
->>>>>>> 3d16ab60503b ([SOL] Initial squash commit for new SBF LLVM back-end and related.)
 
   CallLoweringInfo.reset(new BPFCallLowering(*getTargetLowering()));
   Legalizer.reset(new BPFLegalizerInfo(*this));
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
index 0ad56ecb4a4d4..3379af6fe8744 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.cpp
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -51,16 +51,11 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeBPFTarget() {
 }
 
 // DataLayout: little or big endian
-static std::string computeDataLayout(const Triple &TT, StringRef FS) {
-  // TODO: jle: remove 'solana', sbf is now provided by the SBF backend.
-  bool IsSolana = FS.contains("solana");
-  if (TT.getArch() == Triple::bpfeb) {
-    return IsSolana ? "E-m:e-p:64:64-i64:64-n32:64-S128"
-      : "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
-  } else {
-    return IsSolana ? "e-m:e-p:64:64-i64:64-n32:64-S128"
-      : "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
-  }
+static std::string computeDataLayout(const Triple &TT) {
+  if (TT.getArch() == Triple::bpfeb)
+    return "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+  else
+    return "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
 }
 
 static Reloc::Model getEffectiveRelocModel(std::optional<Reloc::Model> RM) {
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp b/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
index fffdaa1cdc95a..25bfb7ae143c8 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
@@ -14,7 +14,6 @@
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/MC/MCObjectWriter.h"
-#include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/EndianStream.h"
 #include <cassert>
 #include <cstdint>
diff --git a/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h b/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h
index 81d1be39d6232..150526c1a9db6 100644
--- a/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h
+++ b/llvm/lib/Target/BPF/TargetInfo/BPFTargetInfo.h
@@ -16,6 +16,7 @@ class Target;
 Target &getTheBPFleTarget();
 Target &getTheBPFbeTarget();
 Target &getTheBPFTarget();
+
 } // namespace llvm
 
 #endif // LLVM_LIB_TARGET_BPF_TARGETINFO_BPFTARGETINFO_H
diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index 8e65f07b97987..1a17167f3d824 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -138,9 +138,9 @@ struct SBFOperand : public MCParsedAsmOperand {
   /// getEndLoc - Gets location of the last token of this operand
   SMLoc getEndLoc() const override { return EndLoc; }
 
-  unsigned getReg() const override {
+  MCRegister getReg() const override {
     assert(Kind == Register && "Invalid type access!");
-    return Reg.RegNum;
+    return MCRegister(Reg.RegNum);
   }
 
   const MCExpr *getImm() const {
@@ -167,7 +167,7 @@ struct SBFOperand : public MCParsedAsmOperand {
       break;
     case Register:
       OS << "<register ";
-      OS << RegName(getReg()) << ">";
+      OS << RegName(getReg().id()) << ">";
       break;
     case Token:
       OS << "'" << getToken() << "'";
@@ -187,7 +187,7 @@ struct SBFOperand : public MCParsedAsmOperand {
   // Used by the TableGen Code
   void addRegOperands(MCInst &Inst, unsigned N) const {
     assert(N == 1 && "Invalid number of operands!");
-    Inst.addOperand(MCOperand::createReg(getReg()));
+    Inst.addOperand(MCOperand::createReg(getReg().id()));
   }
 
   void addImmOperands(MCInst &Inst, unsigned N) const {
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index de238e6f4685a..2fd940185e1c2 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -17,6 +17,7 @@
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/IR/Module.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCSectionELF.h"
@@ -589,7 +590,7 @@ void BTFDebug::processDeclAnnotations(DINodeArray Annotations,
   for (const Metadata *Annotation : Annotations->operands()) {
     const MDNode *MD = cast<MDNode>(Annotation);
     const MDString *Name = cast<MDString>(MD->getOperand(0));
-    if (!Name->getString().equals("btf_decl_tag"))
+    if (Name->getString() != "btf_decl_tag")
       continue;
 
     const MDString *Value = cast<MDString>(MD->getOperand(1));
@@ -628,7 +629,7 @@ int BTFDebug::genBTFTypeTags(const DIDerivedType *DTy, int BaseTypeId) {
     for (const Metadata *Annotations : Annots->operands()) {
       const MDNode *MD = cast<MDNode>(Annotations);
       const MDString *Name = cast<MDString>(MD->getOperand(0));
-      if (!Name->getString().equals("btf_type_tag"))
+      if (Name->getString() != "btf_type_tag")
         continue;
       MDStrs.push_back(cast<MDString>(MD->getOperand(1)));
     }
diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index ce6b51321e8fb..282594e99e618 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -11,15 +11,22 @@ tablegen(LLVM SBFGenInstrInfo.inc -gen-instr-info)
 tablegen(LLVM SBFGenMCCodeEmitter.inc -gen-emitter)
 tablegen(LLVM SBFGenRegisterInfo.inc -gen-register-info)
 tablegen(LLVM SBFGenSubtargetInfo.inc -gen-subtarget)
+tablegen(LLVM SBFGenGlobalISel.inc -gen-global-isel)
+tablegen(LLVM SBFGenRegisterBank.inc -gen-register-bank)
 
 add_public_tablegen_target(SBFCommonTableGen)
 
 add_llvm_target(SBFCodeGen
+  GISel/SBFCallLowering.cpp
+  GISel/SBFInstructionSelector.cpp
+  GISel/SBFRegisterBankInfo.cpp
+  GISel/SBFLegalizerInfo.cpp
   SBFAbstractMemberAccess.cpp
   SBFAdjustOpt.cpp
   SBFAsmPrinter.cpp
   SBFCheckAndAdjustIR.cpp
   SBFFrameLowering.cpp
+  SBFFunctionInfo.cpp
   SBFInstrInfo.cpp
   SBFIRPeephole.cpp
   SBFISelDAGToDAG.cpp
@@ -33,7 +40,6 @@ add_llvm_target(SBFCodeGen
   SBFMIChecking.cpp
   SBFMISimplifyPatchable.cpp
   BTFDebug.cpp
-  SBFFunctionInfo.cpp
 
   LINK_COMPONENTS
   Analysis
@@ -41,10 +47,12 @@ add_llvm_target(SBFCodeGen
   CodeGen
   CodeGenTypes
   Core
+  GlobalISel
   MC
   SBFDesc
   SBFInfo
   IPO
+  Passes
   Scalar
   SelectionDAG
   Support
diff --git a/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt b/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt
index fb2764455d02d..66e8363906163 100644
--- a/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/Disassembler/CMakeLists.txt
@@ -3,6 +3,7 @@ add_llvm_component_library(LLVMSBFDisassembler
 
   LINK_COMPONENTS
   MCDisassembler
+  MC
   SBFInfo
   Support
 
diff --git a/llvm/lib/Target/SBF/GISel/SBFCallLowering.cpp b/llvm/lib/Target/SBF/GISel/SBFCallLowering.cpp
new file mode 100644
index 0000000000000..fd893f5f4160a
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFCallLowering.cpp
@@ -0,0 +1,46 @@
+//===-- BPFCallLowering.cpp - Call lowering for GlobalISel ------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file implements the lowering of LLVM calls to machine code calls for
+/// GlobalISel.
+///
+//===----------------------------------------------------------------------===//
+
+#include "SBFCallLowering.h"
+#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
+#include "llvm/Support/Debug.h"
+
+#define DEBUG_TYPE "sbf-call-lowering"
+
+using namespace llvm;
+
+SBFCallLowering::SBFCallLowering(const SBFTargetLowering &TLI)
+    : CallLowering(&TLI) {}
+
+bool SBFCallLowering::lowerReturn(MachineIRBuilder &MIRBuilder,
+                                  const Value *Val, ArrayRef<Register> VRegs,
+                                  FunctionLoweringInfo &FLI,
+                                  Register SwiftErrorVReg) const {
+  if (!VRegs.empty())
+    return false;
+  MIRBuilder.buildInstr(SBF::RETURN_v3);
+  return true;
+}
+
+bool SBFCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
+                                           const Function &F,
+                                           ArrayRef<ArrayRef<Register>> VRegs,
+                                           FunctionLoweringInfo &FLI) const {
+  return VRegs.empty();
+}
+
+bool SBFCallLowering::lowerCall(MachineIRBuilder &MIRBuilder,
+                                CallLoweringInfo &Info) const {
+  return false;
+}
diff --git a/llvm/lib/Target/SBF/GISel/SBFCallLowering.h b/llvm/lib/Target/SBF/GISel/SBFCallLowering.h
new file mode 100644
index 0000000000000..4440ad498c202
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFCallLowering.h
@@ -0,0 +1,39 @@
+//===-- SBFCallLowering.h - Call lowering for GlobalISel --------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file describes how to lower LLVM calls to machine code calls.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_GISEL_SBFCALLLOWERING_H
+#define LLVM_LIB_TARGET_SBF_GISEL_SBFCALLLOWERING_H
+
+#include "SBFISelLowering.h"
+#include "llvm/CodeGen/GlobalISel/CallLowering.h"
+#include "llvm/IR/CallingConv.h"
+
+namespace llvm {
+
+class SBFTargetLowering;
+
+class SBFCallLowering : public CallLowering {
+public:
+  SBFCallLowering(const SBFTargetLowering &TLI);
+  bool lowerReturn(MachineIRBuilder &MIRBuilder, const Value *Val,
+                   ArrayRef<Register> VRegs, FunctionLoweringInfo &FLI,
+                   Register SwiftErrorVReg) const override;
+  bool lowerFormalArguments(MachineIRBuilder &MIRBuilder, const Function &F,
+                            ArrayRef<ArrayRef<Register>> VRegs,
+                            FunctionLoweringInfo &FLI) const override;
+  bool lowerCall(MachineIRBuilder &MIRBuilder,
+                 CallLoweringInfo &Info) const override;
+};
+} // namespace llvm
+
+#endif
diff --git a/llvm/lib/Target/SBF/GISel/SBFInstructionSelector.cpp b/llvm/lib/Target/SBF/GISel/SBFInstructionSelector.cpp
new file mode 100644
index 0000000000000..277601c902de5
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFInstructionSelector.cpp
@@ -0,0 +1,93 @@
+//===- BPFInstructionSelector.cpp --------------------------------*- C++ -*-==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+/// \file
+/// This file implements the targeting of the InstructionSelector class for BPF.
+//===----------------------------------------------------------------------===//
+
+#include "SBFInstrInfo.h"
+#include "SBFSubtarget.h"
+#include "SBFTargetMachine.h"
+#include "SBFRegisterBankInfo.h"
+#include "llvm/CodeGen/GlobalISel/GIMatchTableExecutorImpl.h"
+#include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
+#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/IR/IntrinsicsBPF.h"
+#include "llvm/Support/Debug.h"
+
+#define DEBUG_TYPE "SBF-gisel"
+
+using namespace llvm;
+
+namespace {
+
+#define GET_GLOBALISEL_PREDICATE_BITSET
+#include "SBFGenGlobalISel.inc"
+#undef GET_GLOBALISEL_PREDICATE_BITSET
+
+class SBFInstructionSelector : public InstructionSelector {
+public:
+  SBFInstructionSelector(const SBFTargetMachine &TM, const SBFSubtarget &STI,
+                         const SBFRegisterBankInfo &RBI);
+
+  bool select(MachineInstr &I) override;
+  static const char *getName() { return DEBUG_TYPE; }
+
+private:
+  /// tblgen generated 'select' implementation that is used as the initial
+  /// selector for the patterns that do not require complex C++.
+  bool selectImpl(MachineInstr &I, CodeGenCoverage &CoverageInfo) const;
+
+  const SBFInstrInfo &TII;
+  const SBFRegisterInfo &TRI;
+  const SBFRegisterBankInfo &RBI;
+
+#define GET_GLOBALISEL_PREDICATES_DECL
+#include "SBFGenGlobalISel.inc"
+#undef GET_GLOBALISEL_PREDICATES_DECL
+
+#define GET_GLOBALISEL_TEMPORARIES_DECL
+#include "SBFGenGlobalISel.inc"
+#undef GET_GLOBALISEL_TEMPORARIES_DECL
+};
+
+} // namespace
+
+#define GET_GLOBALISEL_IMPL
+#include "SBFGenGlobalISel.inc"
+#undef GET_GLOBALISEL_IMPL
+
+SBFInstructionSelector::SBFInstructionSelector(const SBFTargetMachine &TM,
+                                               const SBFSubtarget &STI,
+                                               const SBFRegisterBankInfo &RBI)
+    : TII(*STI.getInstrInfo()), TRI(*STI.getRegisterInfo()), RBI(RBI),
+#define GET_GLOBALISEL_PREDICATES_INIT
+#include "SBFGenGlobalISel.inc"
+#undef GET_GLOBALISEL_PREDICATES_INIT
+#define GET_GLOBALISEL_TEMPORARIES_INIT
+#include "SBFGenGlobalISel.inc"
+#undef GET_GLOBALISEL_TEMPORARIES_INIT
+{
+}
+
+bool SBFInstructionSelector::select(MachineInstr &I) {
+  if (!isPreISelGenericOpcode(I.getOpcode()))
+    return true;
+  if (selectImpl(I, *CoverageInfo))
+    return true;
+  return false;
+}
+
+namespace llvm {
+InstructionSelector *
+createSBFInstructionSelector(const SBFTargetMachine &TM,
+                             const SBFSubtarget &Subtarget,
+                             const SBFRegisterBankInfo &RBI) {
+  return new SBFInstructionSelector(TM, Subtarget, RBI);
+}
+} // namespace llvm
diff --git a/llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.cpp b/llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.cpp
new file mode 100644
index 0000000000000..8eec29a387461
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.cpp
@@ -0,0 +1,22 @@
+//===- SBFLegalizerInfo.h ----------------------------------------*- C++ -*-==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+/// \file
+/// This file implements the targeting of the Machinelegalizer class for SBF
+//===----------------------------------------------------------------------===//
+
+#include "SBFLegalizerInfo.h"
+#include "llvm/Support/Debug.h"
+
+#define DEBUG_TYPE "SBF-legalinfo"
+
+using namespace llvm;
+using namespace LegalizeActions;
+
+SBFLegalizerInfo::SBFLegalizerInfo(const SBFSubtarget &ST) {
+  getLegacyLegalizerInfo().computeTables();
+}
diff --git a/llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.h b/llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.h
new file mode 100644
index 0000000000000..fe1e91f68418c
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFLegalizerInfo.h
@@ -0,0 +1,28 @@
+//===- SBFLegalizerInfo.h ----------------------------------------*- C++ -*-==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+/// \file
+/// This file declares the targeting of the Machinelegalizer class for SBF
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_GISEL_SBFMACHINELEGALIZER_H
+#define LLVM_LIB_TARGET_SBF_GISEL_SBFMACHINELEGALIZER_H
+
+#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
+
+namespace llvm {
+
+class SBFSubtarget;
+
+/// This class provides the information for the SBF target legalizer for
+/// GlobalISel.
+class SBFLegalizerInfo : public LegalizerInfo {
+public:
+  SBFLegalizerInfo(const SBFSubtarget &ST);
+};
+} // namespace llvm
+#endif
diff --git a/llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.cpp b/llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.cpp
new file mode 100644
index 0000000000000..ca29efe58c5ff
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.cpp
@@ -0,0 +1,25 @@
+//===- SBFRegisterBankInfo.cpp --------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+/// \file
+/// This file implements the targeting of the RegisterBankInfo class for SBF
+//===----------------------------------------------------------------------===//
+
+#include "SBFRegisterBankInfo.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/Support/Debug.h"
+
+#define DEBUG_TYPE "SBF-reg-bank-info"
+
+#define GET_TARGET_REGBANK_IMPL
+#include "SBFGenRegisterBank.inc"
+
+using namespace llvm;
+
+SBFRegisterBankInfo::SBFRegisterBankInfo(const TargetRegisterInfo &TRI)
+    : SBFGenRegisterBankInfo() {}
diff --git a/llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.h b/llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.h
new file mode 100644
index 0000000000000..3fe0becbf23f1
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFRegisterBankInfo.h
@@ -0,0 +1,39 @@
+//===-- SBFRegisterBankInfo.h -----------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file declares the targeting of the RegisterBankInfo class for SBF.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_SBF_GISEL_SBFREGISTERBANKINFO_H
+#define LLVM_LIB_TARGET_SBF_GISEL_SBFREGISTERBANKINFO_H
+
+#include "MCTargetDesc/SBFMCTargetDesc.h"
+#include "llvm/CodeGen/RegisterBankInfo.h"
+#include "llvm/CodeGen/TargetRegisterInfo.h"
+
+#define GET_REGBANK_DECLARATIONS
+#include "SBFGenRegisterBank.inc"
+
+namespace llvm {
+class TargetRegisterInfo;
+
+class SBFGenRegisterBankInfo : public RegisterBankInfo {
+protected:
+#define GET_TARGET_REGBANK_CLASS
+#include "SBFGenRegisterBank.inc"
+};
+
+class SBFRegisterBankInfo final : public SBFGenRegisterBankInfo {
+public:
+  SBFRegisterBankInfo(const TargetRegisterInfo &TRI);
+};
+} // namespace llvm
+
+#endif
diff --git a/llvm/lib/Target/SBF/GISel/SBFRegisterBanks.td b/llvm/lib/Target/SBF/GISel/SBFRegisterBanks.td
new file mode 100644
index 0000000000000..037d4b5218076
--- /dev/null
+++ b/llvm/lib/Target/SBF/GISel/SBFRegisterBanks.td
@@ -0,0 +1,15 @@
+//===-- SBFRegisterBanks.td - Describe the SBF Banks -------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// Define the SBF register banks used for GlobalISel.
+///
+//===----------------------------------------------------------------------===//
+
+/// General Purpose Registers
+def GPRRegBank : RegisterBank<"GPRB", [GPR]>;
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
index eec1732039fb4..478bde55bd85b 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/MCTargetDesc/CMakeLists.txt
@@ -10,6 +10,7 @@ add_llvm_component_library(LLVMSBFDesc
   MC
   SBFInfo
   Support
+  TargetParser
 
   ADD_TO_COMPONENT
   SBF
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
index 628a82d235440..b13621623b99f 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFAsmBackend.cpp
@@ -38,9 +38,8 @@ class SBFAsmBackend : public MCAsmBackend {
   createObjectTargetWriter() const override;
 
   // No instruction requires relaxation
-  bool fixupNeedsRelaxation(const MCFixup &Fixup, uint64_t Value,
-                            const MCRelaxableFragment *DF,
-                            const MCAsmLayout &Layout) const override {
+  bool fixupNeedsRelaxation(const MCFixup &Fixup, uint64_t Value)
+                                                    const override {
     return false;
   }
 
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 778598e2ce8ae..3e01068584da5 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -62,12 +62,10 @@ static MCSubtargetInfo *createSBFMCSubtargetInfo(const Triple &TT,
 static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
                                        std::unique_ptr<MCAsmBackend> &&MAB,
                                        std::unique_ptr<MCObjectWriter> &&OW,
-                                       std::unique_ptr<MCCodeEmitter> &&Emitter,
-                                       bool RelaxAll) {
+                                       std::unique_ptr<MCCodeEmitter> &&Emitter) {
   MCELFStreamer *S =
       new MCELFStreamer(Ctx, std::move(MAB), std::move(OW), std::move(Emitter));
-  if (RelaxAll)
-    S->getAssembler().setRelaxAll(true);
+
   const MCSubtargetInfo *STI = Ctx.getSubtargetInfo();
 
   StringRef CPU = STI->getCPU();
@@ -79,7 +77,7 @@ static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
   } else if (CPU == "v3") {
     EFlag = llvm::ELF::EF_SBF_V3;
   }
-  S->getAssembler().setELFHeaderEFlags(EFlag);
+  S->getWriter().setELFHeaderEFlags(EFlag);
 
   return S;
 }
diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
index 0878b6375cd41..4d1e8bdd5047e 100644
--- a/llvm/lib/Target/SBF/SBF.h
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -15,6 +15,10 @@
 #include "llvm/Target/TargetMachine.h"
 
 namespace llvm {
+class SBFRegisterBankInfo;
+class SBFSubtarget;
+class SBFTargetMachine;
+class InstructionSelector;
 class SBFTargetMachine;
 class PassRegistry;
 
@@ -27,8 +31,12 @@ FunctionPass *createSBFMIPeepholeTruncElimPass();
 FunctionPass *createSBFMIPreEmitPeepholePass();
 FunctionPass *createSBFMIPreEmitCheckingPass();
 
+InstructionSelector *createSBFInstructionSelector(const SBFTargetMachine &,
+                                                  const SBFSubtarget &,
+                                                  const SBFRegisterBankInfo &);
+
 void initializeSBFCheckAndAdjustIRPass(PassRegistry&);
-void initializeSBFDAGToDAGISelPass(PassRegistry &);
+void initializeSBFDAGToDAGISelLegacyPass(PassRegistry &);
 void initializeSBFMIPeepholePass(PassRegistry&);
 void initializeSBFMIPeepholeTruncElimPass(PassRegistry &);
 void initializeSBFMIPreEmitCheckingPass(PassRegistry&);
diff --git a/llvm/lib/Target/SBF/SBF.td b/llvm/lib/Target/SBF/SBF.td
index 23908cc9b171c..4b27f802beee0 100644
--- a/llvm/lib/Target/SBF/SBF.td
+++ b/llvm/lib/Target/SBF/SBF.td
@@ -11,6 +11,7 @@ include "llvm/Target/Target.td"
 include "SBFRegisterInfo.td"
 include "SBFCallingConv.td"
 include "SBFInstrInfo.td"
+include "GISel/SBFRegisterBanks.td"
 
 def SBFInstrInfo : InstrInfo;
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index c21693ba908a8..15fae26311600 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -24,6 +24,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/IR/Module.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCStreamer.h"
@@ -69,9 +70,7 @@ bool SBFAsmPrinter::doInitialization(Module &M) {
   if (MAI->doesSupportDebugInformation() && !M.debug_compile_units().empty() &&
       SBFEnableBTFEmission) {
     BTF = new BTFX::BTFDebug(this);
-    Handlers.push_back(HandlerInfo(std::unique_ptr<BTFX::BTFDebug>(BTF), "emit",
-                                   "Debug Info Emission", "BTF",
-                                   "BTF Emission"));
+    DebugHandlers.push_back(std::unique_ptr<BTFX::BTFDebug>(BTF));
   }
 
   return false;
diff --git a/llvm/lib/Target/SBF/SBFIRPeephole.cpp b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
index 4ff66291585d8..7e0e264d02903 100644
--- a/llvm/lib/Target/SBF/SBFIRPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
@@ -58,7 +58,7 @@ static bool SBFIRPeepholeImpl(Function &F) {
 
       if (auto *Call = dyn_cast<CallInst>(&I)) {
         if (auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand())) {
-          if (!GV->getName().equals("llvm.stacksave"))
+          if (GV->getName() != "llvm.stacksave")
             continue;
           if (!Call->hasOneUser())
             continue;
@@ -81,7 +81,7 @@ static bool SBFIRPeepholeImpl(Function &F) {
         auto *GV = dyn_cast<GlobalValue>(Call->getCalledOperand());
         if (!GV)
           continue;
-        if (!GV->getName().equals("llvm.stackrestore"))
+        if (GV->getName() != "llvm.stackrestore")
           continue;
         LLVM_DEBUG(dbgs() << "Remove:"; I.dump());
         LLVM_DEBUG(dbgs() << "Remove:"; Call->dump(); dbgs() << '\n');
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index 5375e317b174d..8488ca4002fff 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -45,12 +45,10 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
   const SBFSubtarget *Subtarget;
 
 public:
-  static char ID;
-
   SBFDAGToDAGISel() = delete;
 
   explicit SBFDAGToDAGISel(SBFTargetMachine &TM)
-      : SelectionDAGISel(ID, TM), Subtarget(nullptr) {}
+      : SelectionDAGISel(TM), Subtarget(nullptr) {}
 
   bool runOnMachineFunction(MachineFunction &MF) override {
     // Reset the subtarget each time through.
@@ -93,11 +91,18 @@ class SBFDAGToDAGISel : public SelectionDAGISel {
   // Mapping from ConstantStruct global value to corresponding byte-list values
   std::map<const void *, val_vec_type> cs_vals_;
 };
+
+class SBFDAGToDAGISelLegacy : public SelectionDAGISelLegacy {
+public:
+  static char ID;
+  SBFDAGToDAGISelLegacy(SBFTargetMachine &TM)
+      : SelectionDAGISelLegacy(ID, std::make_unique<SBFDAGToDAGISel>(TM)) {}
+};
 } // namespace
 
-char SBFDAGToDAGISel::ID = 0;
+char SBFDAGToDAGISelLegacy::ID = 0;
 
-INITIALIZE_PASS(SBFDAGToDAGISel, DEBUG_TYPE, PASS_NAME, false, false)
+INITIALIZE_PASS(SBFDAGToDAGISelLegacy, DEBUG_TYPE, PASS_NAME, false, false)
 
 // ComplexPattern used on SBF Load/Store instructions
 bool SBFDAGToDAGISel::SelectAddr(SDValue Addr, SDValue &Base, SDValue &Offset) {
@@ -221,7 +226,9 @@ void SBFDAGToDAGISel::PreprocessLoad(SDNode *Node,
   bool to_replace = false;
   SDLoc DL(Node);
   const LoadSDNode *LD = cast<LoadSDNode>(Node);
-  uint64_t size = LD->getMemOperand()->getSize();
+  if (!LD->getMemOperand()->getSize().hasValue())
+    return;
+  uint64_t size = LD->getMemOperand()->getSize().getValue();
 
   if (!size || size > 8 || (size & (size - 1)) || !LD->isSimple())
     return;
@@ -472,5 +479,5 @@ bool SBFDAGToDAGISel::fillConstantStruct(const DataLayout &DL,
 }
 
 FunctionPass *llvm::createSBFISelDag(SBFTargetMachine &TM) {
-  return new SBFDAGToDAGISel(TM);
+  return new SBFDAGToDAGISelLegacy(TM);
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 7f8fc8bdf7847..e78ee5c7e752a 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -43,8 +43,6 @@ def SBFbrcc         : SDNode<"SBFISD::BR_CC", SDT_SBFBrCC,
 
 def SBFselectcc     : SDNode<"SBFISD::SELECT_CC", SDT_SBFSelectCC, [SDNPInGlue]>;
 def SBFWrapper      : SDNode<"SBFISD::Wrapper", SDT_SBFWrapper>;
-def SBFIsLittleEndian : Predicate<"CurDAG->getDataLayout().isLittleEndian()">;
-def SBFIsBigEndian    : Predicate<"!CurDAG->getDataLayout().isLittleEndian()">;
 def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
 def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
 def SBFHasLddw : Predicate<"!Subtarget->getNoLddw()">;
@@ -990,7 +988,7 @@ class XADD<SBFWidthModifer SizeOp, string Mnemonic, PatFrag OpNode>
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFNoALU32] in {
-    def XADDW : XADD<SBF_W, "stxxaddw", atomic_load_add_32>;
+    def XADDW : XADD<SBF_W, "stxxaddw", atomic_load_add_i32>;
   }
 }
 
@@ -1080,16 +1078,16 @@ class XFALU32<SBFWidthModifer SizeOp, SBFArithOp Opc, string OpcStr,
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-    def XFADDW32 : XFALU32<SBF_W, SBF_ADD, "add", atomic_load_add_32>;
-    def XFANDW32 : XFALU32<SBF_W, SBF_AND, "and", atomic_load_and_32>;
-    def XFORW32  : XFALU32<SBF_W, SBF_OR,  "or",  atomic_load_or_32>;
-    def XFXORW32 : XFALU32<SBF_W, SBF_XOR, "xor", atomic_load_xor_32>;
+    def XFADDW32 : XFALU32<SBF_W, SBF_ADD, "add", atomic_load_add_i32>;
+    def XFANDW32 : XFALU32<SBF_W, SBF_AND, "and", atomic_load_and_i32>;
+    def XFORW32  : XFALU32<SBF_W, SBF_OR,  "or",  atomic_load_or_i32>;
+    def XFXORW32 : XFALU32<SBF_W, SBF_XOR, "xor", atomic_load_xor_i32>;
   }
 
-  def XFADDD : XFALU64<SBF_DW, SBF_ADD, "add", atomic_load_add_64>;
-  def XFANDD : XFALU64<SBF_DW, SBF_AND, "and", atomic_load_and_64>;
-  def XFORD  : XFALU64<SBF_DW, SBF_OR,  "or",  atomic_load_or_64>;
-  def XFXORD : XFALU64<SBF_DW, SBF_XOR, "xor", atomic_load_xor_64>;
+  def XFADDD : XFALU64<SBF_DW, SBF_ADD, "add", atomic_load_add_i64>;
+  def XFANDD : XFALU64<SBF_DW, SBF_AND, "and", atomic_load_and_i64>;
+  def XFORD  : XFALU64<SBF_DW, SBF_OR,  "or",  atomic_load_or_i64>;
+  def XFXORD : XFALU64<SBF_DW, SBF_XOR, "xor", atomic_load_xor_i64>;
 }
 
 let usesCustomInserter = 1, isCodeGenOnly = 1 in {
@@ -1137,10 +1135,10 @@ class XCHG32<SBFWidthModifer SizeOp, PatFrag OpNode>
 
 let Constraints = "$dst = $val" in {
   let Predicates = [SBFHasALU32], DecoderNamespace = "SBFALU32" in {
-    def XCHGW32 : XCHG32<SBF_W, atomic_swap_32>;
+    def XCHGW32 : XCHG32<SBF_W, atomic_swap_i32>;
   }
 
-  def XCHGD : XCHG<SBF_DW, atomic_swap_64>;
+  def XCHGD : XCHG<SBF_DW, atomic_swap_i64>;
 }
 
 // Compare-And-Exchange
@@ -1180,11 +1178,11 @@ class CMPXCHG32<SBFWidthModifer SizeOp, PatFrag OpNode>
 
 let Predicates = [SBFHasALU32], Defs = [W0], Uses = [W0],
     DecoderNamespace = "SBFALU32" in {
-  def CMPXCHGW32 : CMPXCHG32<SBF_W, atomic_cmp_swap_32>;
+  def CMPXCHGW32 : CMPXCHG32<SBF_W, atomic_cmp_swap_i32>;
 }
 
 let Defs = [R0], Uses = [R0] in {
-  def CMPXCHGD : CMPXCHG<SBF_DW, atomic_cmp_swap_64>;
+  def CMPXCHGD : CMPXCHG<SBF_DW, atomic_cmp_swap_i64>;
 }
 
 // bswap16, bswap32, bswap64
@@ -1203,11 +1201,9 @@ class BSWAP<bits<32> SizeOp, string OpcodeStr, SBFSrcType SrcType, list<dag> Pat
 
 
 let Constraints = "$dst = $src" in {
-    let Predicates = [SBFIsLittleEndian] in {
-        def BE16 : BSWAP<16, "be16", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 48)))]>;
-        def BE32 : BSWAP<32, "be32", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 32)))]>;
-        def BE64 : BSWAP<64, "be64", SBF_TO_BE, [(set GPR:$dst, (bswap GPR:$src))]>;
-    }
+    def BE16 : BSWAP<16, "be16", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 48)))]>;
+    def BE32 : BSWAP<32, "be32", SBF_TO_BE, [(set GPR:$dst, (srl (bswap GPR:$src), (i64 32)))]>;
+    def BE64 : BSWAP<64, "be64", SBF_TO_BE, [(set GPR:$dst, (bswap GPR:$src))]>;
 }
 
 let DecoderNamespace = "SBFv2" in {
diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index 49c58ab18c062..e642a30bcdb2c 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -33,8 +33,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "sbf-mi-zext-elim"
 
-STATISTIC(ZExtElemNum, "Number of zero extension shifts eliminated");
-
 namespace {
 
 struct SBFMIPeephole : public MachineFunctionPass {
diff --git a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
index 449be751eba97..0c42d3a5deb12 100644
--- a/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
+++ b/llvm/lib/Target/SBF/SBFMISimplifyPatchable.cpp
@@ -33,6 +33,7 @@
 #include "SBFTargetMachine.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/IR/GlobalVariable.h"
 #include "llvm/Support/Debug.h"
 #include <set>
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index 51b533672d665..ec7ad11b22d92 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -12,6 +12,10 @@
 
 #include "SBFSubtarget.h"
 #include "SBF.h"
+#include "SBFTargetMachine.h"
+#include "GISel/SBFCallLowering.h"
+#include "GISel/SBFLegalizerInfo.h"
+#include "GISel/SBFRegisterBankInfo.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/TargetParser/Host.h"
 #include "TargetInfo/SBFTargetInfo.h"
@@ -64,4 +68,12 @@ SBFSubtarget::SBFSubtarget(const Triple &TT, const std::string &CPU,
       FrameLowering(initializeSubtargetDependencies(TT, cpuFromSubArch(TT, CPU), FS)),
       TLInfo(TM, *this) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
+
+  CallLoweringInfo.reset(new SBFCallLowering(*getTargetLowering()));
+  Legalizer.reset(new SBFLegalizerInfo(*this));
+  auto *RBI = new SBFRegisterBankInfo(*getRegisterInfo());
+  RegBankInfo.reset(RBI);
+
+  InstSelector.reset(createSBFInstructionSelector(
+      *static_cast<const SBFTargetMachine *>(&TM), *this, *RBI));
 }
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index 518ca7e2e193c..d44f4bcdf5f9b 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -16,7 +16,12 @@
 #include "SBFFrameLowering.h"
 #include "SBFISelLowering.h"
 #include "SBFInstrInfo.h"
+#include "SBFRegisterInfo.h"
 #include "SBFSelectionDAGInfo.h"
+#include "llvm/CodeGen/GlobalISel/CallLowering.h"
+#include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
+#include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
+#include "llvm/CodeGen/RegisterBankInfo.h"
 #include "llvm/CodeGen/SelectionDAGTargetInfo.h"
 #include "llvm/CodeGen/TargetSubtargetInfo.h"
 #include "llvm/IR/DataLayout.h"
@@ -83,6 +88,11 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether we enable the new encoding for memory instructions
   bool NewMemEncoding;
 
+  std::unique_ptr<CallLowering> CallLoweringInfo;
+  std::unique_ptr<InstructionSelector> InstSelector;
+  std::unique_ptr<LegalizerInfo> Legalizer;
+  std::unique_ptr<RegisterBankInfo> RegBankInfo;
+
 public:
   // This constructor initializes the data members to match that
   // of the specified triple.
@@ -118,7 +128,7 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   const SBFSelectionDAGInfo *getSelectionDAGInfo() const override {
     return &TSInfo;
   }
-  const TargetRegisterInfo *getRegisterInfo() const override {
+  const SBFRegisterInfo *getRegisterInfo() const override {
     return &InstrInfo.getRegisterInfo();
   }
 };
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 3c45f98323148..869b6c2b28829 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -42,6 +42,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSBFTarget() {
   initializeSBFCheckAndAdjustIRPass(PR);
   initializeSBFMIPeepholePass(PR);
   initializeSBFMIPeepholeTruncElimPass(PR);
+  initializeSBFDAGToDAGISelLegacyPass(PR);
 }
 
 // DataLayout: little or big endian
@@ -97,8 +98,7 @@ TargetPassConfig *SBFTargetMachine::createPassConfig(PassManagerBase &PM) {
   return new SBFPassConfig(*this, PM);
 }
 
-void SBFTargetMachine::registerPassBuilderCallbacks(
-    PassBuilder &PB, bool PopulateClassToPassNames) {
+void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
   PB.registerPipelineParsingCallback(
       [](StringRef PassName, FunctionPassManager &FPM,
          ArrayRef<PassBuilder::PipelineElement>) {
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
index d079c867417a0..fe4b7922685a2 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.h
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -41,7 +41,7 @@ class SBFTargetMachine : public LLVMTargetMachine {
     return TLOF.get();
   }
 
-  void registerPassBuilderCallbacks(PassBuilder &PB, bool PopulateClassToPassNames) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB) override;
 
   MachineFunctionInfo *
   createMachineFunctionInfo(BumpPtrAllocator &Allocator, const Function &F,
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index 46975af6e5361..7c0d05d396c5b 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -84,6 +84,7 @@ StringRef Triple::getArchTypeName(ArchType Kind) {
   case x86_64:         return "x86_64";
   case xcore:          return "xcore";
   case xtensa:         return "xtensa";
+  case sbf:            return "sbf";
   }
 
   llvm_unreachable("Invalid ArchType!");
@@ -270,6 +271,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
   case PC: return "pc";
   case SCEI: return "scei";
   case SUSE: return "suse";
+  case Solana: return "solana";
   }
 
   llvm_unreachable("Invalid VendorType!");
@@ -319,6 +321,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
   case LiteOS: return "liteos";
   case XROS: return "xros";
   case Vulkan: return "vulkan";
+  case SolanaOS: return "solana";
   }
 
   llvm_unreachable("Invalid OSType");
@@ -414,9 +417,9 @@ static Triple::ArchType parseBPFArch(StringRef ArchName) {
     return Triple::bpfeb;
   } else if (ArchName == "bpf_le" || ArchName == "bpfel") {
     return Triple::bpfel;
-  } else if (ArchName.equals("sbf") || ArchName.equals("sbpf") ||
-             ArchName.equals("sbpfv1") || ArchName.equals("sbpfv2") ||
-             ArchName.equals("sbpfv3")) {
+  } else if (ArchName == "sbf" || ArchName == "sbpf" ||
+             ArchName == "sbpfv1" || ArchName == "sbpfv2" ||
+             ArchName == "sbpfv3") {
     return Triple::sbf;
   } else {
     return Triple::UnknownArch;
@@ -671,6 +674,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
       .Case("suse", Triple::SUSE)
       .Case("oe", Triple::OpenEmbedded)
       .Case("intel", Triple::Intel)
+      .Case("solana", Triple::Solana)
       .Default(Triple::UnknownVendor);
 }
 
@@ -718,6 +722,7 @@ static Triple::OSType parseOS(StringRef OSName) {
     .StartsWith("liteos", Triple::LiteOS)
     .StartsWith("serenity", Triple::Serenity)
     .StartsWith("vulkan", Triple::Vulkan)
+    .StartsWith("solana", Triple::SolanaOS)
     .Default(Triple::UnknownOS);
 }
 
@@ -988,6 +993,7 @@ static Triple::ObjectFormatType getDefaultFormat(const Triple &T) {
   case Triple::ve:
   case Triple::xcore:
   case Triple::xtensa:
+  case Triple::sbf:
     return Triple::ELF;
 
   case Triple::mipsel:
@@ -1721,6 +1727,7 @@ unsigned Triple::getArchPointerBitWidth(llvm::Triple::ArchType Arch) {
   case llvm::Triple::ve:
   case llvm::Triple::wasm64:
   case llvm::Triple::x86_64:
+  case llvm::Triple::sbf:
     return 64;
   }
   llvm_unreachable("Invalid architecture value");
@@ -1769,6 +1776,7 @@ Triple Triple::get32BitArchVariant() const {
   case Triple::msp430:
   case Triple::systemz:
   case Triple::ve:
+  case Triple::sbf:
     T.setArch(UnknownArch);
     break;
 
@@ -1882,6 +1890,7 @@ Triple Triple::get64BitArchVariant() const {
   case Triple::ve:
   case Triple::wasm64:
   case Triple::x86_64:
+  case Triple::sbf:
     // Already 64-bit.
     break;
 
@@ -2004,6 +2013,7 @@ Triple Triple::getLittleEndianArchVariant() const {
 
   case Triple::aarch64_be: T.setArch(Triple::aarch64);  break;
   case Triple::bpfeb:      T.setArch(Triple::bpfel);    break;
+  case Triple::sbf:        T.setArch(Triple::sbf);      break;
   case Triple::mips64:
     T.setArch(Triple::mips64el, getSubArch());
     break;
@@ -2050,6 +2060,7 @@ bool Triple::isLittleEndian() const {
   case Triple::renderscript64:
   case Triple::riscv32:
   case Triple::riscv64:
+  case Triple::sbf:
   case Triple::shave:
   case Triple::sparcel:
   case Triple::spir64:
diff --git a/llvm/test/CodeGen/BPF/cttz-ctlz.ll b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
index 865833590a399..549977d2935d3 100644
--- a/llvm/test/CodeGen/BPF/cttz-ctlz.ll
+++ b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
@@ -1,3 +1,4 @@
+; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
 ; RUN: llc < %s -mtriple=bpf -mcpu=v1 | FileCheck %s
 
diff --git a/llvm/test/CodeGen/BPF/many_args1.ll b/llvm/test/CodeGen/BPF/many_args1.ll
index b14d7421050a9..0e2ff1af06e55 100644
--- a/llvm/test/CodeGen/BPF/many_args1.ll
+++ b/llvm/test/CodeGen/BPF/many_args1.ll
@@ -1,6 +1,6 @@
 ; RUN: not llc -mtriple=bpf -mcpu=v1 < %s 2> %t1
 ; RUN: FileCheck %s < %t1
-; CHECK: error: <unknown>:0:0: in function foo i32 (i32, i32, i32): too many args to {{t10|0x[0-f]+}}: i64 = GlobalAddress<ptr @bar> 0
+; CHECK: error: <unknown>:0:0: in function foo i32 (i32, i32, i32): {{t10|0x[0-f]+}}: i64 = GlobalAddress<ptr @bar> 0 too many arguments
 
 ; Function Attrs: nounwind uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
diff --git a/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll b/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll
index 7990c1c1eabc2..ef0e7fe6bb978 100644
--- a/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll
+++ b/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll
@@ -1,3 +1,4 @@
+; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
 ; RUN: llc < %s -mtriple=riscv64 -mattr=+v -verify-machineinstrs | FileCheck %s
 
diff --git a/llvm/test/CodeGen/RISCV/shl-cttz.ll b/llvm/test/CodeGen/RISCV/shl-cttz.ll
index 500673cc29196..80af6148bdc3f 100644
--- a/llvm/test/CodeGen/RISCV/shl-cttz.ll
+++ b/llvm/test/CodeGen/RISCV/shl-cttz.ll
@@ -1,3 +1,4 @@
+; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
 ; RUN: llc -mtriple=riscv32 -mattr=+m < %s \
 ; RUN:   | FileCheck %s -check-prefix=RV32I
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op.ll b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
index 627f60f00876d..863e43d98f72e 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op.ll
@@ -26,7 +26,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %7 = mul i32 %6, %5
   br label %13
 ; CHECK: mov32 w3, w1
-; CHECK: jne r3, 0x2, +0x6 <LBB0_2>
+; CHECK: jne r3, 0x2, +0x6 <test+0x40>
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i32 %0, %1
@@ -38,24 +38,22 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 ; CHECK: ldxw w0, [r1 + 0x0]
 ; CHECK: lmul32 w0, w0
 ; CHECK: lsh32 w0, 0x1
-; CHECK: ja +0x5 <LBB0_4>
+; CHECK: ja +0x5 <test+0x68>
 
 ; <label>:11:                                     ; preds = %8
   %12 = shl nsw i32 %10, 2
   br label %13
 
-; CHECK-LABEL: <LBB0_2>:
 ; CHECK: mov32 w3, 0x0
 ; CHECK: hor64 r3, 0x0
 ; CHECK: ldxw w0, [r3 + 0x0]
-; CHECK: jeq r1, r2, +0x4 <LBB0_5>
+; CHECK: jeq r1, r2, +0x4 <test+0x80>
 ; CHECK: lsh32 w0, 0x2
 
 ; <label>:13:                                     ; preds = %4, %11
   %14 = phi i32 [ %12, %11 ], [ %7, %4 ]
   store i32 %14, i32* @gbl, align 4
   br label %15
-; CHECK-LABEL: <LBB0_4>:
 ; CHECK: mov32 w1, 0x0
 ; CHECK: hor64 r1, 0x0
 ; CHECK: stxw [r1 + 0x0], w0
@@ -63,7 +61,6 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 ; <label>:15:                                     ; preds = %8, %13
   %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
   ret i32 %16
-; CHECK-LABEL: <LBB0_5>:
 ; CHECK: exit
 }
 attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
index 4f01d8b2d452a..bd93a3ad41036 100644
--- a/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/SBF/objdump_cond_op_2.ll
@@ -14,8 +14,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 
 ; <label>:4:                                      ; preds = %2
   br label %5
-; CHECK: jsge r4, r3, +0xa <LBB0_2>
-; CHECK-LABEL: <LBB0_1>:
+; CHECK: jsge r4, r3, +0xa <test+0x90>
 
 ; <label>:5:                                      ; preds = %4, %5
   %6 = phi i32 [ %9, %5 ], [ 0, %4 ]
@@ -27,12 +26,11 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %12 = icmp slt i32 %10, %11
   br i1 %12, label %5, label %13
 ; CHECK: mov64 r1, r3
-; CHECK: jslt r3, r2, -0xa <LBB0_1>
+; CHECK: jslt r3, r2, -0xa <test+0x40>
 
 ; <label>:13:                                     ; preds = %5, %2
   %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
   ret i32 %14
-; CHECK-LABEL: <LBB0_2>:
 ; CHECK: exit
 }
 attributes #0 = { norecurse nounwind readnone }
diff --git a/llvm/test/MC/RISCV/option-arch.s b/llvm/test/MC/RISCV/option-arch.s
index 002ac5e504207..7826252f66e6c 100644
--- a/llvm/test/MC/RISCV/option-arch.s
+++ b/llvm/test/MC/RISCV/option-arch.s
@@ -1,4 +1,3 @@
-# XFAIL: *
 # RUN: llvm-mc -triple riscv32 -mattr=+experimental -show-encoding < %s \
 # RUN:   | FileCheck -check-prefixes=CHECK %s
 # RUN: llvm-mc -triple riscv32 -mattr=+experimental -filetype=obj < %s \
diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp
index 48ad116cb34a5..3c411b1f9a59d 100644
--- a/llvm/tools/opt/opt.cpp
+++ b/llvm/tools/opt/opt.cpp
@@ -21,3 +21,5 @@ class PassBuilder;
 extern "C" int optMain(int argc, char **argv,
                        llvm::ArrayRef<std::function<void(llvm::PassBuilder &)>>
                            PassBuilderCallbacks);
+
+int main(int argc, char **argv) { return optMain(argc, argv, {}); }
\ No newline at end of file

From 12a3c8c25001851e116121cfec74490afe02f0b5 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.tnagel@gmail.com>
Date: Fri, 7 Mar 2025 11:35:24 -0300
Subject: [PATCH 079/114] [SOL] Fix LLVM 19 CI

---
 .github/workflows/llvm-project-tests.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 36a2d641ed0e7..3a54dd5b27148 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -78,11 +78,6 @@ jobs:
           # We're using a specific version of macOS due to:
           # https://github.com/actions/virtual-environments/issues/5900
           - macOS-latest
-        include:
-          - compile_cache: sccache
-
-          - compile_cache: ccache
-            os: macos-latest
     steps:
       - name: Setup Windows
         if: startsWith(matrix.os, 'windows')
@@ -106,7 +101,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 250
-      - name: Setup ${{ matrix.compile_cache }}
+      - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1
         with:
           # A full build of llvm, clang, lld, and lldb takes about 250MB
@@ -118,8 +113,8 @@ jobs:
           # fit under the 10 GB limit.
           # Default to 2G to workaround: https://github.com/hendrikmuhs/ccache-action/issues/174
           max-size: 2G
-          key: ${{ matrix.compile_cache }}-${{ matrix.os }}
-          variant: ${{ matrix.compile_cache }}
+          key: ${{ matrix.os }}
+          variant: sccache
       - name: Build and Test
         if: "!startsWith(matrix.os, 'windows')"
         env:
@@ -160,6 +155,8 @@ jobs:
 
       - name: Build and Test libclc
         if: "!startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macOS') && contains(inputs.projects, 'libclc')"
+        env:
+          LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
         run: |
           # The libclc tests don't have a generated check target so all we can
           # do is build it.

From f2b62637db2c6650565126379d08c9f9e4c0c12b Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Sat, 5 Apr 2025 11:31:22 -0300
Subject: [PATCH 080/114] [SOL] Fix stack arguments store chain (#142)

* Fix missing arg

* Refactor file

* Refactor file and add tests
---
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 59 +++++++------------
 llvm/test/CodeGen/SBF/many_args1.ll           |  4 +-
 llvm/test/CodeGen/SBF/many_args_new_conv.ll   |  6 +-
 llvm/test/CodeGen/SBF/many_args_value_size.ll |  2 +-
 .../CodeGen/SBF/stack_args_store_chain.ll     | 34 +++++++++++
 5 files changed, 62 insertions(+), 43 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/stack_args_store_chain.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 0ff998fb25043..90519f5bc3f23 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -473,9 +473,11 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   SmallVector<std::pair<unsigned, SDValue>, MaxArgs> RegsToPass;
 
   // Walk arg assignments
-  bool HasStackArgs = false;
-  unsigned e, i, ae = ArgLocs.size();
-  for (i = 0, e = ae; i != e; ++i) {
+  unsigned i;
+  SmallVector<SDValue, 8> MemOpChain;
+  SBFFunctionInfo * SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
+
+  for (i = 0; i < ArgLocs.size(); i++) {
     CCValAssign &VA = ArgLocs[i];
     SDValue Arg = OutVals[i];
 
@@ -496,37 +498,13 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       break;
     }
 
-    if (VA.isMemLoc()) {
-      HasStackArgs = true;
-      break;
-    }
-
     // Push arguments into RegsToPass vector
     if (VA.isRegLoc())
       RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
-    else
-      llvm_unreachable("call arg pass bug");
-  }
-
-  SDValue InGlue;
-
-  if (HasStackArgs) {
-    SBFFunctionInfo * SBFFuncInfo = MF.getInfo<SBFFunctionInfo>();
-    // Stack arguments have to be walked in reverse order by inserting
-    // chained stores, this ensures their order is not changed by the scheduler
-    // and that the push instruction sequence generated is correct, otherwise they
-    // can be freely intermixed.
-    for (ae = i, i = ArgLocs.size(); i != ae; --i) {
-      unsigned Loc = i - 1;
-      CCValAssign &VA = ArgLocs[Loc];
-      SDValue Arg = OutVals[Loc];
+    else if (VA.isMemLoc()) {
+      CCValAssign &VA = ArgLocs[i];
+      SDValue Arg = OutVals[i];
 
-      assert(VA.isMemLoc());
-
-      EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
-      SDValue DstAddr;
-      MachinePointerInfo DstInfo;
-      int FrameIndex;
       int64_t Offset = static_cast<int64_t>(VA.getLocMemOffset());
       uint64_t Size = VA.getLocVT().getFixedSizeInBits() / 8;
       if (Subtarget->getHasDynamicFrames()) {
@@ -536,14 +514,22 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
         Offset += Size;
       }
 
-      FrameIndex = MF.getFrameInfo().CreateFixedObject(
+      int FrameIndex = MF.getFrameInfo().CreateFixedObject(
           Size, Offset, false);
       SBFFuncInfo->storeFrameIndexArgument(FrameIndex);
-      DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
-      DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
-      Chain = DAG.getStore(Chain, CLI.DL, Arg, DstAddr, DstInfo);
-    }
+      SDValue DstAddr = DAG.getFrameIndex(FrameIndex, PtrVT);
+      MachinePointerInfo DstInfo = MachinePointerInfo::getFixedStack(MF, FrameIndex, Offset);
+      SDValue Store = DAG.getStore(Chain, CLI.DL, Arg, DstAddr, DstInfo);
+      MemOpChain.push_back(Store);
 
+    } else
+      llvm_unreachable("call arg pass bug");
+  }
+
+  SDValue InGlue;
+
+  if (!MemOpChain.empty()) {
+    Chain = DAG.getNode(ISD::TokenFactor, CLI.DL, MVT::Other, MemOpChain);
     if (!Subtarget->getHasDynamicFrames()) {
       // Pass the current stack frame pointer via SBF::R5, gluing the
       // instruction to instructions passing the first 4 arguments in
@@ -554,7 +540,6 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       Chain = DAG.getCopyToReg(Chain, CLI.DL, SBF::R5, FramePtr, InGlue);
       InGlue = Chain.getValue(1);
     }
-
   }
 
   // Build a sequence of copy-to-reg nodes chained together with token chain and
@@ -586,7 +571,7 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   for (auto &Reg : RegsToPass)
     Ops.push_back(DAG.getRegister(Reg.first, Reg.second.getValueType()));
 
-  if (HasStackArgs && !Subtarget->getHasDynamicFrames()) {
+  if (!MemOpChain.empty() && !Subtarget->getHasDynamicFrames()) {
     Ops.push_back(DAG.getRegister(SBF::R5, MVT::i64));
   }
 
diff --git a/llvm/test/CodeGen/SBF/many_args1.ll b/llvm/test/CodeGen/SBF/many_args1.ll
index 18a7434e250b2..fe574fabdeba5 100644
--- a/llvm/test/CodeGen/SBF/many_args1.ll
+++ b/llvm/test/CodeGen/SBF/many_args1.ll
@@ -3,10 +3,10 @@
 ; Function Attrs: nounwind uwtable
 define i32 @foo(i32 %a, i32 %b, i32 %c) #0 {
 ; CHECK-LABEL: foo:
-; CHECK: mov64 r4, 2
-; CHECK: stxdw [r10 - 4096], r4
 ; CHECK: mov64 r4, 3
 ; CHECK: stxdw [r10 - 4088], r4
+; CHECK: mov64 r4, 2
+; CHECK: stxdw [r10 - 4096], r4
 ; CHECK: mov64 r5, r10
 ; CHECK: mov64 r4, 1
 ; CHECK: call bar
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index 231403a46bf6a..787662fa37825 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -11,8 +11,8 @@ entry:
 ; CHECK-NOT: add64 r10
 
 ; Saving arguments on the stack
-; CHECK: stdw [r10 - 32], 55
 ; CHECK: stdw [r10 - 40], 60
+; CHECK: stdw [r10 - 32], 55
 ; CHECK: stdw [r10 - 24], 50
 ; CHECK: stdw [r10 - 16], 4
 ; CHECK: stdw [r10 - 8], 3
@@ -32,10 +32,10 @@ define i32 @caller_alloca(i32 %a, i32 %b, i32 %c) #0 {
 
 ; Saving arguments in the callee's frame
 
-; Offset in the callee: frame_size - 32
-; CHECK: stdw [r10 - 32], 55
 ; Offset in the callee: frame_size - 40
 ; CHECK: stdw [r10 - 40], 60
+; Offset in the callee: frame_size - 32
+; CHECK: stdw [r10 - 32], 55
 ; Offset in the callee: frame_size - 24
 ; CHECK: stdw [r10 - 24], 50
 ; Offset in the callee: frame_size - 16
diff --git a/llvm/test/CodeGen/SBF/many_args_value_size.ll b/llvm/test/CodeGen/SBF/many_args_value_size.ll
index e588cb3a14f58..71c59c60b0914 100644
--- a/llvm/test/CodeGen/SBF/many_args_value_size.ll
+++ b/llvm/test/CodeGen/SBF/many_args_value_size.ll
@@ -5,8 +5,8 @@ define i64 @test_func(i64 %a, i64 %b, i64 %c, i64 %d, i64 %e) {
 start:
 ; CHECK-LABEL: test_func:
 
-; CHECK: stw [r10 - 20], 300
 ; CHECK: stdw [r10 - 32], 5400
+; CHECK: stw [r10 - 20], 300
 ; CHECK: stw [r10 - 12], 65516
 ; CHECK: stw [r10 - 4], 5
 
diff --git a/llvm/test/CodeGen/SBF/stack_args_store_chain.ll b/llvm/test/CodeGen/SBF/stack_args_store_chain.ll
new file mode 100644
index 0000000000000..352e9101f2238
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/stack_args_store_chain.ll
@@ -0,0 +1,34 @@
+; RUN: llc < %s -march=sbf -mcpu=v2 | FileCheck %s
+
+
+declare void @do_something(ptr, ptr, ptr, ptr, ptr);
+declare void @test(ptr dead_on_unwind noalias nocapture noundef writable align 8 dereferenceable(24) %_0, ptr noalias noundef readonly align 1 dereferenceable(32) %pool_account_key, ptr noalias nocapture noundef readonly align 8 dereferenceable(48) %token_program, ptr noalias nocapture noundef readonly align 8 dereferenceable(48) %mint, ptr noalias nocapture noundef readonly align 8 dereferenceable(48) %destination, ptr noalias nocapture noundef readonly align 8 dereferenceable(48) %authority, i8 noundef %bump_seed, i64 noundef %amount);
+
+define void @func() {
+; CHECK-LABEL: func
+   %185 = alloca [24 x i8], align 8
+   %186 = alloca [48 x i8], align 8
+   %187 = alloca [48 x i8], align 8
+   %188 = alloca [48 x i8], align 8
+   %189 = alloca [48 x i8], align 8
+
+   call void @do_something(ptr %185, ptr %186, ptr %187, ptr %188, ptr %189)
+   %200 = load ptr, ptr %185, align 8
+   %bump_seed = load i8, ptr %188, align 1
+   %other = load i64, ptr %187, align 8
+
+; CHECK: ldxdw r2, [r10 + 232]
+; CHECK: ldxb w1, [r10 + 88]
+; CHECK: ldxdw r3, [r10 + 136]
+
+; CHECK: stxdw [r10 - 24], r3
+
+; The stxw [r10 - 12] store disappears if we use chained stores.
+
+; CHECK: stxw [r10 - 12], w1
+; CHECK: stxdw [r10 - 8], r7
+
+   call void @test(ptr noalias nocapture noundef nonnull align 8 dereferenceable(24) %185, ptr noalias noundef nonnull readonly align 1 dereferenceable(32) %200, ptr noalias nocapture noundef nonnull align 8 dereferenceable(48) %186, ptr noalias nocapture noundef nonnull align 8 dereferenceable(48) %187, ptr noalias nocapture noundef nonnull align 8 dereferenceable(48) %188, ptr noalias nocapture noundef nonnull align 8 dereferenceable(48) %189, i8 noundef %bump_seed, i64 noundef %other)
+
+   ret void
+}
\ No newline at end of file

From fcad39e3bd5ca73994c6839318160d0df904a624 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 9 Apr 2025 11:10:44 -0300
Subject: [PATCH 081/114] [SOL] Properly lower CTTZ and CTLZ in SBF (#143)

* Revert "[SOL] Revert 'Emit table lookup from TargetLowering::expandCTTZ()'"

This reverts commit 9e0bc0c7a43e4d4d92fe9406226d2113e77d64da.

* Expand correctly

* Revert test setup
---
 llvm/lib/Target/SBF/SBFISelLowering.cpp       |  47 ++-
 llvm/lib/Target/SBF/SBFISelLowering.h         |   5 +
 llvm/lib/Target/SBF/SBFInstrInfo.td           |   6 +
 llvm/lib/Target/SBF/SBFMCInstLower.cpp        |   3 +
 llvm/test/CodeGen/BPF/cttz-ctlz.ll            |   1 -
 .../CodeGen/RISCV/ctz_zero_return_test.ll     |   1 -
 llvm/test/CodeGen/RISCV/rv32xtheadbb.ll       |   1 -
 llvm/test/CodeGen/RISCV/rv64xtheadbb.ll       |   1 -
 .../CodeGen/RISCV/rvv/known-never-zero.ll     |   1 -
 llvm/test/CodeGen/RISCV/shl-cttz.ll           |   1 -
 llvm/test/CodeGen/SBF/cttz-ctlz.ll            | 303 ++++++++++++++++++
 11 files changed, 353 insertions(+), 17 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/cttz-ctlz.ll

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 90519f5bc3f23..21382f076721b 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -54,7 +54,7 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
   setOperationAction(ISD::BRIND, MVT::Other, Expand);
   setOperationAction(ISD::BRCOND, MVT::Other, Expand);
 
-  setOperationAction(ISD::GlobalAddress, MVT::i64, Custom);
+  setOperationAction({ISD::GlobalAddress, ISD::ConstantPool}, MVT::i64, Custom);
 
   setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i64, Custom);
   setOperationAction(ISD::STACKSAVE, MVT::Other, Expand);
@@ -102,6 +102,10 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     setOperationAction(ISD::SRL_PARTS, VT, Expand);
     setOperationAction(ISD::SRA_PARTS, VT, Expand);
     setOperationAction(ISD::CTPOP, VT, Expand);
+    setOperationAction(ISD::CTTZ, VT, Expand);
+    setOperationAction(ISD::CTLZ, VT, Expand);
+    setOperationAction(ISD::CTTZ_ZERO_UNDEF, VT, Expand);
+    setOperationAction(ISD::CTLZ_ZERO_UNDEF, VT, Expand);
 
     setOperationAction(ISD::SETCC, VT, Expand);
     setOperationAction(ISD::SELECT, VT, Expand);
@@ -122,11 +126,6 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
     setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i32, Expand);
   }
 
-  setOperationAction(ISD::CTTZ, MVT::i64, Expand);
-  setOperationAction(ISD::CTLZ, MVT::i64, Expand);
-  setOperationAction(ISD::CTTZ_ZERO_UNDEF, MVT::i64, Expand);
-  setOperationAction(ISD::CTLZ_ZERO_UNDEF, MVT::i64, Expand);
-
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1, Expand);
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i8, Expand);
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i16, Expand);
@@ -290,6 +289,8 @@ SDValue SBFTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const {
     return LowerGlobalAddress(Op, DAG);
   case ISD::SELECT_CC:
     return LowerSELECT_CC(Op, DAG);
+  case ISD::ConstantPool:
+    return LowerConstantPool(Op, DAG);
   case ISD::ATOMIC_SWAP:
   case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
   case ISD::ATOMIC_CMP_SWAP:
@@ -882,16 +883,40 @@ const char *SBFTargetLowering::getTargetNodeName(unsigned Opcode) const {
   return nullptr;
 }
 
+static SDValue getTargetNode(GlobalAddressSDNode *N, const SDLoc &DL, EVT Ty,
+                             SelectionDAG &DAG, unsigned Flags) {
+  return DAG.getTargetGlobalAddress(N->getGlobal(), DL, Ty, 0, Flags);
+}
+
+static SDValue getTargetNode(ConstantPoolSDNode *N, const SDLoc &DL, EVT Ty,
+                             SelectionDAG &DAG, unsigned Flags) {
+  return DAG.getTargetConstantPool(N->getConstVal(), Ty, N->getAlign(),
+                                   N->getOffset(), Flags);
+}
+
+template <class NodeTy>
+SDValue SBFTargetLowering::getAddr(NodeTy *N, SelectionDAG &DAG,
+                                   unsigned Flags) const {
+  SDLoc DL(N);
+
+  SDValue GA = getTargetNode(N, DL, MVT::i64, DAG, Flags);
+
+  return DAG.getNode(SBFISD::Wrapper, DL, MVT::i64, GA);
+}
+
 SDValue SBFTargetLowering::LowerGlobalAddress(SDValue Op,
                                               SelectionDAG &DAG) const {
-  auto N = cast<GlobalAddressSDNode>(Op);
+  GlobalAddressSDNode *N = cast<GlobalAddressSDNode>(Op);
   assert(N->getOffset() == 0 && "Invalid offset for global address");
 
-  SDLoc DL(Op);
-  const GlobalValue *GV = N->getGlobal();
-  SDValue GA = DAG.getTargetGlobalAddress(GV, DL, MVT::i64);
+  return getAddr(N, DAG);
+}
 
-  return DAG.getNode(SBFISD::Wrapper, DL, MVT::i64, GA);
+SDValue SBFTargetLowering::LowerConstantPool(llvm::SDValue Op,
+                                             llvm::SelectionDAG &DAG) const {
+  ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op);
+
+  return getAddr(N, DAG);
 }
 
 unsigned
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index e35c4753b3294..050f53528ec4f 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -76,9 +76,14 @@ class SBFTargetLowering : public TargetLowering {
 
   SDValue LowerBR_CC(SDValue Op, SelectionDAG &DAG) const;
   SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const;
+
+  SDValue LowerConstantPool(SDValue Op, SelectionDAG &DAG) const;
   SDValue LowerGlobalAddress(SDValue Op, SelectionDAG &DAG) const;
   SDValue LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const;
 
+  template<class NodeTy>
+  SDValue getAddr(NodeTy *N, SelectionDAG &DAG, unsigned Flags = 0) const;
+
   // Lower the result values of a call, copying them out of physregs into vregs
   SDValue LowerCallResult(SDValue Chain, SDValue InGlue,
                           CallingConv::ID CallConv, bool IsVarArg,
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index e78ee5c7e752a..45d1d035ffe44 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -1245,6 +1245,12 @@ def : Pat<(SBFWrapper tglobaladdr:$in),
         (HOR_addr (MOV_32_64_addr tglobaladdr:$in),
                             tglobaladdr:$in)>, Requires<[SBFNoLddw]>;
 
+def : Pat<(SBFWrapper tconstpool:$in), (LD_imm64 tconstpool:$in)>,
+                                                    Requires<[SBFHasLddw]>;
+def : Pat<(SBFWrapper tconstpool:$in),
+        (HOR_addr (MOV_32_64_addr tconstpool:$in),
+                            tconstpool:$in)>, Requires<[SBFNoLddw]>;
+
 // SBFv2 sign extension
 def : Pat<(i64 (sext GPR32:$src)),
           (MOV_32_64 GPR32:$src)>, Requires<[SBFExplicitSignExt]>;
diff --git a/llvm/lib/Target/SBF/SBFMCInstLower.cpp b/llvm/lib/Target/SBF/SBFMCInstLower.cpp
index 421592d876924..328ef0ca58e9e 100644
--- a/llvm/lib/Target/SBF/SBFMCInstLower.cpp
+++ b/llvm/lib/Target/SBF/SBFMCInstLower.cpp
@@ -74,6 +74,9 @@ void SBFMCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
     case MachineOperand::MO_GlobalAddress:
       MCOp = LowerSymbolOperand(MO, GetGlobalAddressSymbol(MO));
       break;
+    case MachineOperand::MO_ConstantPoolIndex:
+      MCOp = LowerSymbolOperand(MO, Printer.GetCPISymbol(MO.getIndex()));
+      break;
     }
 
     OutMI.addOperand(MCOp);
diff --git a/llvm/test/CodeGen/BPF/cttz-ctlz.ll b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
index 549977d2935d3..865833590a399 100644
--- a/llvm/test/CodeGen/BPF/cttz-ctlz.ll
+++ b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
 ; RUN: llc < %s -mtriple=bpf -mcpu=v1 | FileCheck %s
 
diff --git a/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll b/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll
index 1a8ffc9550d4e..03a6a6b1c4b7d 100644
--- a/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll
+++ b/llvm/test/CodeGen/RISCV/ctz_zero_return_test.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 3
-; XFAIL: *
 ; RUN: llc -mtriple=riscv64 -mattr=+zbb -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV64ZBB
 ; RUN: llc -mtriple=riscv32 -mattr=+zbb -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV32ZBB
 
diff --git a/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll b/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll
index 68265afec4dc9..4bb8d6c248caa 100644
--- a/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll
+++ b/llvm/test/CodeGen/RISCV/rv32xtheadbb.ll
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \
 ; RUN:   | FileCheck %s -check-prefixes=RV32I
diff --git a/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll b/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll
index 0b4f910646d21..d9f7d36127293 100644
--- a/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll
+++ b/llvm/test/CodeGen/RISCV/rv64xtheadbb.ll
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc -mtriple=riscv64 -verify-machineinstrs < %s \
 ; RUN:   | FileCheck %s -check-prefix=RV64I
diff --git a/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll b/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll
index ef0e7fe6bb978..7990c1c1eabc2 100644
--- a/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll
+++ b/llvm/test/CodeGen/RISCV/rvv/known-never-zero.ll
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
 ; RUN: llc < %s -mtriple=riscv64 -mattr=+v -verify-machineinstrs | FileCheck %s
 
diff --git a/llvm/test/CodeGen/RISCV/shl-cttz.ll b/llvm/test/CodeGen/RISCV/shl-cttz.ll
index 80af6148bdc3f..500673cc29196 100644
--- a/llvm/test/CodeGen/RISCV/shl-cttz.ll
+++ b/llvm/test/CodeGen/RISCV/shl-cttz.ll
@@ -1,4 +1,3 @@
-; XFAIL: *
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
 ; RUN: llc -mtriple=riscv32 -mattr=+m < %s \
 ; RUN:   | FileCheck %s -check-prefix=RV32I
diff --git a/llvm/test/CodeGen/SBF/cttz-ctlz.ll b/llvm/test/CodeGen/SBF/cttz-ctlz.ll
new file mode 100644
index 0000000000000..fd0bb7971bb4d
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/cttz-ctlz.ll
@@ -0,0 +1,303 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
+; RUN: llc < %s -march=sbf | FileCheck %s
+
+; test that we can expand CTTZ & CTLZ
+
+declare i32 @llvm.cttz.i32(i32, i1)
+
+define i32 @cttz_i32_zdef(i32 %a) {
+; CHECK-LABEL: cttz_i32_zdef:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    neg64 r2
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    mul64 r1, 125613361
+; CHECK-NEXT:    lddw r2, 4160749568
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    rsh64 r1, 27
+; CHECK-NEXT:    lddw r2, {{\.?LCPI[0-9]+_[0-9]+}}
+; CHECK-NEXT:    add64 r2, r1
+; CHECK-NEXT:    ldxb r0, [r2 + 0]
+; CHECK-NEXT:    exit
+    %ret = call i32 @llvm.cttz.i32(i32 %a, i1 1)
+    ret i32 %ret
+}
+
+
+define i32 @cttz_i32(i32 %a) {
+; CHECK-LABEL: cttz_i32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r0, 32
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    lsh64 r2, 32
+; CHECK-NEXT:    rsh64 r2, 32
+; CHECK-NEXT:    jeq r2, 0, LBB1_2
+; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    neg64 r2
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    mul64 r1, 125613361
+; CHECK-NEXT:    lddw r2, 4160749568
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    rsh64 r1, 27
+; CHECK-NEXT:    lddw r2, {{\.?LCPI[0-9]+_[0-9]+}}
+; CHECK-NEXT:    add64 r2, r1
+; CHECK-NEXT:    ldxb r0, [r2 + 0]
+; CHECK-NEXT:  LBB1_2: # %cond.end
+; CHECK-NEXT:    exit
+    %ret = call i32 @llvm.cttz.i32(i32 %a, i1 0)
+    ret i32 %ret
+}
+
+declare i64 @llvm.cttz.i64(i64, i1)
+
+define i64 @cttz_i64_zdef(i64 %a) {
+; CHECK-LABEL: cttz_i64_zdef:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    neg64 r2
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    lddw r2, 151050438420815295
+; CHECK-NEXT:    mul64 r1, r2
+; CHECK-NEXT:    rsh64 r1, 58
+; CHECK-NEXT:    lddw r2, {{\.?LCPI[0-9]+_[0-9]+}}
+; CHECK-NEXT:    add64 r2, r1
+; CHECK-NEXT:    ldxb r0, [r2 + 0]
+; CHECK-NEXT:    exit
+    %ret = call i64 @llvm.cttz.i64(i64 %a, i1 1)
+    ret i64 %ret
+}
+
+
+define i64 @cttz_i64(i64 %a) {
+; CHECK-LABEL: cttz_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r0, 64
+; CHECK-NEXT:    jeq r1, 0, LBB3_2
+; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    neg64 r2
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    lddw r2, 151050438420815295
+; CHECK-NEXT:    mul64 r1, r2
+; CHECK-NEXT:    rsh64 r1, 58
+; CHECK-NEXT:    lddw r2, {{\.?LCPI[0-9]+_[0-9]+}}
+; CHECK-NEXT:    add64 r2, r1
+; CHECK-NEXT:    ldxb r0, [r2 + 0]
+; CHECK-NEXT:  LBB3_2: # %cond.end
+; CHECK-NEXT:    exit
+    %ret = call i64 @llvm.cttz.i64(i64 %a, i1 0)
+    ret i64 %ret
+}
+
+
+declare i32 @llvm.ctlz.i32(i32, i1)
+
+define i32 @ctlz_i32_zdef(i32 %a) {
+; CHECK-LABEL: ctlz_i32_zdef:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    lddw r2, 4294967294
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 1
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294967292
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 2
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294967280
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 4
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294967040
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 8
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294901760
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 16
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    xor64 r1, -1
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 1
+; CHECK-NEXT:    and64 r2, 1431655765
+; CHECK-NEXT:    sub64 r1, r2
+; CHECK-NEXT:    mov64 r0, r1
+; CHECK-NEXT:    and64 r0, 858993459
+; CHECK-NEXT:    rsh64 r1, 2
+; CHECK-NEXT:    and64 r1, 858993459
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    mov64 r1, r0
+; CHECK-NEXT:    rsh64 r1, 4
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    and64 r0, 252645135
+; CHECK-NEXT:    mul64 r0, 16843009
+; CHECK-NEXT:    lddw r1, 4278190080
+; CHECK-NEXT:    and64 r0, r1
+; CHECK-NEXT:    rsh64 r0, 24
+; CHECK-NEXT:    exit
+    %ret = call i32 @llvm.ctlz.i32(i32 %a, i1 1)
+    ret i32 %ret
+}
+
+
+define i32 @ctlz_i32(i32 %a) {
+; CHECK-LABEL: ctlz_i32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r0, 32
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    lsh64 r2, 32
+; CHECK-NEXT:    rsh64 r2, 32
+; CHECK-NEXT:    jeq r2, 0, LBB5_2
+; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    lddw r2, 4294967294
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 1
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294967292
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 2
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294967280
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 4
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294967040
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 8
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    lddw r2, 4294901760
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    rsh64 r3, 16
+; CHECK-NEXT:    or64 r1, r3
+; CHECK-NEXT:    xor64 r1, -1
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 1
+; CHECK-NEXT:    and64 r2, 1431655765
+; CHECK-NEXT:    sub64 r1, r2
+; CHECK-NEXT:    mov64 r0, r1
+; CHECK-NEXT:    and64 r0, 858993459
+; CHECK-NEXT:    rsh64 r1, 2
+; CHECK-NEXT:    and64 r1, 858993459
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    mov64 r1, r0
+; CHECK-NEXT:    rsh64 r1, 4
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    and64 r0, 252645135
+; CHECK-NEXT:    mul64 r0, 16843009
+; CHECK-NEXT:    lddw r1, 4278190080
+; CHECK-NEXT:    and64 r0, r1
+; CHECK-NEXT:    rsh64 r0, 24
+; CHECK-NEXT:  LBB5_2: # %cond.end
+; CHECK-NEXT:    exit
+    %ret = call i32 @llvm.ctlz.i32(i32 %a, i1 0)
+    ret i32 %ret
+}
+
+declare i64 @llvm.ctlz.i64(i64, i1)
+
+define i64 @ctlz_i64_zdef(i64 %a) {
+; CHECK-LABEL: ctlz_i64_zdef:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 1
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 2
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 4
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 8
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 16
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 32
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    xor64 r1, -1
+; CHECK-NEXT:    lddw r2, 6148914691236517205
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    rsh64 r3, 1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    sub64 r1, r3
+; CHECK-NEXT:    lddw r2, 3689348814741910323
+; CHECK-NEXT:    mov64 r0, r1
+; CHECK-NEXT:    and64 r0, r2
+; CHECK-NEXT:    rsh64 r1, 2
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    mov64 r1, r0
+; CHECK-NEXT:    rsh64 r1, 4
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    lddw r1, 1085102592571150095
+; CHECK-NEXT:    and64 r0, r1
+; CHECK-NEXT:    lddw r1, 72340172838076673
+; CHECK-NEXT:    mul64 r0, r1
+; CHECK-NEXT:    rsh64 r0, 56
+; CHECK-NEXT:    exit
+    %ret = call i64 @llvm.ctlz.i64(i64 %a, i1 1)
+    ret i64 %ret
+}
+
+
+define i64 @ctlz_i64(i64 %a) {
+; CHECK-LABEL: ctlz_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mov64 r0, 64
+; CHECK-NEXT:    jeq r1, 0, LBB7_2
+; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 1
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 2
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 4
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 8
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 16
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    mov64 r2, r1
+; CHECK-NEXT:    rsh64 r2, 32
+; CHECK-NEXT:    or64 r1, r2
+; CHECK-NEXT:    xor64 r1, -1
+; CHECK-NEXT:    lddw r2, 6148914691236517205
+; CHECK-NEXT:    mov64 r3, r1
+; CHECK-NEXT:    rsh64 r3, 1
+; CHECK-NEXT:    and64 r3, r2
+; CHECK-NEXT:    sub64 r1, r3
+; CHECK-NEXT:    lddw r2, 3689348814741910323
+; CHECK-NEXT:    mov64 r0, r1
+; CHECK-NEXT:    and64 r0, r2
+; CHECK-NEXT:    rsh64 r1, 2
+; CHECK-NEXT:    and64 r1, r2
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    mov64 r1, r0
+; CHECK-NEXT:    rsh64 r1, 4
+; CHECK-NEXT:    add64 r0, r1
+; CHECK-NEXT:    lddw r1, 1085102592571150095
+; CHECK-NEXT:    and64 r0, r1
+; CHECK-NEXT:    lddw r1, 72340172838076673
+; CHECK-NEXT:    mul64 r0, r1
+; CHECK-NEXT:    rsh64 r0, 56
+; CHECK-NEXT:  LBB7_2: # %cond.end
+; CHECK-NEXT:    exit
+    %ret = call i64 @llvm.ctlz.i64(i64 %a, i1 0)
+    ret i64 %ret
+}

From 92f62543af298ba17787d69acd325be1d591afbc Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 10 Apr 2025 18:44:46 -0300
Subject: [PATCH 082/114] [SOL] Add missing SBF triples (#144)

---
 clang/lib/Driver/ToolChains/CommonArgs.cpp | 1 +
 clang/lib/Sema/SemaChecking.cpp            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index ae635fb6a1807..d49d0585ba74f 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -674,6 +674,7 @@ std::string tools::getCPUName(const Driver &D, const ArgList &Args,
 
   case llvm::Triple::bpfel:
   case llvm::Triple::bpfeb:
+  case llvm::Triple::sbf:
     if (const Arg *A = Args.getLastArg(options::OPT_mcpu_EQ))
       return A->getValue();
     return "";
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index e440f60526bb3..e9eae195f3d08 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -1927,6 +1927,7 @@ bool Sema::CheckTSBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
     return ARM().CheckAArch64BuiltinFunctionCall(TI, BuiltinID, TheCall);
   case llvm::Triple::bpfeb:
   case llvm::Triple::bpfel:
+  case llvm::Triple::sbf:
     return BPF().CheckBPFBuiltinFunctionCall(BuiltinID, TheCall);
   case llvm::Triple::hexagon:
     return Hexagon().CheckHexagonBuiltinFunctionCall(BuiltinID, TheCall);

From 4a1c4108a28953785543b9068f67fcc56e58c2eb Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 11 Apr 2025 14:30:31 -0300
Subject: [PATCH 083/114] [SOL] LLDB for LLVM 19 (#145)

* [SOL] lldb: pretty print instructions

* [SOL] lldb: skip ranges with DW_AT_low_pc equal to zero

* [SOL] lldb: Add solana-lldb wrapper

This adds a wrapper around the LLDB executable that resides in the same directory. Once we start to distribute LLDB in sbf-tools, the wrapper + scripts can be put into the same directory as the LLDB executable. Invoking ./solana-lldb will pre-load helper functions to print rust as well as solana types (e.g. pubkeys in base58 or auto deref of accounts) and then start the LLDB executable.

* [SOL] Revamp LLDB for SBF

---------

Co-authored-by: wj <wzggUaPFt5J7f@gmx.de>
---
 lldb/include/lldb/Core/Opcode.h               |   3 +-
 lldb/include/lldb/Utility/ArchSpec.h          |   8 +-
 lldb/scripts/solana/lldb_commands             |  18 +
 lldb/scripts/solana/lldb_lookup.py            | 115 +++
 lldb/scripts/solana/lldb_providers.py         | 741 ++++++++++++++++++
 lldb/scripts/solana/rust_types.py             | 113 +++
 lldb/scripts/solana/solana_commands           |   3 +
 lldb/scripts/solana/solana_lookup.py          |  12 +
 lldb/scripts/solana/solana_providers.py       |  80 ++
 lldb/scripts/solana/solana_types.py           |  19 +
 lldb/source/Core/Disassembler.cpp             |   9 +-
 lldb/source/Core/Opcode.cpp                   |  12 +-
 .../Plugins/ObjectFile/ELF/ObjectFileELF.cpp  |  15 +-
 .../Plugins/Platform/Linux/PlatformLinux.cpp  |   3 +-
 .../SymbolFile/DWARF/DWARFDebugAranges.cpp    |   4 +-
 lldb/source/Utility/ArchSpec.cpp              |  10 +-
 16 files changed, 1148 insertions(+), 17 deletions(-)
 create mode 100644 lldb/scripts/solana/lldb_commands
 create mode 100644 lldb/scripts/solana/lldb_lookup.py
 create mode 100644 lldb/scripts/solana/lldb_providers.py
 create mode 100644 lldb/scripts/solana/rust_types.py
 create mode 100644 lldb/scripts/solana/solana_commands
 create mode 100644 lldb/scripts/solana/solana_lookup.py
 create mode 100644 lldb/scripts/solana/solana_providers.py
 create mode 100644 lldb/scripts/solana/solana_types.py

diff --git a/lldb/include/lldb/Core/Opcode.h b/lldb/include/lldb/Core/Opcode.h
index f72f2687b54fe..7fe56bb05dd72 100644
--- a/lldb/include/lldb/Core/Opcode.h
+++ b/lldb/include/lldb/Core/Opcode.h
@@ -9,6 +9,7 @@
 #ifndef LLDB_CORE_OPCODE_H
 #define LLDB_CORE_OPCODE_H
 
+#include "lldb/Utility/ArchSpec.h"
 #include "lldb/Utility/Endian.h"
 #include "lldb/lldb-enumerations.h"
 
@@ -199,7 +200,7 @@ class Opcode {
     }
   }
 
-  int Dump(Stream *s, uint32_t min_byte_width);
+  int Dump(Stream *s, uint32_t min_byte_width, const ArchSpec &arch);
 
   const void *GetOpcodeBytes() const {
     return ((m_type == Opcode::eTypeBytes) ? m_data.inst.bytes : nullptr);
diff --git a/lldb/include/lldb/Utility/ArchSpec.h b/lldb/include/lldb/Utility/ArchSpec.h
index aafb379629333..33a56e8a5623a 100644
--- a/lldb/include/lldb/Utility/ArchSpec.h
+++ b/lldb/include/lldb/Utility/ArchSpec.h
@@ -107,8 +107,10 @@ class ArchSpec {
   };
 
   enum SBFSubType {
-    eSBFSubType_sbf,
+    eSBFSubType_sbfv0,
+    eSBFSubType_sbfv1,
     eSBFSubType_sbfv2,
+    eSBFSubType_sbfv3,
   };
 
   enum RISCVSubType {
@@ -247,8 +249,10 @@ class ArchSpec {
     eCore_wasm32,
 
     eCore_bpf,
-    eCore_sbf,
+    eCore_sbfv0,
+    eCore_sbfv1,
     eCore_sbfv2,
+    eCore_sbfv3,
 
     kNumCores,
 
diff --git a/lldb/scripts/solana/lldb_commands b/lldb/scripts/solana/lldb_commands
new file mode 100644
index 0000000000000..4a1204ccc4be7
--- /dev/null
+++ b/lldb/scripts/solana/lldb_commands
@@ -0,0 +1,18 @@
+type synthetic add -l lldb_lookup.synthetic_lookup -x ".*" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)String$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?str$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?\\[.+\\]$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::ffi::([a-z_]+::)+)OsString$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)Vec<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)VecDeque<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)BTreeSet<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)BTreeMap<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::collections::([a-z_]+::)+)HashMap<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::collections::([a-z_]+::)+)HashSet<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)Rc<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)Arc<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)Cell<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)Ref<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)RefMut<.+>$" --category Rust
+type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)RefCell<.+>$" --category Rust
+type category enable Rust
diff --git a/lldb/scripts/solana/lldb_lookup.py b/lldb/scripts/solana/lldb_lookup.py
new file mode 100644
index 0000000000000..3cee51982ba9f
--- /dev/null
+++ b/lldb/scripts/solana/lldb_lookup.py
@@ -0,0 +1,115 @@
+import lldb
+
+from lldb_providers import *
+from rust_types import RustType, classify_struct, classify_union
+
+
+# BACKCOMPAT: rust 1.35
+def is_hashbrown_hashmap(hash_map):
+    return len(hash_map.type.fields) == 1
+
+
+def classify_rust_type(type):
+    type_class = type.GetTypeClass()
+    if type_class == lldb.eTypeClassStruct:
+        return classify_struct(type.name, type.fields)
+    if type_class == lldb.eTypeClassUnion:
+        return classify_union(type.fields)
+
+    return RustType.OTHER
+
+
+def summary_lookup(valobj, dict):
+    # type: (SBValue, dict) -> str
+    """Returns the summary provider for the given value"""
+    rust_type = classify_rust_type(valobj.GetType())
+
+    if rust_type == RustType.STD_STRING:
+        return StdStringSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_OS_STRING:
+        return StdOsStringSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_STR:
+        return StdStrSummaryProvider(valobj, dict)
+
+    if rust_type == RustType.STD_VEC:
+        return SizeSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_VEC_DEQUE:
+        return SizeSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_SLICE:
+        return SizeSummaryProvider(valobj, dict)
+
+    if rust_type == RustType.STD_HASH_MAP:
+        return SizeSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_HASH_SET:
+        return SizeSummaryProvider(valobj, dict)
+
+    if rust_type == RustType.STD_RC:
+        return StdRcSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_ARC:
+        return StdRcSummaryProvider(valobj, dict)
+
+    if rust_type == RustType.STD_REF:
+        return StdRefSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_REF_MUT:
+        return StdRefSummaryProvider(valobj, dict)
+    if rust_type == RustType.STD_REF_CELL:
+        return StdRefSummaryProvider(valobj, dict)
+
+    return ""
+
+
+def synthetic_lookup(valobj, dict):
+    # type: (SBValue, dict) -> object
+    """Returns the synthetic provider for the given value"""
+    rust_type = classify_rust_type(valobj.GetType())
+
+    if rust_type == RustType.STRUCT:
+        return StructSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STRUCT_VARIANT:
+        return StructSyntheticProvider(valobj, dict, is_variant=True)
+    if rust_type == RustType.TUPLE:
+        return TupleSyntheticProvider(valobj, dict)
+    if rust_type == RustType.TUPLE_VARIANT:
+        return TupleSyntheticProvider(valobj, dict, is_variant=True)
+    if rust_type == RustType.EMPTY:
+        return EmptySyntheticProvider(valobj, dict)
+    if rust_type == RustType.REGULAR_ENUM:
+        discriminant = valobj.GetChildAtIndex(0).GetChildAtIndex(0).GetValueAsUnsigned()
+        return synthetic_lookup(valobj.GetChildAtIndex(discriminant), dict)
+    if rust_type == RustType.SINGLETON_ENUM:
+        return synthetic_lookup(valobj.GetChildAtIndex(0), dict)
+
+    if rust_type == RustType.STD_VEC:
+        return StdVecSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_VEC_DEQUE:
+        return StdVecDequeSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_SLICE:
+        return StdSliceSyntheticProvider(valobj, dict)
+
+    if rust_type == RustType.STD_HASH_MAP:
+        if is_hashbrown_hashmap(valobj):
+            return StdHashMapSyntheticProvider(valobj, dict)
+        else:
+            return StdOldHashMapSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_HASH_SET:
+        hash_map = valobj.GetChildAtIndex(0)
+        if is_hashbrown_hashmap(hash_map):
+            return StdHashMapSyntheticProvider(valobj, dict, show_values=False)
+        else:
+            return StdOldHashMapSyntheticProvider(hash_map, dict, show_values=False)
+
+    if rust_type == RustType.STD_RC:
+        return StdRcSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_ARC:
+        return StdRcSyntheticProvider(valobj, dict, is_atomic=True)
+
+    if rust_type == RustType.STD_CELL:
+        return StdCellSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_REF:
+        return StdRefSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_REF_MUT:
+        return StdRefSyntheticProvider(valobj, dict)
+    if rust_type == RustType.STD_REF_CELL:
+        return StdRefSyntheticProvider(valobj, dict, is_cell=True)
+
+    return DefaultSynthteticProvider(valobj, dict)
diff --git a/lldb/scripts/solana/lldb_providers.py b/lldb/scripts/solana/lldb_providers.py
new file mode 100644
index 0000000000000..35ac07f0db763
--- /dev/null
+++ b/lldb/scripts/solana/lldb_providers.py
@@ -0,0 +1,741 @@
+import sys
+
+from lldb import SBValue, SBData, SBError, eBasicTypeLong, eBasicTypeUnsignedLong, \
+    eBasicTypeUnsignedChar
+
+# from lldb.formatters import Logger
+
+####################################################################################################
+# This file contains two kinds of pretty-printers: summary and synthetic.
+#
+# Important classes from LLDB module:
+#   SBValue: the value of a variable, a register, or an expression
+#   SBType:  the data type; each SBValue has a corresponding SBType
+#
+# Summary provider is a function with the type `(SBValue, dict) -> str`.
+#   The first parameter is the object encapsulating the actual variable being displayed;
+#   The second parameter is an internal support parameter used by LLDB, and you should not touch it.
+#
+# Synthetic children is the way to provide a children-based representation of the object's value.
+# Synthetic provider is a class that implements the following interface:
+#
+#     class SyntheticChildrenProvider:
+#         def __init__(self, SBValue, dict)
+#         def num_children(self)
+#         def get_child_index(self, str)
+#         def get_child_at_index(self, int)
+#         def update(self)
+#         def has_children(self)
+#         def get_value(self)
+#
+#
+# You can find more information and examples here:
+#   1. https://lldb.llvm.org/varformats.html
+#   2. https://lldb.llvm.org/python-reference.html
+#   3. https://lldb.llvm.org/python_reference/lldb.formatters.cpp.libcxx-pysrc.html
+#   4. https://github.com/llvm-mirror/lldb/tree/master/examples/summaries/cocoa
+####################################################################################################
+
+PY3 = sys.version_info[0] == 3
+
+
+class ValueBuilder:
+    def __init__(self, valobj):
+        # type: (SBValue) -> ValueBuilder
+        self.valobj = valobj
+        process = valobj.GetProcess()
+        self.endianness = process.GetByteOrder()
+        self.pointer_size = process.GetAddressByteSize()
+
+    def from_int(self, name, value):
+        # type: (str, int) -> SBValue
+        type = self.valobj.GetType().GetBasicType(eBasicTypeLong)
+        data = SBData.CreateDataFromSInt64Array(self.endianness, self.pointer_size, [value])
+        return self.valobj.CreateValueFromData(name, data, type)
+
+    def from_uint(self, name, value):
+        # type: (str, int) -> SBValue
+        type = self.valobj.GetType().GetBasicType(eBasicTypeUnsignedLong)
+        data = SBData.CreateDataFromUInt64Array(self.endianness, self.pointer_size, [value])
+        return self.valobj.CreateValueFromData(name, data, type)
+
+
+def unwrap_unique_or_non_null(unique_or_nonnull):
+    # BACKCOMPAT: rust 1.32
+    # https://github.com/rust-lang/rust/commit/7a0911528058e87d22ea305695f4047572c5e067
+    # BACKCOMPAT: rust 1.60
+    # https://github.com/rust-lang/rust/commit/2a91eeac1a2d27dd3de1bf55515d765da20fd86f
+    ptr = unique_or_nonnull.GetChildMemberWithName("pointer")
+    return ptr if ptr.TypeIsPointerType() else ptr.GetChildAtIndex(0)
+
+
+class DefaultSynthteticProvider:
+    def __init__(self, valobj, dict):
+        # type: (SBValue, dict) -> DefaultSynthteticProvider
+        # logger = Logger.Logger()
+        # logger >> "Default synthetic provider for " + str(valobj.GetName())
+        self.valobj = valobj
+
+    def num_children(self):
+        # type: () -> int
+        return self.valobj.GetNumChildren()
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        return self.valobj.GetIndexOfChildWithName(name)
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        return self.valobj.GetChildAtIndex(index)
+
+    def update(self):
+        # type: () -> None
+        pass
+
+    def has_children(self):
+        # type: () -> bool
+        return self.valobj.MightHaveChildren()
+
+
+class EmptySyntheticProvider:
+    def __init__(self, valobj, dict):
+        # type: (SBValue, dict) -> EmptySyntheticProvider
+        # logger = Logger.Logger()
+        # logger >> "[EmptySyntheticProvider] for " + str(valobj.GetName())
+        self.valobj = valobj
+
+    def num_children(self):
+        # type: () -> int
+        return 0
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        return None
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        return None
+
+    def update(self):
+        # type: () -> None
+        pass
+
+    def has_children(self):
+        # type: () -> bool
+        return False
+
+
+def SizeSummaryProvider(valobj, dict):
+    # type: (SBValue, dict) -> str
+    return 'size=' + str(valobj.GetNumChildren())
+
+
+def vec_to_string(vec):
+    length = vec.GetNumChildren()
+    chars = [vec.GetChildAtIndex(i).GetValueAsUnsigned() for i in range(length)]
+    return bytes(chars).decode(errors='replace') if PY3 else "".join(chr(char) for char in chars)
+
+
+def StdStringSummaryProvider(valobj, dict):
+    # type: (SBValue, dict) -> str
+    # logger = Logger.Logger()
+    # logger >> "[StdStringSummaryProvider] for " + str(valobj.GetName())
+    vec = valobj.GetChildAtIndex(0)
+    return '"%s"' % vec_to_string(vec)
+
+
+def StdOsStringSummaryProvider(valobj, dict):
+    # type: (SBValue, dict) -> str
+    # logger = Logger.Logger()
+    # logger >> "[StdOsStringSummaryProvider] for " + str(valobj.GetName())
+    buf = valobj.GetChildAtIndex(0).GetChildAtIndex(0)
+    is_windows = "Wtf8Buf" in buf.type.name
+    vec = buf.GetChildAtIndex(0) if is_windows else buf
+    return '"%s"' % vec_to_string(vec)
+
+
+def StdStrSummaryProvider(valobj, dict):
+    # type: (SBValue, dict) -> str
+    # logger = Logger.Logger()
+    # logger >> "[StdStrSummaryProvider] for " + str(valobj.GetName())
+
+    length = valobj.GetChildMemberWithName("length").GetValueAsUnsigned()
+    if length == 0:
+        return '""'
+
+    data_ptr = valobj.GetChildMemberWithName("data_ptr")
+
+    start = data_ptr.GetValueAsUnsigned()
+    error = SBError()
+    process = data_ptr.GetProcess()
+    data = process.ReadMemory(start, length, error)
+    data = data.decode(encoding='UTF-8') if PY3 else data
+    return '"%s"' % data
+
+
+class StructSyntheticProvider:
+    """Pretty-printer for structs and struct enum variants"""
+
+    def __init__(self, valobj, dict, is_variant=False):
+        # type: (SBValue, dict, bool) -> StructSyntheticProvider
+        # logger = Logger.Logger()
+        self.valobj = valobj
+        self.is_variant = is_variant
+        self.type = valobj.GetType()
+        self.fields = {}
+
+        if is_variant:
+            self.fields_count = self.type.GetNumberOfFields() - 1
+            real_fields = self.type.fields[1:]
+        else:
+            self.fields_count = self.type.GetNumberOfFields()
+            real_fields = self.type.fields
+
+        for number, field in enumerate(real_fields):
+            self.fields[field.name] = number
+
+    def num_children(self):
+        # type: () -> int
+        return self.fields_count
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        return self.fields.get(name, -1)
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        if self.is_variant:
+            field = self.type.GetFieldAtIndex(index + 1)
+        else:
+            field = self.type.GetFieldAtIndex(index)
+        return self.valobj.GetChildMemberWithName(field.name)
+
+    def update(self):
+        # type: () -> None
+        pass
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+class TupleSyntheticProvider:
+    """Pretty-printer for tuples and tuple enum variants"""
+
+    def __init__(self, valobj, dict, is_variant=False):
+        # type: (SBValue, dict, bool) -> TupleSyntheticProvider
+        # logger = Logger.Logger()
+        self.valobj = valobj
+        self.is_variant = is_variant
+        self.type = valobj.GetType()
+
+        if is_variant:
+            self.size = self.type.GetNumberOfFields() - 1
+        else:
+            self.size = self.type.GetNumberOfFields()
+
+    def num_children(self):
+        # type: () -> int
+        return self.size
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        if name.isdigit():
+            return int(name)
+        else:
+            return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        if self.is_variant:
+            field = self.type.GetFieldAtIndex(index + 1)
+        else:
+            field = self.type.GetFieldAtIndex(index)
+        element = self.valobj.GetChildMemberWithName(field.name)
+        return self.valobj.CreateValueFromData(str(index), element.GetData(), element.GetType())
+
+    def update(self):
+        # type: () -> None
+        pass
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+class StdVecSyntheticProvider:
+    """Pretty-printer for alloc::vec::Vec<T>
+
+    struct Vec<T> { buf: RawVec<T>, len: usize }
+    struct RawVec<T> { ptr: Unique<T>, cap: usize, ... }
+    rust 1.31.1: struct Unique<T: ?Sized> { pointer: NonZero<*const T>, ... }
+    rust 1.33.0: struct Unique<T: ?Sized> { pointer: *const T, ... }
+    rust 1.62.0: struct Unique<T: ?Sized> { pointer: NonNull<T>, ... }
+    struct NonZero<T>(T)
+    struct NonNull<T> { pointer: *const T }
+    """
+
+    def __init__(self, valobj, dict):
+        # type: (SBValue, dict) -> StdVecSyntheticProvider
+        # logger = Logger.Logger()
+        # logger >> "[StdVecSyntheticProvider] for " + str(valobj.GetName())
+        self.valobj = valobj
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        return self.length
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        index = name.lstrip('[').rstrip(']')
+        if index.isdigit():
+            return int(index)
+        else:
+            return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        start = self.data_ptr.GetValueAsUnsigned()
+        address = start + index * self.element_type_size
+        element = self.data_ptr.CreateValueFromAddress("[%s]" % index, address, self.element_type)
+        return element
+
+    def update(self):
+        # type: () -> None
+        self.length = self.valobj.GetChildMemberWithName("len").GetValueAsUnsigned()
+        self.buf = self.valobj.GetChildMemberWithName("buf")
+
+        self.data_ptr = unwrap_unique_or_non_null(self.buf.GetChildMemberWithName("ptr"))
+
+        self.element_type = self.data_ptr.GetType().GetPointeeType()
+        self.element_type_size = self.element_type.GetByteSize()
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+class StdSliceSyntheticProvider:
+    def __init__(self, valobj, dict):
+        self.valobj = valobj
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        return self.length
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        index = name.lstrip('[').rstrip(']')
+        if index.isdigit():
+            return int(index)
+        else:
+            return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        start = self.data_ptr.GetValueAsUnsigned()
+        address = start + index * self.element_type_size
+        element = self.data_ptr.CreateValueFromAddress("[%s]" % index, address, self.element_type)
+        return element
+
+    def update(self):
+        # type: () -> None
+        self.length = self.valobj.GetChildMemberWithName("length").GetValueAsUnsigned()
+        self.data_ptr = self.valobj.GetChildMemberWithName("data_ptr")
+
+        self.element_type = self.data_ptr.GetType().GetPointeeType()
+        self.element_type_size = self.element_type.GetByteSize()
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+class StdVecDequeSyntheticProvider:
+    """Pretty-printer for alloc::collections::vec_deque::VecDeque<T>
+
+    struct VecDeque<T> { tail: usize, head: usize, buf: RawVec<T> }
+    """
+
+    def __init__(self, valobj, dict):
+        # type: (SBValue, dict) -> StdVecDequeSyntheticProvider
+        # logger = Logger.Logger()
+        # logger >> "[StdVecDequeSyntheticProvider] for " + str(valobj.GetName())
+        self.valobj = valobj
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        return self.size
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        index = name.lstrip('[').rstrip(']')
+        if index.isdigit() and self.tail <= index and (self.tail + index) % self.cap < self.head:
+            return int(index)
+        else:
+            return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        start = self.data_ptr.GetValueAsUnsigned()
+        address = start + ((index + self.tail) % self.cap) * self.element_type_size
+        element = self.data_ptr.CreateValueFromAddress("[%s]" % index, address, self.element_type)
+        return element
+
+    def update(self):
+        # type: () -> None
+        self.head = self.valobj.GetChildMemberWithName("head").GetValueAsUnsigned()
+        self.tail = self.valobj.GetChildMemberWithName("tail").GetValueAsUnsigned()
+        self.buf = self.valobj.GetChildMemberWithName("buf")
+        self.cap = self.buf.GetChildMemberWithName("cap").GetValueAsUnsigned()
+        if self.head >= self.tail:
+            self.size = self.head - self.tail
+        else:
+            self.size = self.cap + self.head - self.tail
+
+        self.data_ptr = unwrap_unique_or_non_null(self.buf.GetChildMemberWithName("ptr"))
+
+        self.element_type = self.data_ptr.GetType().GetPointeeType()
+        self.element_type_size = self.element_type.GetByteSize()
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+# BACKCOMPAT: rust 1.35
+class StdOldHashMapSyntheticProvider:
+    """Pretty-printer for std::collections::hash::map::HashMap<K, V, S>
+
+    struct HashMap<K, V, S> {..., table: RawTable<K, V>, ... }
+    struct RawTable<K, V> { capacity_mask: usize, size: usize, hashes: TaggedHashUintPtr, ... }
+    """
+
+    def __init__(self, valobj, dict, show_values=True):
+        # type: (SBValue, dict, bool) -> StdOldHashMapSyntheticProvider
+        self.valobj = valobj
+        self.show_values = show_values
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        return self.size
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        index = name.lstrip('[').rstrip(']')
+        if index.isdigit():
+            return int(index)
+        else:
+            return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        # logger = Logger.Logger()
+        start = self.data_ptr.GetValueAsUnsigned() & ~1
+
+        # See `libstd/collections/hash/table.rs:raw_bucket_at
+        hashes = self.hash_uint_size * self.capacity
+        align = self.pair_type_size
+        # See `libcore/alloc.rs:padding_needed_for`
+        len_rounded_up = (((((hashes + align) % self.modulo - 1) % self.modulo) & ~(
+                (align - 1) % self.modulo)) % self.modulo - hashes) % self.modulo
+        # len_rounded_up = ((hashes + align - 1) & ~(align - 1)) - hashes
+
+        pairs_offset = hashes + len_rounded_up
+        pairs_start = start + pairs_offset
+
+        table_index = self.valid_indices[index]
+        idx = table_index & self.capacity_mask
+        address = pairs_start + idx * self.pair_type_size
+        element = self.data_ptr.CreateValueFromAddress("[%s]" % index, address, self.pair_type)
+        if self.show_values:
+            return element
+        else:
+            key = element.GetChildAtIndex(0)
+            return self.valobj.CreateValueFromData("[%s]" % index, key.GetData(), key.GetType())
+
+    def update(self):
+        # type: () -> None
+        # logger = Logger.Logger()
+
+        self.table = self.valobj.GetChildMemberWithName("table")  # type: SBValue
+        self.size = self.table.GetChildMemberWithName("size").GetValueAsUnsigned()
+        self.hashes = self.table.GetChildMemberWithName("hashes")
+        self.hash_uint_type = self.hashes.GetType()
+        self.hash_uint_size = self.hashes.GetType().GetByteSize()
+        self.modulo = 2 ** self.hash_uint_size
+        self.data_ptr = self.hashes.GetChildAtIndex(0).GetChildAtIndex(0)
+
+        self.capacity_mask = self.table.GetChildMemberWithName("capacity_mask").GetValueAsUnsigned()
+        self.capacity = (self.capacity_mask + 1) % self.modulo
+
+        marker = self.table.GetChildMemberWithName("marker").GetType()  # type: SBType
+        self.pair_type = marker.template_args[0]
+        self.pair_type_size = self.pair_type.GetByteSize()
+
+        self.valid_indices = []
+        for idx in range(self.capacity):
+            address = self.data_ptr.GetValueAsUnsigned() + idx * self.hash_uint_size
+            hash_uint = self.data_ptr.CreateValueFromAddress("[%s]" % idx, address,
+                                                             self.hash_uint_type)
+            hash_ptr = hash_uint.GetChildAtIndex(0).GetChildAtIndex(0)
+            if hash_ptr.GetValueAsUnsigned() != 0:
+                self.valid_indices.append(idx)
+
+        # logger >> "Valid indices: {}".format(str(self.valid_indices))
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+class StdHashMapSyntheticProvider:
+    """Pretty-printer for hashbrown's HashMap"""
+
+    def __init__(self, valobj, dict, show_values=True):
+        # type: (SBValue, dict, bool) -> StdHashMapSyntheticProvider
+        self.valobj = valobj
+        self.show_values = show_values
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        return self.size
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        index = name.lstrip('[').rstrip(']')
+        if index.isdigit():
+            return int(index)
+        else:
+            return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        pairs_start = self.data_ptr.GetValueAsUnsigned()
+        idx = self.valid_indices[index]
+        if self.new_layout:
+            idx = -(idx + 1)
+        address = pairs_start + idx * self.pair_type_size
+        element = self.data_ptr.CreateValueFromAddress("[%s]" % index, address, self.pair_type)
+        if self.show_values:
+            return element
+        else:
+            key = element.GetChildAtIndex(0)
+            return self.valobj.CreateValueFromData("[%s]" % index, key.GetData(), key.GetType())
+
+    def update(self):
+        # type: () -> None
+        table = self.table()
+        inner_table = table.GetChildMemberWithName("table")
+
+        capacity = inner_table.GetChildMemberWithName("bucket_mask").GetValueAsUnsigned() + 1
+        ctrl = inner_table.GetChildMemberWithName("ctrl").GetChildAtIndex(0)
+
+        self.size = inner_table.GetChildMemberWithName("items").GetValueAsUnsigned()
+        self.pair_type = table.type.template_args[0]
+        if self.pair_type.IsTypedefType():
+            self.pair_type = self.pair_type.GetTypedefedType()
+        self.pair_type_size = self.pair_type.GetByteSize()
+
+        self.new_layout = not inner_table.GetChildMemberWithName("data").IsValid()
+        if self.new_layout:
+            self.data_ptr = ctrl.Cast(self.pair_type.GetPointerType())
+        else:
+            self.data_ptr = inner_table.GetChildMemberWithName("data").GetChildAtIndex(0)
+
+        u8_type = self.valobj.GetTarget().GetBasicType(eBasicTypeUnsignedChar)
+        u8_type_size = self.valobj.GetTarget().GetBasicType(eBasicTypeUnsignedChar).GetByteSize()
+
+        self.valid_indices = []
+        for idx in range(capacity):
+            address = ctrl.GetValueAsUnsigned() + idx * u8_type_size
+            value = ctrl.CreateValueFromAddress("ctrl[%s]" % idx, address,
+                                                u8_type).GetValueAsUnsigned()
+            is_present = value & 128 == 0
+            if is_present:
+                self.valid_indices.append(idx)
+
+    def table(self):
+        # type: () -> SBValue
+        if self.show_values:
+            hashbrown_hashmap = self.valobj.GetChildMemberWithName("base")
+        else:
+            # BACKCOMPAT: rust 1.47
+            # HashSet wraps either std HashMap or hashbrown::HashSet, which both
+            # wrap hashbrown::HashMap, so either way we "unwrap" twice.
+            hashbrown_hashmap = self.valobj.GetChildAtIndex(0).GetChildAtIndex(0)
+        return hashbrown_hashmap.GetChildMemberWithName("table")
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+def StdRcSummaryProvider(valobj, dict):
+    # type: (SBValue, dict) -> str
+    strong = valobj.GetChildMemberWithName("strong").GetValueAsUnsigned()
+    weak = valobj.GetChildMemberWithName("weak").GetValueAsUnsigned()
+    return "strong={}, weak={}".format(strong, weak)
+
+
+class StdRcSyntheticProvider:
+    """Pretty-printer for alloc::rc::Rc<T> and alloc::sync::Arc<T>
+
+    struct Rc<T> { ptr: NonNull<RcBox<T>>, ... }
+    rust 1.31.1: struct NonNull<T> { pointer: NonZero<*const T> }
+    rust 1.33.0: struct NonNull<T> { pointer: *const T }
+    struct NonZero<T>(T)
+    struct RcBox<T> { strong: Cell<usize>, weak: Cell<usize>, value: T }
+    struct Cell<T> { value: UnsafeCell<T> }
+    struct UnsafeCell<T> { value: T }
+
+    struct Arc<T> { ptr: NonNull<ArcInner<T>>, ... }
+    struct ArcInner<T> { strong: atomic::AtomicUsize, weak: atomic::AtomicUsize, data: T }
+    struct AtomicUsize { v: UnsafeCell<usize> }
+    """
+
+    def __init__(self, valobj, dict, is_atomic=False):
+        # type: (SBValue, dict, bool) -> StdRcSyntheticProvider
+        self.valobj = valobj
+
+        self.ptr = unwrap_unique_or_non_null(self.valobj.GetChildMemberWithName("ptr"))
+
+        self.value = self.ptr.GetChildMemberWithName("data" if is_atomic else "value")
+
+        self.strong = self.ptr.GetChildMemberWithName("strong").GetChildAtIndex(
+            0).GetChildMemberWithName("value")
+        self.weak = self.ptr.GetChildMemberWithName("weak").GetChildAtIndex(
+            0).GetChildMemberWithName("value")
+
+        self.value_builder = ValueBuilder(valobj)
+
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        # Actually there are 3 children, but only the `value` should be shown as a child
+        return 1
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        if name == "value":
+            return 0
+        if name == "strong":
+            return 1
+        if name == "weak":
+            return 2
+        return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        if index == 0:
+            return self.value
+        if index == 1:
+            return self.value_builder.from_uint("strong", self.strong_count)
+        if index == 2:
+            return self.value_builder.from_uint("weak", self.weak_count)
+
+        return None
+
+    def update(self):
+        # type: () -> None
+        self.strong_count = self.strong.GetValueAsUnsigned()
+        self.weak_count = self.weak.GetValueAsUnsigned() - 1
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+class StdCellSyntheticProvider:
+    """Pretty-printer for std::cell::Cell"""
+
+    def __init__(self, valobj, dict):
+        # type: (SBValue, dict) -> StdCellSyntheticProvider
+        self.valobj = valobj
+        self.value = valobj.GetChildMemberWithName("value").GetChildAtIndex(0)
+
+    def num_children(self):
+        # type: () -> int
+        return 1
+
+    def get_child_index(self, name):
+        # type: (str) -> int
+        if name == "value":
+            return 0
+        return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        if index == 0:
+            return self.value
+        return None
+
+    def update(self):
+        # type: () -> None
+        pass
+
+    def has_children(self):
+        # type: () -> bool
+        return True
+
+
+def StdRefSummaryProvider(valobj, dict):
+    # type: (SBValue, dict) -> str
+    borrow = valobj.GetChildMemberWithName("borrow").GetValueAsSigned()
+    return "borrow={}".format(borrow) if borrow >= 0 else "borrow_mut={}".format(-borrow)
+
+
+class StdRefSyntheticProvider:
+    """Pretty-printer for std::cell::Ref, std::cell::RefMut, and std::cell::RefCell"""
+
+    def __init__(self, valobj, dict, is_cell=False):
+        # type: (SBValue, dict, bool) -> StdRefSyntheticProvider
+        self.valobj = valobj
+
+        borrow = valobj.GetChildMemberWithName("borrow")
+        value = valobj.GetChildMemberWithName("value")
+        if is_cell:
+            self.borrow = borrow.GetChildMemberWithName("value").GetChildMemberWithName("value")
+            self.value = value.GetChildMemberWithName("value")
+        else:
+            self.borrow = borrow.GetChildMemberWithName("borrow").GetChildMemberWithName(
+                "value").GetChildMemberWithName("value")
+            self.value = value.Dereference()
+
+        self.value_builder = ValueBuilder(valobj)
+
+        self.update()
+
+    def num_children(self):
+        # type: () -> int
+        # Actually there are 2 children, but only the `value` should be shown as a child
+        return 1
+
+    def get_child_index(self, name):
+        if name == "value":
+            return 0
+        if name == "borrow":
+            return 1
+        return -1
+
+    def get_child_at_index(self, index):
+        # type: (int) -> SBValue
+        if index == 0:
+            return self.value
+        if index == 1:
+            return self.value_builder.from_int("borrow", self.borrow_count)
+        return None
+
+    def update(self):
+        # type: () -> None
+        self.borrow_count = self.borrow.GetValueAsSigned()
+
+    def has_children(self):
+        # type: () -> bool
+        return True
diff --git a/lldb/scripts/solana/rust_types.py b/lldb/scripts/solana/rust_types.py
new file mode 100644
index 0000000000000..bbc945a7ddab0
--- /dev/null
+++ b/lldb/scripts/solana/rust_types.py
@@ -0,0 +1,113 @@
+import re
+
+
+class RustType(object):
+    OTHER = "Other"
+    STRUCT = "Struct"
+    TUPLE = "Tuple"
+    CSTYLE_VARIANT = "CStyleVariant"
+    TUPLE_VARIANT = "TupleVariant"
+    STRUCT_VARIANT = "StructVariant"
+    ENUM = "Enum"
+    EMPTY = "Empty"
+    SINGLETON_ENUM = "SingletonEnum"
+    REGULAR_ENUM = "RegularEnum"
+    COMPRESSED_ENUM = "CompressedEnum"
+    REGULAR_UNION = "RegularUnion"
+
+    STD_STRING = "StdString"
+    STD_OS_STRING = "StdOsString"
+    STD_STR = "StdStr"
+    STD_SLICE = "StdSlice"
+    STD_VEC = "StdVec"
+    STD_VEC_DEQUE = "StdVecDeque"
+    STD_BTREE_SET = "StdBTreeSet"
+    STD_BTREE_MAP = "StdBTreeMap"
+    STD_HASH_MAP = "StdHashMap"
+    STD_HASH_SET = "StdHashSet"
+    STD_RC = "StdRc"
+    STD_ARC = "StdArc"
+    STD_CELL = "StdCell"
+    STD_REF = "StdRef"
+    STD_REF_MUT = "StdRefMut"
+    STD_REF_CELL = "StdRefCell"
+
+
+STD_STRING_REGEX = re.compile(r"^(alloc::(\w+::)+)String$")
+STD_STR_REGEX = re.compile(r"^&(mut )?str$")
+STD_SLICE_REGEX = re.compile(r"^&(mut )?\[.+\]$")
+STD_OS_STRING_REGEX = re.compile(r"^(std::ffi::(\w+::)+)OsString$")
+STD_VEC_REGEX = re.compile(r"^(alloc::(\w+::)+)Vec<.+>$")
+STD_VEC_DEQUE_REGEX = re.compile(r"^(alloc::(\w+::)+)VecDeque<.+>$")
+STD_BTREE_SET_REGEX = re.compile(r"^(alloc::(\w+::)+)BTreeSet<.+>$")
+STD_BTREE_MAP_REGEX = re.compile(r"^(alloc::(\w+::)+)BTreeMap<.+>$")
+STD_HASH_MAP_REGEX = re.compile(r"^(std::collections::(\w+::)+)HashMap<.+>$")
+STD_HASH_SET_REGEX = re.compile(r"^(std::collections::(\w+::)+)HashSet<.+>$")
+STD_RC_REGEX = re.compile(r"^(alloc::(\w+::)+)Rc<.+>$")
+STD_ARC_REGEX = re.compile(r"^(alloc::(\w+::)+)Arc<.+>$")
+STD_CELL_REGEX = re.compile(r"^(core::(\w+::)+)Cell<.+>$")
+STD_REF_REGEX = re.compile(r"^(core::(\w+::)+)Ref<.+>$")
+STD_REF_MUT_REGEX = re.compile(r"^(core::(\w+::)+)RefMut<.+>$")
+STD_REF_CELL_REGEX = re.compile(r"^(core::(\w+::)+)RefCell<.+>$")
+
+TUPLE_ITEM_REGEX = re.compile(r"__\d+$")
+
+ENCODED_ENUM_PREFIX = "RUST$ENCODED$ENUM$"
+ENUM_DISR_FIELD_NAME = "<<variant>>"
+
+STD_TYPE_TO_REGEX = {
+    RustType.STD_STRING: STD_STRING_REGEX,
+    RustType.STD_OS_STRING: STD_OS_STRING_REGEX,
+    RustType.STD_STR: STD_STR_REGEX,
+    RustType.STD_SLICE: STD_SLICE_REGEX,
+    RustType.STD_VEC: STD_VEC_REGEX,
+    RustType.STD_VEC_DEQUE: STD_VEC_DEQUE_REGEX,
+    RustType.STD_HASH_MAP: STD_HASH_MAP_REGEX,
+    RustType.STD_HASH_SET: STD_HASH_SET_REGEX,
+    RustType.STD_BTREE_SET: STD_BTREE_SET_REGEX,
+    RustType.STD_BTREE_MAP: STD_BTREE_MAP_REGEX,
+    RustType.STD_RC: STD_RC_REGEX,
+    RustType.STD_ARC: STD_ARC_REGEX,
+    RustType.STD_REF: STD_REF_REGEX,
+    RustType.STD_REF_MUT: STD_REF_MUT_REGEX,
+    RustType.STD_REF_CELL: STD_REF_CELL_REGEX,
+    RustType.STD_CELL: STD_CELL_REGEX,
+}
+
+def is_tuple_fields(fields):
+    # type: (list) -> bool
+    return all(TUPLE_ITEM_REGEX.match(str(field.name)) for field in fields)
+
+
+def classify_struct(name, fields):
+    if len(fields) == 0:
+        return RustType.EMPTY
+
+    for ty, regex in STD_TYPE_TO_REGEX.items():
+        if regex.match(name):
+            return ty
+
+    if fields[0].name == ENUM_DISR_FIELD_NAME:
+        return RustType.ENUM
+
+    if is_tuple_fields(fields):
+        return RustType.TUPLE
+
+    return RustType.STRUCT
+
+
+def classify_union(fields):
+    if len(fields) == 0:
+        return RustType.EMPTY
+
+    first_variant_name = fields[0].name
+    if first_variant_name is None:
+        if len(fields) == 1:
+            return RustType.SINGLETON_ENUM
+        else:
+            return RustType.REGULAR_ENUM
+    elif first_variant_name.startswith(ENCODED_ENUM_PREFIX):
+        assert len(fields) == 1
+        return RustType.COMPRESSED_ENUM
+    else:
+        return RustType.REGULAR_UNION
diff --git a/lldb/scripts/solana/solana_commands b/lldb/scripts/solana/solana_commands
new file mode 100644
index 0000000000000..b2a3fc4b95427
--- /dev/null
+++ b/lldb/scripts/solana/solana_commands
@@ -0,0 +1,3 @@
+type summary add -F solana_lookup.summary_lookup solana_program::account_info::AccountInfo --category Solana
+type summary add -F solana_lookup.summary_lookup solana_program::pubkey::Pubkey --category Solana
+type category enable Solana
diff --git a/lldb/scripts/solana/solana_lookup.py b/lldb/scripts/solana/solana_lookup.py
new file mode 100644
index 0000000000000..297d986bdf295
--- /dev/null
+++ b/lldb/scripts/solana/solana_lookup.py
@@ -0,0 +1,12 @@
+from solana_providers import *
+from solana_types import SolanaType, classify_solana_type
+
+
+def summary_lookup(valobj, dict):
+    # type: (SBValue, dict) -> str
+    """Returns the summary provider for the given value"""
+    solana_type = classify_solana_type(valobj.GetType())
+    if solana_type == SolanaType.PUBKEY:
+        return PubkeySummaryProvider(valobj, dict)
+    if solana_type == SolanaType.ACCOUNT_INFO:
+        return AccountInfoSummaryProvider(valobj, dict)
diff --git a/lldb/scripts/solana/solana_providers.py b/lldb/scripts/solana/solana_providers.py
new file mode 100644
index 0000000000000..97514a5c03f06
--- /dev/null
+++ b/lldb/scripts/solana/solana_providers.py
@@ -0,0 +1,80 @@
+import lldb
+
+
+def encode_b58(num):
+    alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
+    b58 = ""
+    while num != 0:
+        b58 += alphabet[num % 58]
+        num //= 58
+    return b58[::-1]
+
+def PubkeySummaryProvider(valobj, internal_dict):
+    err = lldb.SBError()
+    if valobj.TypeIsPointerType():
+        program_id_type = valobj.GetType().GetPointeeType()
+        value = valobj.GetPointeeData()
+    else:
+        value = valobj.GetData()
+    pubkey = [value.GetUnsignedInt8(err, i) for i in range(32)]
+    pubkey = ''.join("{0:0{1}x}".format(i, 2) for i in pubkey)
+    pubkey = encode_b58(int(pubkey, 16))
+
+    if valobj.TypeIsPointerType():
+        return "-> Pubkey = {}".format(pubkey)
+    return "{}".format(pubkey)
+
+
+def AccountInfoSummaryProvider(valobj, internal_dict):
+    err = lldb.SBError()
+    # key
+    key_valobj = valobj.GetChildAtIndex(0)
+
+    # is_signer
+    signer_valobj = valobj.GetChildAtIndex(1)
+
+    # is_writable
+    writable_valobj = valobj.GetChildAtIndex(2)
+
+    # lamports
+    lamport_valobj = valobj.GetChildAtIndex(3)
+    lamport_valobj = lamport_valobj.GetChildAtIndex(0)
+    lamport_valobj = lamport_valobj.GetChildAtIndex(0)
+    lamport_valobj = lamport_valobj.GetChildAtIndex(0)
+    lamports_data = lamport_valobj.GetData();
+    lamports = lamports_data.GetUnsignedInt64(err, 0)
+
+    # data
+    data_valobj = valobj.GetChildAtIndex(4)
+    data_valobj = data_valobj.GetChildAtIndex(0)
+    data_valobj = data_valobj.GetChildAtIndex(0)
+    data_valobj = data_valobj.__str__().replace("value", "data")
+    data_valobj = data_valobj.__str__().replace("  [", "        [")
+    data_valobj = data_valobj.__str__().replace("}", "    }")
+
+    # owner
+    owner_valobj = valobj.GetChildAtIndex(5)
+
+    # executable
+    executable_valobj = valobj.GetChildAtIndex(6)
+
+    # rent_epoch
+    rent_epoch_valobj = valobj.GetChildAtIndex(7)
+    rent_epoch_data = rent_epoch_valobj.GetData();
+    rent_epoch = rent_epoch_data.GetUnsignedInt64(err, 0)
+
+    ret_string = ""
+    if valobj.TypeIsPointerType():
+        ret_string = "-> "
+
+    return ret_string + """{{
+  {}
+  {}
+  {}
+  (u64) lamports = {}
+  {}
+  {}
+  {}
+  (u64) rent_epoch = {}
+}}
+            """.format(key_valobj, signer_valobj, writable_valobj, lamports, owner_valobj, executable_valobj, data_valobj, rent_epoch)
diff --git a/lldb/scripts/solana/solana_types.py b/lldb/scripts/solana/solana_types.py
new file mode 100644
index 0000000000000..67ff9d240dac4
--- /dev/null
+++ b/lldb/scripts/solana/solana_types.py
@@ -0,0 +1,19 @@
+import re
+
+
+class SolanaType(object):
+    PUBKEY = "Pubkey"
+    ACCOUNT_INFO = "AccountInfo"
+
+PUBKEY_REGEX = re.compile(r"^(solana_program::pubkey::Pubkey)")
+ACCOUNT_INFO_REGEX = re.compile(r"^(solana_program::account_info::AccountInfo)")
+
+SOLANA_TYPE_TO_REGEX = {
+    SolanaType.PUBKEY: PUBKEY_REGEX,
+    SolanaType.ACCOUNT_INFO: ACCOUNT_INFO_REGEX,
+}
+
+def classify_solana_type(type):
+    for ty, regex in SOLANA_TYPE_TO_REGEX.items():
+        if regex.match(type.name):
+            return ty
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index b05be7e1a46d7..d2c447d13aee9 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -635,21 +635,22 @@ void Instruction::Dump(lldb_private::Stream *s, uint32_t max_opcode_byte_size,
   }
 
   if (show_bytes) {
+    ArchSpec arch = exe_ctx->GetTargetPtr()->GetArchitecture();
     if (m_opcode.GetType() == Opcode::eTypeBytes) {
       // x86_64 and i386 are the only ones that use bytes right now so pad out
       // the byte dump to be able to always show 15 bytes (3 chars each) plus a
       // space
       if (max_opcode_byte_size > 0)
-        m_opcode.Dump(&ss, max_opcode_byte_size * 3 + 1);
+        m_opcode.Dump(&ss, max_opcode_byte_size * 3 + 1, arch);
       else
-        m_opcode.Dump(&ss, 15 * 3 + 1);
+        m_opcode.Dump(&ss, 15 * 3 + 1, arch);
     } else {
       // Else, we have ARM or MIPS which can show up to a uint32_t 0x00000000
       // (10 spaces) plus two for padding...
       if (max_opcode_byte_size > 0)
-        m_opcode.Dump(&ss, max_opcode_byte_size * 3 + 1);
+        m_opcode.Dump(&ss, max_opcode_byte_size * 3 + 1, arch);
       else
-        m_opcode.Dump(&ss, 12);
+        m_opcode.Dump(&ss, 12, arch);
     }
   }
 
diff --git a/lldb/source/Core/Opcode.cpp b/lldb/source/Core/Opcode.cpp
index 3e30d98975d8a..6143052a8adfc 100644
--- a/lldb/source/Core/Opcode.cpp
+++ b/lldb/source/Core/Opcode.cpp
@@ -21,7 +21,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-int Opcode::Dump(Stream *s, uint32_t min_byte_width) {
+int Opcode::Dump(Stream *s, uint32_t min_byte_width, const ArchSpec &arch) {
   const uint32_t previous_bytes = s->GetWrittenBytes();
   switch (m_type) {
   case Opcode::eTypeInvalid:
@@ -39,7 +39,15 @@ int Opcode::Dump(Stream *s, uint32_t min_byte_width) {
     break;
 
   case Opcode::eType64:
-    s->Printf("0x%16.16" PRIx64, m_data.inst64);
+    if (arch.GetMachine() == llvm::Triple::sbf) {
+      for (uint32_t i = 0; i < 8; ++i) {
+        if (i > 0)
+          s->PutChar(' ');
+        s->Printf("%2.2x", m_data.inst.bytes[i]);
+      }
+    }
+    else
+      s->Printf("0x%16.16" PRIx64, m_data.inst64);
     break;
 
   case Opcode::eTypeBytes:
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index be705ee935b87..ce0ee7a4cc1dd 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -250,9 +250,18 @@ bool ELFNote::Parse(const DataExtractor &data, lldb::offset_t *offset) {
 }
 
 static uint32_t sbfVariantFromElfFlags(const elf::ELFHeader &header) {
-  if (header.e_flags & llvm::ELF::EF_SBF_V2)
-      return ArchSpec::eSBFSubType_sbfv2;
-  return ArchSpec::eSBFSubType_sbf;
+  switch (header.e_flags) {
+  case llvm::ELF::EF_SBF_V0:
+    return ArchSpec::eSBFSubType_sbfv0;
+  case llvm::ELF::EF_SBF_V1:
+    return ArchSpec::eSBFSubType_sbfv1;
+  case llvm::ELF::EF_SBF_V2:
+    return ArchSpec::eSBFSubType_sbfv2;
+  case llvm::ELF::EF_SBF_V3:
+    return ArchSpec::eSBFSubType_sbfv3;
+  default:
+    return ArchSpec::eSBFSubType_sbfv0;
+  }
 }
 
 static uint32_t mipsVariantFromElfFlags (const elf::ELFHeader &header) {
diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
index 13465986f49c5..754540230b3db 100644
--- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
+++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
@@ -123,7 +123,8 @@ PlatformLinux::PlatformLinux(bool is_host)
         {llvm::Triple::x86_64, llvm::Triple::x86, llvm::Triple::arm,
          llvm::Triple::aarch64, llvm::Triple::mips64, llvm::Triple::mips64,
          llvm::Triple::hexagon, llvm::Triple::mips, llvm::Triple::mips64el,
-         llvm::Triple::mipsel, llvm::Triple::msp430, llvm::Triple::systemz},
+         llvm::Triple::mipsel, llvm::Triple::msp430, llvm::Triple::systemz,
+        llvm::Triple::sbf},
         llvm::Triple::Linux);
   }
 }
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
index a1a70ac1c9e85..581bd907b868c 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
@@ -41,7 +41,7 @@ void DWARFDebugAranges::extract(const DWARFDataExtractor &debug_aranges_data) {
     }
     const uint64_t cu_offset = set.getCompileUnitDIEOffset();
     for (const auto &desc : set.descriptors()) {
-      if (desc.Length != 0)
+      if (desc.Length != 0 && desc.Address > 0)
         m_aranges.Append(
             RangeToDIE::Entry(desc.Address, desc.Length, cu_offset));
     }
@@ -63,7 +63,7 @@ void DWARFDebugAranges::Dump(Log *log) const {
 
 void DWARFDebugAranges::AppendRange(dw_offset_t offset, dw_addr_t low_pc,
                                     dw_addr_t high_pc) {
-  if (high_pc > low_pc)
+  if (high_pc > low_pc && low_pc > 0)
     m_aranges.Append(RangeToDIE::Entry(low_pc, high_pc - low_pc, offset));
 }
 
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index c4ce534c0ebec..4c9bc638cb47e 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -249,8 +249,10 @@ static const CoreDefinition g_core_definitions[] = {
     {eByteOrderLittle, 4, 1, 4, llvm::Triple::wasm32, ArchSpec::eCore_wasm32,
      "wasm32"},
     {eByteOrderLittle, 8, 8, 8, llvm::Triple::bpfel, ArchSpec::eCore_bpf, "bpf"},
-    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbf, "sbf"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv0, "sbf"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv1, "sbfv1"},
     {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv2, "sbfv2"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv3, "sbfv3"},
 };
 
 // Ensure that we have an entry in the g_core_definitions for each core. If you
@@ -437,10 +439,14 @@ static const ArchDefinitionEntry g_elf_arch_entries[] = {
      0xFFFFFFFFu}, // loongarch64
     {ArchSpec::eCore_bpf, llvm::ELF::EM_BPF, LLDB_INVALID_CPUTYPE,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // bpf
-    {ArchSpec::eCore_sbf, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbf,
+    {ArchSpec::eCore_sbfv0, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv0,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbf
+    {ArchSpec::eCore_sbfv1, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv1,
+     0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv1
     {ArchSpec::eCore_sbfv2, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv2,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv2
+    {ArchSpec::eCore_sbfv3, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv3,
+     0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv3
 };
 
 static const ArchDefinition g_elf_arch_def = {

From 7c7ec42c3e718fa5ec380583abc51b30379bd4fe Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 18 Apr 2025 11:15:59 -0300
Subject: [PATCH 084/114] [SOL] Add v4 CPU type for SBF (#147)

---
 lldb/include/lldb/Utility/ArchSpec.h                |  2 ++
 .../source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp |  2 ++
 lldb/source/Utility/ArchSpec.cpp                    |  3 +++
 llvm/include/llvm/BinaryFormat/ELF.h                |  1 +
 .../lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp |  2 ++
 llvm/lib/Target/SBF/SBFSubtarget.cpp                |  3 ++-
 llvm/lib/Target/SBF/SBFSubtarget.h                  |  3 +++
 llvm/lib/Target/SBF/SBFTargetFeatures.td            | 13 ++++++++++++-
 llvm/test/MC/SBF/elf-flags.s                        |  8 +++++++-
 llvm/tools/llvm-objdump/llvm-objdump.cpp            |  3 +++
 10 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/lldb/include/lldb/Utility/ArchSpec.h b/lldb/include/lldb/Utility/ArchSpec.h
index 33a56e8a5623a..2c36668add84c 100644
--- a/lldb/include/lldb/Utility/ArchSpec.h
+++ b/lldb/include/lldb/Utility/ArchSpec.h
@@ -111,6 +111,7 @@ class ArchSpec {
     eSBFSubType_sbfv1,
     eSBFSubType_sbfv2,
     eSBFSubType_sbfv3,
+    eSBFSubType_sbfv4,
   };
 
   enum RISCVSubType {
@@ -253,6 +254,7 @@ class ArchSpec {
     eCore_sbfv1,
     eCore_sbfv2,
     eCore_sbfv3,
+    eCore_sbfv4,
 
     kNumCores,
 
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index ce0ee7a4cc1dd..e7184aacce16b 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -259,6 +259,8 @@ static uint32_t sbfVariantFromElfFlags(const elf::ELFHeader &header) {
     return ArchSpec::eSBFSubType_sbfv2;
   case llvm::ELF::EF_SBF_V3:
     return ArchSpec::eSBFSubType_sbfv3;
+  case llvm::ELF::EF_SBF_V4:
+    return ArchSpec::eSBFSubType_sbfv4;
   default:
     return ArchSpec::eSBFSubType_sbfv0;
   }
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index 4c9bc638cb47e..ab1b4bbb33ca4 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -253,6 +253,7 @@ static const CoreDefinition g_core_definitions[] = {
     {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv1, "sbfv1"},
     {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv2, "sbfv2"},
     {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv3, "sbfv3"},
+    {eByteOrderLittle, 8, 8, 8, llvm::Triple::sbf, ArchSpec::eCore_sbfv4, "sbfv4"},
 };
 
 // Ensure that we have an entry in the g_core_definitions for each core. If you
@@ -447,6 +448,8 @@ static const ArchDefinitionEntry g_elf_arch_entries[] = {
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv2
     {ArchSpec::eCore_sbfv3, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv3,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv3
+    {ArchSpec::eCore_sbfv4, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv4,
+      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv3
 };
 
 static const ArchDefinition g_elf_arch_def = {
diff --git a/llvm/include/llvm/BinaryFormat/ELF.h b/llvm/include/llvm/BinaryFormat/ELF.h
index 74627bed3339a..900db3861859e 100644
--- a/llvm/include/llvm/BinaryFormat/ELF.h
+++ b/llvm/include/llvm/BinaryFormat/ELF.h
@@ -957,6 +957,7 @@ enum : unsigned {
   EF_SBF_V1 = 0x01,
   EF_SBF_V2 = 0x02,
   EF_SBF_V3 = 0x03,
+  EF_SBF_V4 = 0x04,
 };
 
 // ELF Relocation types for SBF.
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index 3e01068584da5..d74a38d1deb34 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -76,6 +76,8 @@ static MCStreamer *createSBFMCStreamer(const Triple &T, MCContext &Ctx,
     EFlag = llvm::ELF::EF_SBF_V2;
   } else if (CPU == "v3") {
     EFlag = llvm::ELF::EF_SBF_V3;
+  } else if (CPU == "v4") {
+    EFlag = llvm::ELF::EF_SBF_V4;
   }
   S->getWriter().setELFHeaderEFlags(EFlag);
 
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
index ec7ad11b22d92..93979cb1c68e7 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.cpp
+++ b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -43,7 +43,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   assert(TT.getArch() == Triple::sbf && "expected Triple::sbf");
   UseDwarfRIS = false;
 
-  // SBFv2 features
+  // New SBF features
   HasJmpExt = false;
   HasDynamicFrames = false;
   DisableNeg = false;
@@ -56,6 +56,7 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasExplicitSignExt = false;
   NewMemEncoding = false;
   HasStaticSyscalls = false;
+  IsAbiV2 = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
index d44f4bcdf5f9b..19208b061f03f 100644
--- a/llvm/lib/Target/SBF/SBFSubtarget.h
+++ b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -88,6 +88,9 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // Whether we enable the new encoding for memory instructions
   bool NewMemEncoding;
 
+  // Whether we are using AbiV2
+  bool IsAbiV2;
+
   std::unique_ptr<CallLowering> CallLoweringInfo;
   std::unique_ptr<InstructionSelector> InstSelector;
   std::unique_ptr<LegalizerInfo> Legalizer;
diff --git a/llvm/lib/Target/SBF/SBFTargetFeatures.td b/llvm/lib/Target/SBF/SBFTargetFeatures.td
index a1ff0b940a425..ab302f6022890 100644
--- a/llvm/lib/Target/SBF/SBFTargetFeatures.td
+++ b/llvm/lib/Target/SBF/SBFTargetFeatures.td
@@ -52,15 +52,26 @@ def FeatureNewMemEncoding : SubtargetFeature<"mem-encoding", "NewMemEncoding",
 def FeatureJumpExt : SubtargetFeature<"jmp-ext", "HasJmpExt",
                                        "true", "Enable jumps with less than and less than or equal">;
 
+def FeatureAbiV2 : SubtargetFeature<"abi-v2", "IsAbiV2",
+                                       "true", "Enables AbiV2 in SBF (no-op in LLVM)">;
+
+
 class Proc<string Name, list<SubtargetFeature> Features>
  : Processor<Name, NoItineraries, Features>;
 
 def : Proc<"generic", []>;
 
 def : Proc<"v1", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt]>;
+
 def : Proc<"v2", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt, FeatureDisableLddw,
                   FeatureNewMemEncoding, FeatureCallxRegSrc, FeaturePqrInstr, FeatureExplicitSext,
                   FeatureDisableNeg, FeatureReverseSubImm, ALU32]>;
+
 def : Proc<"v3", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt, FeatureDisableLddw,
                   FeatureNewMemEncoding, FeatureCallxRegSrc, FeaturePqrInstr, FeatureExplicitSext,
-                  FeatureDisableNeg, FeatureReverseSubImm, ALU32, FeatureStaticSyscalls, FeatureRelocAbs64]>;
\ No newline at end of file
+                  FeatureDisableNeg, FeatureReverseSubImm, ALU32, FeatureStaticSyscalls, FeatureRelocAbs64]>;
+
+def : Proc<"v4", [FeatureDynamicFrames, FeatureStoreImm, FeatureJumpExt, FeatureDisableLddw,
+                  FeatureNewMemEncoding, FeatureCallxRegSrc, FeaturePqrInstr, FeatureExplicitSext,
+                  FeatureDisableNeg, FeatureReverseSubImm, ALU32, FeatureStaticSyscalls, FeatureRelocAbs64,
+                  FeatureAbiV2]>;
\ No newline at end of file
diff --git a/llvm/test/MC/SBF/elf-flags.s b/llvm/test/MC/SBF/elf-flags.s
index edbd20230a1c3..e7b58dae51d26 100644
--- a/llvm/test/MC/SBF/elf-flags.s
+++ b/llvm/test/MC/SBF/elf-flags.s
@@ -22,7 +22,9 @@
 # RUN: llvm-mc -triple=sbpfv3-solana-solana -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-SBFV3 %s
-
+# RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v4 -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV4 %s
 
 # CHECK-NONE:       Flags [ (0x0)
 # CHECK-NONE-NEXT:  ]
@@ -40,4 +42,8 @@
 # CHECK-SBFV3-NEXT:    0x2
 # CHECK-SBFV3-NEXT:  ]
 
+# CHECK-SBFV4:       Flags [ (0x4)
+# CHECK-SBFV4-NEXT:    0x4
+# CHECK-SBFV4-NEXT:  ]
+
 mov64 r0, r0
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 71ef454401383..85d5462de7204 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -2601,6 +2601,9 @@ static void disassembleObject(ObjectFile *Obj, bool InlineRelocs) {
       case llvm::ELF::EF_SBF_V3:
         MCPU = "v3";
         break;
+      case llvm::ELF::EF_SBF_V4:
+        MCPU = "v4";
+        break;
       default:
         MCPU = "generic";
         break;

From fac5222c5a8fbd93c24c9e86bf5aa7bc19d7be0c Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Sun, 20 Apr 2025 07:14:02 -0300
Subject: [PATCH 085/114] [SOL] Create sbpfv0 and sbpfv4 targets (#148)

---
 llvm/include/llvm/TargetParser/Triple.h          |  2 ++
 llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp |  6 ++++++
 llvm/lib/TargetParser/Triple.cpp                 |  7 +++++--
 llvm/test/CodeGen/SBF/ninline_asm.ll             |  2 ++
 llvm/test/MC/SBF/elf-flags.s                     |  6 ++++++
 llvm/unittests/TargetParser/TripleTest.cpp       | 14 ++++++++++++++
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index 6980997eb7ccd..f38206d79ebf8 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -179,9 +179,11 @@ class Triple {
     DXILSubArch_v1_8,
     LatestDXILSubArch = DXILSubArch_v1_8,
 
+    SBFSubArch_v0,
     SBFSubArch_v1,
     SBFSubArch_v2,
     SBFSubArch_v3,
+    SBFSubArch_v4,
   };
   enum VendorType {
     UnknownVendor,
diff --git a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
index 43ab953ac2d3b..b3f34db9701f6 100644
--- a/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
+++ b/llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
@@ -19,6 +19,9 @@ Target &llvm::getTheSBFXTarget() {
 std::string llvm::cpuFromSubArch(const Triple &TT, const std::string &CPU) {
   std::string CpuType;
   switch (TT.getSubArch()) {
+  case Triple::SBFSubArch_v0:
+    CpuType = "generic";
+    break;
   case Triple::SBFSubArch_v1:
     CpuType = "v1";
     break;
@@ -28,6 +31,9 @@ std::string llvm::cpuFromSubArch(const Triple &TT, const std::string &CPU) {
   case Triple::SBFSubArch_v3:
     CpuType = "v3";
     break;
+  case Triple::SBFSubArch_v4:
+    CpuType = "v4";
+    break;
   default:
     break;
   }
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
index 7c0d05d396c5b..89e14086e3ac1 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -418,8 +418,9 @@ static Triple::ArchType parseBPFArch(StringRef ArchName) {
   } else if (ArchName == "bpf_le" || ArchName == "bpfel") {
     return Triple::bpfel;
   } else if (ArchName == "sbf" || ArchName == "sbpf" ||
-             ArchName == "sbpfv1" || ArchName == "sbpfv2" ||
-             ArchName == "sbpfv3") {
+             ArchName == "sbpfv0" || ArchName == "sbpfv1" ||
+             ArchName == "sbpfv2" || ArchName == "sbpfv3" ||
+             ArchName == "sbpfv4") {
     return Triple::sbf;
   } else {
     return Triple::UnknownArch;
@@ -835,9 +836,11 @@ static Triple::SubArchType parseSubArch(StringRef SubArchName) {
 
   if (SubArchName.starts_with("sbpf")) {
     return StringSwitch<Triple::SubArchType>(SubArchName)
+        .EndsWith("v0", Triple::SBFSubArch_v0)
         .EndsWith("v1", Triple::SBFSubArch_v1)
         .EndsWith("v2", Triple::SBFSubArch_v2)
         .EndsWith("v3", Triple::SBFSubArch_v3)
+        .EndsWith("v4", Triple::SBFSubArch_v4)
         .Default(Triple::NoSubArch);
   }
 
diff --git a/llvm/test/CodeGen/SBF/ninline_asm.ll b/llvm/test/CodeGen/SBF/ninline_asm.ll
index ab6c1140c2751..219a823d6f7e1 100644
--- a/llvm/test/CodeGen/SBF/ninline_asm.ll
+++ b/llvm/test/CodeGen/SBF/ninline_asm.ll
@@ -1,4 +1,6 @@
 ; RUN: llc < %s -march=sbf -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=sbpf-solana-solana -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=sbpfv0-solana-solana -verify-machineinstrs | FileCheck %s
 
 @g = common global [2 x i32] zeroinitializer, align 4
 
diff --git a/llvm/test/MC/SBF/elf-flags.s b/llvm/test/MC/SBF/elf-flags.s
index e7b58dae51d26..ae6d2997b5a4e 100644
--- a/llvm/test/MC/SBF/elf-flags.s
+++ b/llvm/test/MC/SBF/elf-flags.s
@@ -4,6 +4,9 @@
 # RUN: llvm-mc -triple=sbpf-solana-solana -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-NONE %s
+# RUN: llvm-mc -triple=sbpfv0-solana-solana -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-NONE %s
 # RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v1 -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-SBFV1 %s
@@ -25,6 +28,9 @@
 # RUN: llvm-mc -triple=sbf-solana-solana -mcpu=v4 -filetype=obj < %s \
 # RUN:   | llvm-readobj --file-headers - \
 # RUN:   | FileCheck -check-prefix=CHECK-SBFV4 %s
+# RUN: llvm-mc -triple=sbpfv4-solana-solana -filetype=obj < %s \
+# RUN:   | llvm-readobj --file-headers - \
+# RUN:   | FileCheck -check-prefix=CHECK-SBFV4 %s
 
 # CHECK-NONE:       Flags [ (0x0)
 # CHECK-NONE-NEXT:  ]
diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp
index c060835abfa69..c5c055b0cbca2 100644
--- a/llvm/unittests/TargetParser/TripleTest.cpp
+++ b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -763,6 +763,13 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::SolanaOS, T.getOS());
   EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
 
+  T = Triple("sbpfv0-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::SBFSubArch_v0, T.getSubArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
   T = Triple("sbpfv1-solana-solana");
   EXPECT_EQ(Triple::sbf, T.getArch());
   EXPECT_EQ(Triple::SBFSubArch_v1, T.getSubArch());
@@ -784,6 +791,13 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::SolanaOS, T.getOS());
   EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
 
+  T = Triple("sbpfv4-solana-solana");
+  EXPECT_EQ(Triple::sbf, T.getArch());
+  EXPECT_EQ(Triple::SBFSubArch_v4, T.getSubArch());
+  EXPECT_EQ(Triple::Solana, T.getVendor());
+  EXPECT_EQ(Triple::SolanaOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
   T = Triple("sbf-unknown-unknown");
   EXPECT_EQ(Triple::sbf, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());

From 57d0d029409b7b33f678fdd047de7ab0357c1b05 Mon Sep 17 00:00:00 2001
From: Nicolas IOOSS <64031241+niooss-ledger@users.noreply.github.com>
Date: Mon, 5 May 2025 19:49:25 +0200
Subject: [PATCH 086/114] [SOL] Add missing space in error message about stack
 usage (#149)

The compiler sometimes reports:

    Error: A function call in method [...] overwrites values in the
    frame. Please, decrease stack usage or remove parameters from the
    call.The function call may cause undefined behavior during execution.

Add a missing space between "call." and "The function".

Fixes: https://github.com/anza-xyz/llvm-project/issues/146
---
 llvm/lib/Target/SBF/SBFRegisterInfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
index 78f598cf9e6f6..4179e302c6dd6 100644
--- a/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFRegisterInfo.cpp
@@ -158,7 +158,7 @@ int SBFRegisterInfo::resolveInternalFrameIndex(
       dbgs() << "Error: A function call in method "
              << MF.getFunction().getName()
              << " overwrites values in the frame. Please, decrease stack usage "
-             << "or remove parameters from the call."
+             << "or remove parameters from the call. "
              << "The function call may cause undefined behavior "
                 "during execution.\n\n";
     }

From f71f9594bbf3a1089783db512f043f25e867d5a3 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 9 May 2025 14:46:55 -0300
Subject: [PATCH 087/114] [SOL] Always add return for SBPFv3 (#150)

* [SOL] Always add return for SBPFv3

* Add test and simplify condition
---
 llvm/lib/Target/SBF/SBF.h                   |  3 ++-
 llvm/lib/Target/SBF/SBFMIPeephole.cpp       | 23 ++++++++++++---------
 llvm/lib/Target/SBF/SBFTargetMachine.cpp    |  4 +---
 llvm/test/CodeGen/SBF/unreachable_return.ll |  1 +
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
index 4d1e8bdd5047e..18426c91bd7b2 100644
--- a/llvm/lib/Target/SBF/SBF.h
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -28,7 +28,8 @@ FunctionPass *createSBFISelDag(SBFTargetMachine &TM);
 FunctionPass *createSBFMISimplifyPatchablePass();
 FunctionPass *createSBFMIPeepholePass();
 FunctionPass *createSBFMIPeepholeTruncElimPass();
-FunctionPass *createSBFMIPreEmitPeepholePass();
+FunctionPass *createSBFMIPreEmitPeepholePass(CodeGenOptLevel OptLevel,
+                                             bool DisablePeephole);
 FunctionPass *createSBFMIPreEmitCheckingPass();
 
 InstructionSelector *createSBFInstructionSelector(const SBFTargetMachine &,
diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index e642a30bcdb2c..3bc3f70d958d6 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -131,8 +131,12 @@ struct SBFMIPreEmitPeephole : public MachineFunctionPass {
   const TargetRegisterInfo *TRI;
   const SBFInstrInfo *TII;
   const SBFSubtarget *SubTarget;
+  const CodeGenOptLevel OptLevel;
+  const bool DisablePeephole;
 
-  SBFMIPreEmitPeephole() : MachineFunctionPass(ID) {
+  SBFMIPreEmitPeephole(CodeGenOptLevel OptLevel, bool DisablePeephole)
+      : MachineFunctionPass(ID), OptLevel(OptLevel),
+        DisablePeephole(DisablePeephole) {
     initializeSBFMIPreEmitPeepholePass(*PassRegistry::getPassRegistry());
   }
 
@@ -147,15 +151,17 @@ struct SBFMIPreEmitPeephole : public MachineFunctionPass {
 
   // Main entry point for this pass.
   bool runOnMachineFunction(MachineFunction &MF) override {
-    if (skipFunction(MF.getFunction()))
-      return false;
-
     initialize(MF);
 
     bool PeepholeExecuted = false;
     if (SubTarget->getHasStaticSyscalls())
       PeepholeExecuted |= addReturn();
 
+    // We shall not skip adding the return to SBPFv3 functions
+    if (skipFunction(MF.getFunction()) || OptLevel == CodeGenOptLevel::None ||
+        DisablePeephole)
+      return PeepholeExecuted;
+
     PeepholeExecuted |= eliminateRedundantMov();
 
     return PeepholeExecuted;
@@ -194,10 +200,7 @@ bool SBFMIPreEmitPeephole::addReturn() {
 
     MachineInstr &MI = MBB.back();
     unsigned Opcode = MI.getOpcode();
-    if (Opcode == SBF::JAL ||
-        Opcode == SBF::JALX ||
-        Opcode == SBF::JALX_v2 ||
-        Opcode == SBF::SYSCALL_v3) {
+    if (Opcode != SBF::RETURN_v3) {
       BuildMI(&MBB, MI.getDebugLoc(), TII->get(SBF::RETURN_v3));
       Added = true;
     }
@@ -250,9 +253,9 @@ INITIALIZE_PASS(SBFMIPreEmitPeephole, "sbf-mi-pemit-peephole",
                 "SBF PreEmit Peephole Optimization", false, false)
 
 char SBFMIPreEmitPeephole::ID = 0;
-FunctionPass* llvm::createSBFMIPreEmitPeepholePass()
+FunctionPass* llvm::createSBFMIPreEmitPeepholePass(CodeGenOptLevel OptLevel, bool DisablePeephole)
 {
-  return new SBFMIPreEmitPeephole();
+  return new SBFMIPreEmitPeephole(OptLevel, DisablePeephole);
 }
 
 STATISTIC(TruncElemNum, "Number of truncation eliminated");
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 869b6c2b28829..94b8f86fe4c03 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -168,7 +168,5 @@ void SBFPassConfig::addMachineSSAOptimization() {
 
 void SBFPassConfig::addPreEmitPass() {
   addPass(createSBFMIPreEmitCheckingPass());
-  if (getOptLevel() != CodeGenOptLevel::None)
-    if (!DisableMIPeephole)
-      addPass(createSBFMIPreEmitPeepholePass());
+  addPass(createSBFMIPreEmitPeepholePass(getOptLevel(), DisableMIPeephole));
 }
diff --git a/llvm/test/CodeGen/SBF/unreachable_return.ll b/llvm/test/CodeGen/SBF/unreachable_return.ll
index db1ac3f1c1027..c20560fe6f9e0 100644
--- a/llvm/test/CodeGen/SBF/unreachable_return.ll
+++ b/llvm/test/CodeGen/SBF/unreachable_return.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O0 -march=sbf -mcpu=v3 < %s | FileCheck %s
 
 declare void @dummy_func(i8, ptr, ptr, ptr, ptr, ptr, ptr)
 

From 3947707da95f5013f7dc593d53a6b47853779934 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Thu, 5 Jun 2025 17:40:38 -0300
Subject: [PATCH 088/114] [SOL] Remove AdjustOpt pass from SBF (#152)

---
 llvm/lib/Target/SBF/CMakeLists.txt            |   1 -
 llvm/lib/Target/SBF/SBF.h                     |   5 -
 llvm/lib/Target/SBF/SBFAdjustOpt.cpp          | 185 ------------------
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |   4 -
 .../CodeGen/SBF/adjust-opt-speculative1.ll    |  84 --------
 .../CodeGen/SBF/adjust-opt-speculative2.ll    |  93 ---------
 6 files changed, 372 deletions(-)
 delete mode 100644 llvm/lib/Target/SBF/SBFAdjustOpt.cpp
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
 delete mode 100644 llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll

diff --git a/llvm/lib/Target/SBF/CMakeLists.txt b/llvm/lib/Target/SBF/CMakeLists.txt
index 282594e99e618..f7202627b0d2a 100644
--- a/llvm/lib/Target/SBF/CMakeLists.txt
+++ b/llvm/lib/Target/SBF/CMakeLists.txt
@@ -22,7 +22,6 @@ add_llvm_target(SBFCodeGen
   GISel/SBFRegisterBankInfo.cpp
   GISel/SBFLegalizerInfo.cpp
   SBFAbstractMemberAccess.cpp
-  SBFAdjustOpt.cpp
   SBFAsmPrinter.cpp
   SBFCheckAndAdjustIR.cpp
   SBFFrameLowering.cpp
diff --git a/llvm/lib/Target/SBF/SBF.h b/llvm/lib/Target/SBF/SBF.h
index 18426c91bd7b2..8880b1bdd285b 100644
--- a/llvm/lib/Target/SBF/SBF.h
+++ b/llvm/lib/Target/SBF/SBF.h
@@ -68,11 +68,6 @@ class SBFIRPeepholePass : public PassInfoMixin<SBFIRPeepholePass> {
 
   static bool isRequired() { return true; }
 };
-
-class SBFAdjustOptPass : public PassInfoMixin<SBFAdjustOptPass> {
-public:
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
 } // namespace llvm
 
 #endif
diff --git a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp b/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
deleted file mode 100644
index d86fcbb93053f..0000000000000
--- a/llvm/lib/Target/SBF/SBFAdjustOpt.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-//===---------------- SBFAdjustOpt.cpp - Adjust Optimization --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Adjust optimization to make the code more kernel verifier friendly.
-//
-//===----------------------------------------------------------------------===//
-
-#include "SBF.h"
-#include "SBFCORE.h"
-#include "SBFTargetMachine.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/PatternMatch.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/User.h"
-#include "llvm/IR/Value.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-
-#define DEBUG_TYPE "sbf-adjust-opt"
-
-using namespace llvm;
-using namespace llvm::PatternMatch;
-
-static cl::opt<bool> DisableSBFavoidSpeculation(
-    "sbf-disable-avoid-speculation", cl::Hidden,
-    cl::desc("SBF: Disable Avoiding Speculative Code Motion."),
-    cl::init(false));
-
-namespace {
-
-class SBFAdjustOptImpl {
-  struct PassThroughInfo {
-    Instruction *Input;
-    Instruction *UsedInst;
-    uint32_t OpIdx;
-    PassThroughInfo(Instruction *I, Instruction *U, uint32_t Idx)
-        : Input(I), UsedInst(U), OpIdx(Idx) {}
-  };
-
-public:
-  SBFAdjustOptImpl(Module *M) : M(M) {}
-
-  bool run();
-
-private:
-  Module *M;
-  SmallVector<PassThroughInfo, 16> PassThroughs;
-
-  void adjustInst(Instruction &I);
-  bool avoidSpeculation(Instruction &I);
-  bool insertPassThrough();
-};
-
-} // End anonymous namespace
-
-bool SBFAdjustOptImpl::run() {
-  for (Function &F : *M)
-    for (auto &BB : F) {
-      for (auto &I : BB)
-        adjustInst(I);
-    }
-  return insertPassThrough();
-}
-
-bool SBFAdjustOptImpl::insertPassThrough() {
-  for (auto &Info : PassThroughs) {
-    auto *CI = SBFCoreSharedInfo::insertPassThrough(
-        M, Info.UsedInst->getParent(), Info.Input, Info.UsedInst);
-    Info.UsedInst->setOperand(Info.OpIdx, CI);
-  }
-
-  return !PassThroughs.empty();
-}
-
-
-// To avoid speculative hoisting certain computations out of
-// a basic block.
-bool SBFAdjustOptImpl::avoidSpeculation(Instruction &I) {
-  if (auto *LdInst = dyn_cast<LoadInst>(&I)) {
-    if (auto *GV = dyn_cast<GlobalVariable>(LdInst->getOperand(0))) {
-      if (GV->hasAttribute(SBFCoreSharedInfo::AmaAttr) ||
-          GV->hasAttribute(SBFCoreSharedInfo::TypeIdAttr))
-        return false;
-    }
-  }
-
-  if (!isa<LoadInst>(&I) && !isa<CallInst>(&I))
-    return false;
-
-  // For:
-  //   B1:
-  //     var = ...
-  //     ...
-  //     /* icmp may not be in the same block as var = ... */
-  //     comp1 = icmp <opcode> var, <const>;
-  //     if (comp1) goto B2 else B3;
-  //   B2:
-  //     ... var ...
-  // change to:
-  //   B1:
-  //     var = ...
-  //     ...
-  //     /* icmp may not be in the same block as var = ... */
-  //     comp1 = icmp <opcode> var, <const>;
-  //     if (comp1) goto B2 else B3;
-  //   B2:
-  //     var = __builtin_bpf_passthrough(seq_num, var);
-  //     ... var ...
-  bool isCandidate = false;
-  SmallVector<PassThroughInfo, 4> Candidates;
-  for (User *U : I.users()) {
-    Instruction *Inst = dyn_cast<Instruction>(U);
-    if (!Inst)
-      continue;
-
-    // May cover a little bit more than the
-    // above pattern.
-    if (auto *Icmp1 = dyn_cast<ICmpInst>(Inst)) {
-      Value *Icmp1Op1 = Icmp1->getOperand(1);
-      if (!isa<Constant>(Icmp1Op1))
-        return false;
-      isCandidate = true;
-      continue;
-    }
-
-    // Ignore the use in the same basic block as the definition.
-    if (Inst->getParent() == I.getParent())
-      continue;
-
-    // use in a different basic block, If there is a call or
-    // load/store insn before this instruction in this basic
-    // block. Most likely it cannot be hoisted out. Skip it.
-    for (auto &I2 : *Inst->getParent()) {
-      if (isa<CallInst>(&I2))
-        return false;
-      if (isa<LoadInst>(&I2) || isa<StoreInst>(&I2))
-        return false;
-      if (&I2 == Inst)
-        break;
-    }
-
-    // It should be used in a GEP or a simple arithmetic like
-    // ZEXT/SEXT which is used for GEP.
-    if (Inst->getOpcode() == Instruction::ZExt ||
-        Inst->getOpcode() == Instruction::SExt) {
-      PassThroughInfo Info(&I, Inst, 0);
-      Candidates.push_back(Info);
-    } else if (auto *GI = dyn_cast<GetElementPtrInst>(Inst)) {
-      // traverse GEP inst to find Use operand index
-      unsigned i, e;
-      for (i = 1, e = GI->getNumOperands(); i != e; ++i) {
-        Value *V = GI->getOperand(i);
-        if (V == &I)
-          break;
-      }
-      if (i == e)
-        continue;
-
-      PassThroughInfo Info(&I, GI, i);
-      Candidates.push_back(Info);
-    }
-  }
-
-  if (!isCandidate || Candidates.empty())
-    return false;
-
-  llvm::append_range(PassThroughs, Candidates);
-  return true;
-}
-
-void SBFAdjustOptImpl::adjustInst(Instruction &I) {
-  if (!DisableSBFavoidSpeculation && avoidSpeculation(I))
-    return;
-}
-
-PreservedAnalyses SBFAdjustOptPass::run(Module &M, ModuleAnalysisManager &AM) {
-  return SBFAdjustOptImpl(&M).run() ? PreservedAnalyses::none()
-                                    : PreservedAnalyses::all();
-}
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 94b8f86fe4c03..7601727abb720 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -120,10 +120,6 @@ void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
                                     OptimizationLevel Level) {
     FPM.addPass(SimplifyCFGPass(SimplifyCFGOptions().hoistCommonInsts(true)));
   });
-  PB.registerPipelineEarlySimplificationEPCallback(
-      [=](ModulePassManager &MPM, OptimizationLevel) {
-        MPM.addPass(SBFAdjustOptPass());
-      });
 }
 
 void SBFPassConfig::addIRPasses() {
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll b/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
deleted file mode 100644
index 5f3ef42b6dc7e..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-speculative1.ll
+++ /dev/null
@@ -1,84 +0,0 @@
-; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK %s
-; RUN: opt -O2 -mtriple=sbf -sbf-disable-avoid-speculation %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK-DISABLE %s
-;
-; Source:
-;   unsigned long foo();
-;   void *test(void *p) {
-;     unsigned long ret = foo();
-;     if (ret <= 7)
-;       p += ret;
-;     return p;
-;   }
-; Compilation flag:
-;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i8* @test(i8* %p) #0 {
-entry:
-  %p.addr = alloca i8*, align 8
-  %ret = alloca i64, align 8
-  store i8* %p, i8** %p.addr, align 8, !tbaa !2
-  %0 = bitcast i64* %ret to i8*
-  call void @llvm.lifetime.start.p0i8(i64 8, i8* %0) #3
-  %call = call i64 bitcast (i64 (...)* @foo to i64 ()*)()
-  store i64 %call, i64* %ret, align 8, !tbaa !6
-  %1 = load i64, i64* %ret, align 8, !tbaa !6
-  %cmp = icmp ule i64 %1, 7
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  %2 = load i64, i64* %ret, align 8, !tbaa !6
-  %3 = load i8*, i8** %p.addr, align 8, !tbaa !2
-  %add.ptr = getelementptr i8, i8* %3, i64 %2
-  store i8* %add.ptr, i8** %p.addr, align 8, !tbaa !2
-  br label %if.end
-
-if.end:                                           ; preds = %if.then, %entry
-  %4 = load i8*, i8** %p.addr, align 8, !tbaa !2
-  %5 = bitcast i64* %ret to i8*
-  call void @llvm.lifetime.end.p0i8(i64 8, i8* %5) #3
-  ret i8* %4
-}
-; CHECK-COMMON:  mov64 [[REG6:r[0-9]+]], r1
-; CHECK-COMMON:  call foo
-
-; CHECK:         jgt r0, 7, [[LABEL:.*]]
-; CHECK:         add64 [[REG6]], r0
-; CHECK:         [[LABEL]]:
-; CHECK:         mov64 r0, [[REG6]]
-
-; CHECK-DISABLE: mov64 [[REG1:r[0-9]+]], 8
-; CHECK-DISABLE: jgt [[REG1]], r0, [[LABEL:.*]]
-; CHECK-DISABLE: mov64 r0, 0
-; CHECK-DISABLE: [[LABEL]]:
-; CHECK-DISABLE: add64 [[REG6]], r0
-; CHECK-DISABLE: mov64 r0, [[REG6]]
-
-; CHECK-COMMON:  exit
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
-
-declare dso_local i64 @foo(...) #2
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
-
-attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind willreturn }
-attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nounwind }
-
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
-!2 = !{!3, !3, i64 0}
-!3 = !{!"any pointer", !4, i64 0}
-!4 = !{!"omnipotent char", !5, i64 0}
-!5 = !{!"Simple C/C++ TBAA"}
-!6 = !{!7, !7, i64 0}
-!7 = !{!"long", !4, i64 0}
diff --git a/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll b/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
deleted file mode 100644
index 371920a9cf9a9..0000000000000
--- a/llvm/test/CodeGen/SBF/adjust-opt-speculative2.ll
+++ /dev/null
@@ -1,93 +0,0 @@
-; RUN: opt -O2 -mtriple=sbf %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK %s
-; RUN: opt -O2 -mtriple=sbf -sbf-disable-avoid-speculation %s | llvm-dis > %t1
-; RUN: llc %t1 -o - | FileCheck -check-prefixes=CHECK-COMMON,CHECK-DISABLE %s
-;
-; Source:
-;   unsigned foo();
-;   void *test(void *p) {
-;     unsigned ret = foo();
-;     if (ret <= 7)
-;       p += ret;
-;     return p;
-;   }
-; Compilation flag:
-;   clang -target sbf -O2 -S -emit-llvm -Xclang -disable-llvm-passes test.c
-
-; Function Attrs: nounwind
-define dso_local i8* @test(i8* %p) #0 {
-entry:
-  %p.addr = alloca i8*, align 8
-  %ret = alloca i32, align 4
-  store i8* %p, i8** %p.addr, align 8, !tbaa !2
-  %0 = bitcast i32* %ret to i8*
-  call void @llvm.lifetime.start.p0i8(i64 4, i8* %0) #3
-  %call = call i32 bitcast (i32 (...)* @foo to i32 ()*)()
-  store i32 %call, i32* %ret, align 4, !tbaa !6
-  %1 = load i32, i32* %ret, align 4, !tbaa !6
-  %cmp = icmp ule i32 %1, 7
-  br i1 %cmp, label %if.then, label %if.end
-
-if.then:                                          ; preds = %entry
-  %2 = load i32, i32* %ret, align 4, !tbaa !6
-  %3 = load i8*, i8** %p.addr, align 8, !tbaa !2
-  %idx.ext = zext i32 %2 to i64
-  %add.ptr = getelementptr i8, i8* %3, i64 %idx.ext
-  store i8* %add.ptr, i8** %p.addr, align 8, !tbaa !2
-  br label %if.end
-
-if.end:                                           ; preds = %if.then, %entry
-  %4 = load i8*, i8** %p.addr, align 8, !tbaa !2
-  %5 = bitcast i32* %ret to i8*
-  call void @llvm.lifetime.end.p0i8(i64 4, i8* %5) #3
-  ret i8* %4
-}
-
-; CHECK-COMMON:  mov64 [[REG6:r[0-9]+]], r1
-; CHECK-COMMON:  call foo
-
-; CHECK:         lsh64 r0, 32
-; CHECK:         rsh64 r0, 32
-; CHECK:         jgt r0, 7, [[LABEL:.*]]
-; CHECK:         add64 [[REG6]], r0
-; CHECK:         [[LABEL]]:
-; CHECK:         mov64 r0, [[REG6]]
-
-; CHECK-DISABLE: mov64 [[REG1:r[0-9]+]], r0
-; CHECK-DISABLE: lsh64 [[REG1]], 32
-; CHECK-DISABLE: rsh64 [[REG1]], 32
-; CHECK-DISABLE: mov64 [[REG2:r[0-9]+]], 8
-; CHECK-DISABLE: jgt [[REG2]], [[REG1]], [[LABEL:.*]]
-; CHECK-DISABLE: mov64 r0, 0
-; CHECK-DISABLE: [[LABEL]]:
-; CHECK-DISABLE: lsh64 r0, 32
-; CHECK-DISABLE: rsh64 r0, 32
-; CHECK-DISABLE: add64 [[REG6]], r0
-; CHECK-DISABLE: mov64 r0, [[REG6]]
-
-; CHECK-COMMON:  exit
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #1
-
-declare dso_local i32 @foo(...) #2
-
-; Function Attrs: argmemonly nounwind willreturn
-declare void @llvm.lifetime.end.p0i8(i64 immarg, i8* nocapture) #1
-
-attributes #0 = { nounwind "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind willreturn }
-attributes #2 = { "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nounwind }
-
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git ca9c5433a6c31e372092fcd8bfd0e4fddd7e8784)"}
-!2 = !{!3, !3, i64 0}
-!3 = !{!"any pointer", !4, i64 0}
-!4 = !{!"omnipotent char", !5, i64 0}
-!5 = !{!"Simple C/C++ TBAA"}
-!6 = !{!7, !7, i64 0}
-!7 = !{!"int", !4, i64 0}

From d85073eb89ab680f292681dbc4e54423ab5cb1c8 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 9 Jun 2025 10:36:51 -0300
Subject: [PATCH 089/114] [SOL] Run simplifyswitch pass for SBF (#153)

---
 llvm/lib/Target/SBF/SBFTargetMachine.cpp     |  4 +-
 llvm/lib/Target/SBF/SBFTargetTransformInfo.h | 10 ++++
 llvm/test/CodeGen/SBF/simplify_switch.ll     | 60 ++++++++++++++++++++
 llvm/test/CodeGen/SBF/simplify_switch_2.ll   | 48 ++++++++++++++++
 4 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/CodeGen/SBF/simplify_switch.ll
 create mode 100644 llvm/test/CodeGen/SBF/simplify_switch_2.ll

diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index 7601727abb720..baf1b81670081 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -118,7 +118,9 @@ void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
       });
   PB.registerPeepholeEPCallback([=](FunctionPassManager &FPM,
                                     OptimizationLevel Level) {
-    FPM.addPass(SimplifyCFGPass(SimplifyCFGOptions().hoistCommonInsts(true)));
+    FPM.addPass(SimplifyCFGPass(
+        SimplifyCFGOptions().hoistCommonInsts(true).convertSwitchToLookupTable(
+            true)));
   });
 }
 
diff --git a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
index 941e57fc2ccdf..ac24034444a1b 100644
--- a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
+++ b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
@@ -44,6 +44,16 @@ class SBFTTIImpl : public BasicTTIImplBase<SBFTTIImpl> {
     return TTI::TCC_Basic;
   }
 
+  bool shouldBuildLookupTables() const {
+    return true;
+  }
+
+  bool shouldBuildRelLookupTables() const {
+    // Relational lookup tables are not working for SBF, since the offset
+    // calculation is not implemented.
+    return false;
+  }
+
   InstructionCost getCmpSelInstrCost(unsigned Opcode, Type *ValTy, Type *CondTy,
                                      CmpInst::Predicate VecPred,
                                      TTI::TargetCostKind CostKind,
diff --git a/llvm/test/CodeGen/SBF/simplify_switch.ll b/llvm/test/CodeGen/SBF/simplify_switch.ll
new file mode 100644
index 0000000000000..0363fc7a220ff
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/simplify_switch.ll
@@ -0,0 +1,60 @@
+; RUN: opt -march=sbf -O2 -S < %s | FileCheck %s
+
+target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+
+@alloc_a095982df5ef6fa38482490385e9df9c = private unnamed_addr constant <{ [11 x i8] }> <{ [11 x i8] c"Invalid num" }>, align 1
+@alloc_a85d045283da191190505c6c52c35e47 = private unnamed_addr constant <{ ptr, [8 x i8] }> <{ ptr @alloc_a095982df5ef6fa38482490385e9df9c, [8 x i8] c"\0B\00\00\00\00\00\00\00" }>, align 8
+@alloc_f5ffd2fd1476bab43ad89fb40c72d0c5 = private unnamed_addr constant <{ [10 x i8] }> <{ [10 x i8] c"src/lib.rs" }>, align 1
+@alloc_2c31b023ec05614e5709d58aa57c990b = private unnamed_addr constant <{ ptr, [16 x i8] }> <{ ptr @alloc_f5ffd2fd1476bab43ad89fb40c72d0c5, [16 x i8] c"\0A\00\00\00\00\00\00\00\0E\00\00\00\12\00\00\00" }>, align 8
+
+@do_that = unnamed_addr alias i8 (i64), ptr @"_ZN68_$LT$rust_test..MyEnum$u20$as$u20$core..convert..From$LT$u64$GT$$GT$4from17hd15e70d09a9b53c5E"
+
+; <rust_test::MyEnum as core::convert::From<u64>>::from
+; Function Attrs: nounwind
+define hidden noundef range(i8 0, 3) i8 @"_ZN68_$LT$rust_test..MyEnum$u20$as$u20$core..convert..From$LT$u64$GT$$GT$4from17hd15e70d09a9b53c5E"(i64 noundef %num) unnamed_addr {
+start:
+  %_3 = alloca [48 x i8], align 8
+  switch i64 %num, label %bb1 [
+    i64 1, label %bb5
+    i64 2, label %bb3
+    i64 3, label %bb2
+  ]
+
+; Verifies we are simplifying the switch. In this case, we should expect the index to be '%num - 1'
+; CHECK-NOT: switch i64 %num
+; CHECK: %switch.tableidx = add i64 %num, -1
+; CHECK: %0 = icmp ult i64 %switch.tableidx, 3
+; CHECK: br i1 %0, label %switch.lookup, label %bb1
+
+bb1:                                              ; preds = %start
+  call void @llvm.lifetime.start.p0(i64 48, ptr nonnull %_3)
+  store ptr @alloc_a85d045283da191190505c6c52c35e47, ptr %_3, align 8
+  %0 = getelementptr inbounds i8, ptr %_3, i64 8
+  store i64 1, ptr %0, align 8
+  %1 = getelementptr inbounds i8, ptr %_3, i64 32
+  store ptr null, ptr %1, align 8
+  %2 = getelementptr inbounds i8, ptr %_3, i64 16
+  store ptr inttoptr (i64 8 to ptr), ptr %2, align 8
+  %3 = getelementptr inbounds i8, ptr %_3, i64 24
+  store i64 0, ptr %3, align 8
+; call core::panicking::panic_fmt
+  call void @_ZN4core9panicking9panic_fmt17ha4a6c4ba8141afc1E(ptr noalias nocapture noundef nonnull readonly align 8 dereferenceable(48) %_3, ptr noalias noundef nonnull readonly align 8 dereferenceable(24) @alloc_2c31b023ec05614e5709d58aa57c990b)
+  unreachable
+
+bb3:                                              ; preds = %start
+  br label %bb5
+
+bb2:                                              ; preds = %start
+  br label %bb5
+
+bb5:                                              ; preds = %start, %bb2, %bb3
+  %_0.sroa.0.0 = phi i8 [ 2, %bb2 ], [ 1, %bb3 ], [ 0, %start ]
+  ret i8 %_0.sroa.0.0
+}
+
+; core::panicking::panic_fmt
+; Function Attrs: cold noinline noreturn nounwind
+declare void @_ZN4core9panicking9panic_fmt17ha4a6c4ba8141afc1E(ptr noalias nocapture noundef readonly align 8 dereferenceable(48), ptr noalias noundef readonly align 8 dereferenceable(24)) unnamed_addr
+
+; Function Attrs: mustprogress nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
+declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture)
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SBF/simplify_switch_2.ll b/llvm/test/CodeGen/SBF/simplify_switch_2.ll
new file mode 100644
index 0000000000000..40cba6bcf7ae5
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/simplify_switch_2.ll
@@ -0,0 +1,48 @@
+; RUN: opt -O2 -S < %s | FileCheck %s
+
+; ModuleID = 'rust_test.ae01a02caa2566bf-cgu.0'
+source_filename = "rust_test.ae01a02caa2566bf-cgu.0"
+target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+target triple = "sbf"
+
+@alloc_e813fda33c33e38665803c55f01a1a57 = private unnamed_addr constant <{ [3 x i8] }> <{ [3 x i8] c"One" }>, align 1
+@alloc_da1d77dfe6c47b0702ad778dd22ebff8 = private unnamed_addr constant <{ [3 x i8] }> <{ [3 x i8] c"Two" }>, align 1
+@alloc_460442126579dd15a4cc4f66a722a171 = private unnamed_addr constant <{ [5 x i8] }> <{ [5 x i8] c"Three" }>, align 1
+
+; We do not want the relative lookup table to be here
+; CHECK-NOT: private unnamed_addr constant [3 x i32] [i32 trunc (i64 sub (i64 ptrtoint
+; CHECK: private unnamed_addr constant [3 x ptr]
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+define { ptr, i64 } @do_this(i8 noundef range(i8 0, 3) %0) unnamed_addr #0 {
+start:
+  switch i8 %0, label %default.unreachable [
+    i8 0, label %bb1
+    i8 1, label %bb4
+    i8 2, label %bb3
+  ]
+
+default.unreachable:                              ; preds = %start
+  unreachable
+
+bb4:                                              ; preds = %start
+  br label %bb1
+
+bb3:                                              ; preds = %start
+  br label %bb1
+
+bb1:                                              ; preds = %start, %bb3, %bb4
+  %_0.sroa.0.0 = phi ptr [ @alloc_460442126579dd15a4cc4f66a722a171, %bb3 ], [ @alloc_da1d77dfe6c47b0702ad778dd22ebff8, %bb4 ], [ @alloc_e813fda33c33e38665803c55f01a1a57, %start ]
+  %_0.sroa.4.0 = phi i64 [ 5, %bb3 ], [ 3, %bb4 ], [ 3, %start ]
+  %1 = insertvalue { ptr, i64 } poison, ptr %_0.sroa.0.0, 0
+  %2 = insertvalue { ptr, i64 } %1, i64 %_0.sroa.4.0, 1
+  ret { ptr, i64 } %2
+}
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn memory(none) "target-cpu"="generic" "target-features"="+store-imm,+jmp-ext" }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 8, !"PIC Level", i32 2}
+!1 = !{!"rustc version 1.84.1-dev"}

From 83cbab20e88c740ecb429d1b9dad67054a6a09ff Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 18 Jun 2025 16:00:41 -0300
Subject: [PATCH 090/114] [SOL] Allow branch folding to run in SBF (#154)

* Implement analysis functions

* Add test and fix others
---
 llvm/lib/Target/SBF/SBFInstrInfo.cpp       | 321 +++++++++++++++++----
 llvm/lib/Target/SBF/SBFInstrInfo.h         |   7 +
 llvm/test/CodeGen/SBF/branch_fold.ll       |  82 ++++++
 llvm/test/CodeGen/SBF/cmp.ll               |   4 +-
 llvm/test/CodeGen/SBF/cttz-ctlz.ll         |  40 ++-
 llvm/test/CodeGen/SBF/remove_truncate_2.ll |   4 +-
 llvm/test/CodeGen/SBF/select_ri.ll         |   2 +-
 7 files changed, 381 insertions(+), 79 deletions(-)
 create mode 100644 llvm/test/CodeGen/SBF/branch_fold.ll

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index 7c70e6680d2cc..054451253d852 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -18,13 +18,50 @@
 #include "llvm/IR/DebugLoc.h"
 #include "llvm/Support/ErrorHandling.h"
 #include <cassert>
-#include <iterator>
 
 #define GET_INSTRINFO_CTOR_DTOR
 #include "SBFGenInstrInfo.inc"
 
 using namespace llvm;
 
+static inline bool isUncondBranchOpcode(int Opc) { return Opc == SBF::JMP; }
+
+static inline bool isCondBranchOpcode(int Opc) {
+  switch (Opc) {
+  case SBF::JEQ_ri:
+  case SBF::JEQ_rr:
+  case SBF::JUGT_ri:
+  case SBF::JUGT_rr:
+  case SBF::JUGE_ri:
+  case SBF::JUGE_rr:
+  case SBF::JNE_ri:
+  case SBF::JNE_rr:
+  case SBF::JSGT_ri:
+  case SBF::JSGT_rr:
+  case SBF::JSGE_ri:
+  case SBF::JSGE_rr:
+  case SBF::JULT_ri:
+  case SBF::JULT_rr:
+  case SBF::JULE_ri:
+  case SBF::JULE_rr:
+  case SBF::JSLT_ri:
+  case SBF::JSLT_rr:
+  case SBF::JSLE_ri:
+  case SBF::JSLE_rr:
+    return true;
+  default:
+    return false;
+  }
+}
+
+static void parseCondBranch(MachineInstr *LastInst, MachineBasicBlock *&Target,
+                            SmallVectorImpl<MachineOperand> &Cond) {
+  Cond.push_back(MachineOperand::CreateImm(LastInst->getOpcode()));
+  Cond.push_back(LastInst->getOperand(0));
+  Cond.push_back(LastInst->getOperand(1));
+  Target = LastInst->getOperand(2).getMBB();
+}
+
 SBFInstrInfo::SBFInstrInfo()
     : SBFGenInstrInfo(SBF::ADJCALLSTACKDOWN, SBF::ADJCALLSTACKUP) {}
 
@@ -104,66 +141,115 @@ bool SBFInstrInfo::analyzeBranch(MachineBasicBlock &MBB,
                                  MachineBasicBlock *&FBB,
                                  SmallVectorImpl<MachineOperand> &Cond,
                                  bool AllowModify) const {
-  // Start from the bottom of the block and work up, examining the
-  // terminator instructions.
-  MachineBasicBlock::iterator I = MBB.end();
-  while (I != MBB.begin()) {
-    --I;
-    if (I->isDebugInstr())
-      continue;
-
-    // Working from the bottom, when we see a non-terminator
-    // instruction, we're done.
-    if (!isUnpredicatedTerminator(*I))
-      break;
-
-    // A terminator that isn't a branch can't easily be handled
-    // by this analysis.
-    if (!I->isBranch())
-      return true;
-
-    // Handle unconditional branches.
-    if (I->getOpcode() == SBF::JMP) {
-      if (!AllowModify) {
-        TBB = I->getOperand(0).getMBB();
-        continue;
-      }
+  // If the block has no terminators, it just falls into the block after it.
+  MachineBasicBlock::iterator I = MBB.getLastNonDebugInstr();
+  if (I == MBB.end())
+    return false;
+
+  if (!isUnpredicatedTerminator(*I))
+    return false;
+
+  // Get the last instruction in the block.
+  MachineInstr *LastInst = &*I;
+
+  // If there is only one terminator instruction, process it.
+  unsigned LastOpc = LastInst->getOpcode();
+  if (I == MBB.begin() || !isUnpredicatedTerminator(*--I)) {
+    if (isUncondBranchOpcode(LastOpc)) {
+      TBB = LastInst->getOperand(0).getMBB();
+      return false;
+    }
+    if (isCondBranchOpcode(LastOpc)) {
+      // Block ends with fall-through condbranch.
+      parseCondBranch(LastInst, TBB, Cond);
+      return false;
+    }
+    return true; // Unknown case
+  }
+
+  // Get the instruction before it if it is a terminator.
+  MachineInstr *SecondLastInst = &*I;
+  unsigned SecondLastOpc = SecondLastInst->getOpcode();
 
-      // If the block has any instructions after a J, delete them.
-      MBB.erase(std::next(I), MBB.end());
-      Cond.clear();
-      FBB = nullptr;
-
-      // Delete the J if it's equivalent to a fall-through.
-      if (MBB.isLayoutSuccessor(I->getOperand(0).getMBB())) {
-        TBB = nullptr;
-        I->eraseFromParent();
-        I = MBB.end();
-        continue;
+  // If AllowModify is true and the block ends with two or more unconditional
+  // branches, delete all but the first unconditional branch.
+  if (AllowModify && isUncondBranchOpcode(LastOpc)) {
+    while (isUncondBranchOpcode(SecondLastOpc)) {
+      LastInst->eraseFromParent();
+      LastInst = SecondLastInst;
+      LastOpc = LastInst->getOpcode();
+      if (I == MBB.begin() || !isUnpredicatedTerminator(*--I)) {
+        // Return now the only terminator is an unconditional branch.
+        TBB = LastInst->getOperand(0).getMBB();
+        return false;
       }
+      SecondLastInst = &*I;
+      SecondLastOpc = SecondLastInst->getOpcode();
+    }
+  }
 
-      // TBB is used to indicate the unconditinal destination.
-      TBB = I->getOperand(0).getMBB();
-      continue;
+  // If we're allowed to modify and the block ends in a unconditional branch
+  // which could simply fallthrough, remove the branch.  (Note: This case only
+  // matters when we can't understand the whole sequence, otherwise it's also
+  // handled by BranchFolding.cpp.)
+  if (AllowModify && isUncondBranchOpcode(LastOpc) &&
+      MBB.isLayoutSuccessor(getBranchDestBlock(*LastInst))) {
+    LastInst->eraseFromParent();
+    LastInst = SecondLastInst;
+    LastOpc = LastInst->getOpcode();
+    if (I == MBB.begin() || !isUnpredicatedTerminator(*--I)) {
+      assert(!isUncondBranchOpcode(LastOpc) &&
+             "unreachable unconditional branches removed above");
+
+      if (isCondBranchOpcode(LastOpc)) {
+        // Block ends with fall-through condbranch.
+        parseCondBranch(LastInst, TBB, Cond);
+        return false;
+      }
+      return true; // Can't handle indirect branch.
     }
-    // Cannot handle conditional branches
+    SecondLastInst = &*I;
+    SecondLastOpc = SecondLastInst->getOpcode();
+  }
+
+  // If there are three terminators, we don't know what sort of block this is.
+  if (SecondLastInst && I != MBB.begin() && isUnpredicatedTerminator(*--I))
     return true;
+
+  // If the block ends with a conditional jump and a JA, handle it.
+  if (isCondBranchOpcode(SecondLastOpc) && isUncondBranchOpcode(LastOpc)) {
+    parseCondBranch(SecondLastInst, TBB, Cond);
+    FBB = LastInst->getOperand(0).getMBB();
+    return false;
   }
 
-  return false;
+  // If the block ends with two unconditional branches, handle it.  The second
+  // one is not executed, so remove it.
+  if (isUncondBranchOpcode(SecondLastOpc) && isUncondBranchOpcode(LastOpc)) {
+    TBB = SecondLastInst->getOperand(0).getMBB();
+    I = LastInst;
+    if (AllowModify)
+      I->eraseFromParent();
+    return false;
+  }
+
+  // Otherwise, can't handle this.
+  return true;
 }
 
 unsigned SBFInstrInfo::insertBranch(MachineBasicBlock &MBB,
                                     MachineBasicBlock *TBB,
                                     MachineBasicBlock *FBB,
                                     ArrayRef<MachineOperand> Cond,
-                                    const DebugLoc &DL,
-                                    int *BytesAdded) const {
+                                    const DebugLoc &DL, int *BytesAdded) const {
   assert(!BytesAdded && "code size not handled");
 
   // Shouldn't be a fall through.
   assert(TBB && "insertBranch must not be told to insert a fallthrough");
 
+  if (BytesAdded)
+    *BytesAdded = 8;
+
   if (Cond.empty()) {
     // Unconditional branch
     assert(!FBB && "Unconditional branch with multiple successors!");
@@ -171,27 +257,146 @@ unsigned SBFInstrInfo::insertBranch(MachineBasicBlock &MBB,
     return 1;
   }
 
-  llvm_unreachable("Unexpected conditional branch");
+  // See the order we parse the jump information in `parseCondBranch`
+  BuildMI(&MBB, DL, get(Cond[0].getImm()))
+      .add(Cond[1])
+      .add(Cond[2])
+      .addMBB(TBB);
+
+  if (FBB) {
+    BuildMI(&MBB, DL, get(SBF::JMP)).addMBB(FBB);
+    if (BytesAdded)
+      *BytesAdded += 8;
+  }
+
+  return 1;
 }
 
 unsigned SBFInstrInfo::removeBranch(MachineBasicBlock &MBB,
                                     int *BytesRemoved) const {
   assert(!BytesRemoved && "code size not handled");
 
-  MachineBasicBlock::iterator I = MBB.end();
-  unsigned Count = 0;
-
-  while (I != MBB.begin()) {
-    --I;
-    if (I->isDebugInstr())
-      continue;
-    if (I->getOpcode() != SBF::JMP)
-      break;
-    // Remove the branch.
-    I->eraseFromParent();
-    I = MBB.end();
-    ++Count;
+  MachineBasicBlock::iterator I = MBB.getLastNonDebugInstr();
+  if (I == MBB.end())
+    return 0;
+
+  if (!isUncondBranchOpcode(I->getOpcode()) &&
+      !isCondBranchOpcode(I->getOpcode()))
+    return 0;
+
+  // Remove the branch.
+  I->eraseFromParent();
+
+  I = MBB.end();
+
+  if (I == MBB.begin()) {
+    if (BytesRemoved)
+      *BytesRemoved = 8;
+    return 1;
+  }
+
+  --I;
+  if (!isCondBranchOpcode(I->getOpcode())) {
+    if (BytesRemoved)
+      *BytesRemoved = 8;
+    return 1;
+  }
+
+  // Remove the branch.
+  I->eraseFromParent();
+  if (BytesRemoved)
+    *BytesRemoved = 16;
+
+  return 2;
+}
+
+bool SBFInstrInfo::reverseBranchCondition(
+    SmallVectorImpl<MachineOperand> &Cond) const {
+  switch (Cond[0].getImm()) {
+  default:
+    llvm_unreachable("Unknown conditional branch!");
+  case SBF::JEQ_ri:
+    Cond[0].setImm(SBF::JNE_ri);
+    break;
+  case SBF::JEQ_rr:
+    Cond[0].setImm(SBF::JNE_rr);
+    break;
+  case SBF::JUGT_ri:
+    Cond[0].setImm(SBF::JULE_ri);
+    break;
+  case SBF::JUGT_rr:
+    Cond[0].setImm(SBF::JULE_rr);
+    break;
+  case SBF::JUGE_ri:
+    Cond[0].setImm(SBF::JULT_ri);
+    break;
+  case SBF::JUGE_rr:
+    Cond[0].setImm(SBF::JULT_rr);
+    break;
+  case SBF::JNE_ri:
+    Cond[0].setImm(SBF::JEQ_ri);
+    break;
+  case SBF::JNE_rr:
+    Cond[0].setImm(SBF::JEQ_rr);
+    break;
+  case SBF::JSGT_ri:
+    Cond[0].setImm(SBF::JSLE_ri);
+    break;
+  case SBF::JSGT_rr:
+    Cond[0].setImm(SBF::JSLE_rr);
+    break;
+  case SBF::JSGE_ri:
+    Cond[0].setImm(SBF::JSLT_ri);
+    break;
+  case SBF::JSGE_rr:
+    Cond[0].setImm(SBF::JSLT_rr);
+    break;
+  case SBF::JULT_ri:
+    Cond[0].setImm(SBF::JUGE_ri);
+    break;
+  case SBF::JULT_rr:
+    Cond[0].setImm(SBF::JUGE_rr);
+    break;
+  case SBF::JULE_ri:
+    Cond[0].setImm(SBF::JUGT_ri);
+    break;
+  case SBF::JULE_rr:
+    Cond[0].setImm(SBF::JUGT_rr);
+    break;
+  case SBF::JSLT_ri:
+    Cond[0].setImm(SBF::JSGE_ri);
+    break;
+  case SBF::JSLT_rr:
+    Cond[0].setImm(SBF::JSGE_rr);
+    break;
+  case SBF::JSLE_ri:
+    Cond[0].setImm(SBF::JSGT_ri);
+    break;
+  case SBF::JSLE_rr:
+    Cond[0].setImm(SBF::JSGT_rr);
+    break;
   }
 
-  return Count;
+  return false;
+}
+
+MachineBasicBlock *
+SBFInstrInfo::getBranchDestBlock(const MachineInstr &MI) const {
+  unsigned Opcode = MI.getOpcode();
+  if (Opcode == SBF::JMP) {
+    return MI.getOperand(0).getMBB();
+  }
+
+  if (isCondBranchOpcode(Opcode)) {
+    return MI.getOperand(2).getMBB();
+  }
+
+  llvm_unreachable("unexpected opcode!");
+}
+
+unsigned SBFInstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
+  if (MI.getOpcode() == SBF::LD_imm64)
+    return 16;
+
+  return 8;
 }
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index 76163e7e828a2..dc4ad6802ca1c 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -58,6 +58,13 @@ class SBFInstrInfo : public SBFGenInstrInfo {
                         int *BytesAdded = nullptr) const override;
   void initializeTargetFeatures(bool HasExplicitSext, bool NewMemEncoding);
 
+  bool
+  reverseBranchCondition(SmallVectorImpl<MachineOperand> &Cond) const override;
+
+  MachineBasicBlock *getBranchDestBlock(const MachineInstr &MI) const override;
+
+  unsigned getInstSizeInBytes(const MachineInstr &MI) const override;
+
 private:
   bool HasExplicitSignExt;
   bool NewMemEncoding;
diff --git a/llvm/test/CodeGen/SBF/branch_fold.ll b/llvm/test/CodeGen/SBF/branch_fold.ll
new file mode 100644
index 0000000000000..d561c8020f649
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/branch_fold.ll
@@ -0,0 +1,82 @@
+; RUN: llc -march=sbf -O3 < %s | FileCheck %s
+
+; ModuleID = 'pinocchio.2fd090a2518ac939-cgu.0'
+source_filename = "pinocchio.2fd090a2518ac939-cgu.0"
+target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
+target triple = "sbf"
+
+
+; Function Attrs: nofree noinline norecurse nosync nounwind memory(readwrite, inaccessiblemem: none)
+define void @deserialize(ptr dead_on_unwind noalias nocapture noundef writable writeonly sret([24 x i8]) align 8 dereferenceable(24) %_0, ptr noundef %0, ptr noundef %1) unnamed_addr {
+start:
+  %_4 = load i64, ptr %0, align 8
+  %_7 = getelementptr inbounds i8, ptr %0, i64 8
+  %_9.not = icmp eq i64 %_4, 0
+  br i1 %_9.not, label %bb8, label %bb1
+
+bb1:                                              ; preds = %start
+  store ptr %_7, ptr %1, align 8
+  %_16 = getelementptr inbounds i8, ptr %0, i64 10344
+  %2 = getelementptr inbounds i8, ptr %0, i64 88
+  %_21 = load i64, ptr %2, align 8
+  %_18 = getelementptr inbounds i8, ptr %_16, i64 %_21
+  %_24 = ptrtoint ptr %_18 to i64
+  %_23 = add i64 %_24, 7
+  %_22 = and i64 %_23, -8
+  %3 = inttoptr i64 %_22 to ptr
+  %to_process.sroa.0.05 = add i64 %_4, -1
+  %_26.not6 = icmp eq i64 %to_process.sroa.0.05, 0
+  br i1 %_26.not6, label %bb8, label %bb3
+
+bb8:                                              ; preds = %bb2.backedge, %bb1, %start
+  %input.sroa.0.0 = phi ptr [ %_7, %start ], [ %3, %bb1 ], [ %input.sroa.0.1.be, %bb2.backedge ]
+  %_55 = load i64, ptr %input.sroa.0.0, align 8
+  %_58 = getelementptr inbounds i8, ptr %input.sroa.0.0, i64 8
+  %_65 = getelementptr inbounds i8, ptr %_58, i64 %_55
+  store ptr %_65, ptr %_0, align 8
+  %4 = getelementptr inbounds i8, ptr %_0, i64 8
+  store ptr %_58, ptr %4, align 8
+  %5 = getelementptr inbounds i8, ptr %_0, i64 16
+  store i64 %_55, ptr %5, align 8
+  ret void
+
+; CHECK: LBB0_4:
+; CHECK-NOT: jeq r4, 0, LBB0_7
+; CHECK-NOT: ja LBB0_3
+; CHECK: jne r4, 0, LBB0_4
+
+bb3:                                              ; preds = %bb1, %bb2.backedge
+  %to_process.sroa.0.09 = phi i64 [ %to_process.sroa.0.0, %bb2.backedge ], [ %to_process.sroa.0.05, %bb1 ]
+  %input.sroa.0.18 = phi ptr [ %input.sroa.0.1.be, %bb2.backedge ], [ %3, %bb1 ]
+  %accounts.sroa.0.07 = phi ptr [ %_28, %bb2.backedge ], [ %1, %bb1 ]
+  %_28 = getelementptr inbounds i8, ptr %accounts.sroa.0.07, i64 8
+  %_35 = load i8, ptr %input.sroa.0.18, align 8
+  %_34.not = icmp eq i8 %_35, -1
+  br i1 %_34.not, label %bb5, label %bb4
+
+bb5:                                              ; preds = %bb3
+  store ptr %input.sroa.0.18, ptr %_28, align 8
+  %_44 = getelementptr inbounds i8, ptr %input.sroa.0.18, i64 10336
+  %6 = getelementptr inbounds i8, ptr %input.sroa.0.18, i64 80
+  %_49 = load i64, ptr %6, align 8
+  %_46 = getelementptr inbounds i8, ptr %_44, i64 %_49
+  %_52 = ptrtoint ptr %_46 to i64
+  %_51 = add i64 %_52, 7
+  %_50 = and i64 %_51, -8
+  %7 = inttoptr i64 %_50 to ptr
+  br label %bb2.backedge
+
+bb2.backedge:                                     ; preds = %bb5, %bb4
+  %input.sroa.0.1.be = phi ptr [ %_32, %bb4 ], [ %7, %bb5 ]
+  %to_process.sroa.0.0 = add i64 %to_process.sroa.0.09, -1
+  %_26.not = icmp eq i64 %to_process.sroa.0.0, 0
+  br i1 %_26.not, label %bb8, label %bb3
+
+bb4:                                              ; preds = %bb3
+  %_32 = getelementptr inbounds i8, ptr %input.sroa.0.18, i64 8
+  %_40 = zext i8 %_35 to i64
+  %_39 = getelementptr inbounds ptr, ptr %1, i64 %_40
+  store ptr %_39, ptr %_28, align 8
+  br label %bb2.backedge
+}
+
diff --git a/llvm/test/CodeGen/SBF/cmp.ll b/llvm/test/CodeGen/SBF/cmp.ll
index 328ba1d7b3184..7deb32aea1c44 100644
--- a/llvm/test/CodeGen/SBF/cmp.ll
+++ b/llvm/test/CodeGen/SBF/cmp.ll
@@ -37,7 +37,7 @@ define signext i8 @foo_cmp2(i8 signext %a, i8 signext %b) #0 {
   %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
   ret i8 %.0
 ; CHECK-LABEL:foo_cmp2:
-; CHECK: jsgt r0, r1
+; CHECK: jsle r0, r1
 }
 
 ; Function Attrs: nounwind readnone uwtable
@@ -77,7 +77,7 @@ define signext i8 @foo_cmp4(i8 signext %a, i8 signext %b) #0 {
   %.0 = phi i8 [ %3, %2 ], [ %5, %4 ]
   ret i8 %.0
 ; CHECK-LABEL:foo_cmp4:
-; CHECK: jsgt r1, r0
+; CHECK: jsle r1, r0
 }
 
 ; Function Attrs: nounwind readnone uwtable
diff --git a/llvm/test/CodeGen/SBF/cttz-ctlz.ll b/llvm/test/CodeGen/SBF/cttz-ctlz.ll
index fd0bb7971bb4d..89c089e0f2b0e 100644
--- a/llvm/test/CodeGen/SBF/cttz-ctlz.ll
+++ b/llvm/test/CodeGen/SBF/cttz-ctlz.ll
@@ -27,12 +27,11 @@ define i32 @cttz_i32_zdef(i32 %a) {
 define i32 @cttz_i32(i32 %a) {
 ; CHECK-LABEL: cttz_i32:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    mov64 r0, 32
 ; CHECK-NEXT:    mov64 r2, r1
 ; CHECK-NEXT:    lsh64 r2, 32
 ; CHECK-NEXT:    rsh64 r2, 32
-; CHECK-NEXT:    jeq r2, 0, LBB1_2
-; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    jeq r2, 0, LBB1_1
+; CHECK-NEXT:  # %bb.2: # %cond.false
 ; CHECK-NEXT:    mov64 r2, r1
 ; CHECK-NEXT:    neg64 r2
 ; CHECK-NEXT:    and64 r1, r2
@@ -43,7 +42,10 @@ define i32 @cttz_i32(i32 %a) {
 ; CHECK-NEXT:    lddw r2, {{\.?LCPI[0-9]+_[0-9]+}}
 ; CHECK-NEXT:    add64 r2, r1
 ; CHECK-NEXT:    ldxb r0, [r2 + 0]
-; CHECK-NEXT:  LBB1_2: # %cond.end
+; CHECK-NEXT:    ja LBB1_3
+; CHECK-NEXT:  LBB1_1:
+; CHECK-NEXT:    mov64 r0, 32
+; CHECK-NEXT:  LBB1_3: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i32 @llvm.cttz.i32(i32 %a, i1 0)
     ret i32 %ret
@@ -72,9 +74,8 @@ define i64 @cttz_i64_zdef(i64 %a) {
 define i64 @cttz_i64(i64 %a) {
 ; CHECK-LABEL: cttz_i64:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    mov64 r0, 64
-; CHECK-NEXT:    jeq r1, 0, LBB3_2
-; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    jeq r1, 0, LBB3_1
+; CHECK-NEXT:  # %bb.2: # %cond.false
 ; CHECK-NEXT:    mov64 r2, r1
 ; CHECK-NEXT:    neg64 r2
 ; CHECK-NEXT:    and64 r1, r2
@@ -84,7 +85,10 @@ define i64 @cttz_i64(i64 %a) {
 ; CHECK-NEXT:    lddw r2, {{\.?LCPI[0-9]+_[0-9]+}}
 ; CHECK-NEXT:    add64 r2, r1
 ; CHECK-NEXT:    ldxb r0, [r2 + 0]
-; CHECK-NEXT:  LBB3_2: # %cond.end
+; CHECK-NEXT:    ja LBB3_3
+; CHECK-NEXT:  LBB3_1:
+; CHECK-NEXT:    mov64 r0, 64
+; CHECK-NEXT:  LBB3_3: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i64 @llvm.cttz.i64(i64 %a, i1 0)
     ret i64 %ret
@@ -148,12 +152,11 @@ define i32 @ctlz_i32_zdef(i32 %a) {
 define i32 @ctlz_i32(i32 %a) {
 ; CHECK-LABEL: ctlz_i32:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    mov64 r0, 32
 ; CHECK-NEXT:    mov64 r2, r1
 ; CHECK-NEXT:    lsh64 r2, 32
 ; CHECK-NEXT:    rsh64 r2, 32
-; CHECK-NEXT:    jeq r2, 0, LBB5_2
-; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    jeq r2, 0, LBB5_1
+; CHECK-NEXT:  # %bb.2: # %cond.false
 ; CHECK-NEXT:    lddw r2, 4294967294
 ; CHECK-NEXT:    mov64 r3, r1
 ; CHECK-NEXT:    and64 r3, r2
@@ -197,7 +200,10 @@ define i32 @ctlz_i32(i32 %a) {
 ; CHECK-NEXT:    lddw r1, 4278190080
 ; CHECK-NEXT:    and64 r0, r1
 ; CHECK-NEXT:    rsh64 r0, 24
-; CHECK-NEXT:  LBB5_2: # %cond.end
+; CHECK-NEXT:    ja LBB5_3
+; CHECK-NEXT:  LBB5_1:
+; CHECK-NEXT:    mov64 r0, 32
+; CHECK-NEXT:  LBB5_3: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i32 @llvm.ctlz.i32(i32 %a, i1 0)
     ret i32 %ret
@@ -255,9 +261,8 @@ define i64 @ctlz_i64_zdef(i64 %a) {
 define i64 @ctlz_i64(i64 %a) {
 ; CHECK-LABEL: ctlz_i64:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    mov64 r0, 64
-; CHECK-NEXT:    jeq r1, 0, LBB7_2
-; CHECK-NEXT:  # %bb.1: # %cond.false
+; CHECK-NEXT:    jeq r1, 0, LBB7_1
+; CHECK-NEXT:  # %bb.2: # %cond.false
 ; CHECK-NEXT:    mov64 r2, r1
 ; CHECK-NEXT:    rsh64 r2, 1
 ; CHECK-NEXT:    or64 r1, r2
@@ -296,7 +301,10 @@ define i64 @ctlz_i64(i64 %a) {
 ; CHECK-NEXT:    lddw r1, 72340172838076673
 ; CHECK-NEXT:    mul64 r0, r1
 ; CHECK-NEXT:    rsh64 r0, 56
-; CHECK-NEXT:  LBB7_2: # %cond.end
+; CHECK-NEXT:    ja LBB7_3
+; CHECK-NEXT:  LBB7_1:
+; CHECK-NEXT:    mov64 r0, 64
+; CHECK-NEXT:  LBB7_3: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i64 @llvm.ctlz.i64(i64 %a, i1 0)
     ret i64 %ret
diff --git a/llvm/test/CodeGen/SBF/remove_truncate_2.ll b/llvm/test/CodeGen/SBF/remove_truncate_2.ll
index d1b9f9ff39dec..233ca747d23f9 100644
--- a/llvm/test/CodeGen/SBF/remove_truncate_2.ll
+++ b/llvm/test/CodeGen/SBF/remove_truncate_2.ll
@@ -44,15 +44,15 @@ if.end:                                           ; preds = %entry
   %cmp4 = icmp eq i8 %2, 1
 ; CHECK:  mov64 r0, 3
 ; CHECK-NOT:  and64 r1, 255
-; CHECK:  jeq r1, 1,
+; CHECK:  jne r1, 1,
   br i1 %cmp4, label %cleanup, label %if.end13
 
 if.else:                                          ; preds = %entry
   %cmp9 = icmp eq i8 %2, 0
-; CHECK:  mov64 r0, 2
 ; CHECK-NOT:  and64 r1, 255
 ; CHECK:  jeq r1, 0,
   br i1 %cmp9, label %cleanup, label %if.end13
+; CHECK:  mov64 r0, 2
 
 if.end13:                                         ; preds = %if.else, %if.end
   br label %cleanup
diff --git a/llvm/test/CodeGen/SBF/select_ri.ll b/llvm/test/CodeGen/SBF/select_ri.ll
index b9d710e268d46..41a8bcf7c2e2a 100644
--- a/llvm/test/CodeGen/SBF/select_ri.ll
+++ b/llvm/test/CodeGen/SBF/select_ri.ll
@@ -57,7 +57,7 @@ define i32 @test2() local_unnamed_addr #0 {
 entry:
   %0 = load i32, i32* @m, align 4
   %cmp = icmp slt i32 %0, 6
-; CHECK:  {{jslt|jsgt}} r{{[0-9]+}}, 6,
+; CHECK:  {{jsle|jsge}} r{{[0-9]+}}, 6,
   %1 = load i32, i32* @n, align 4
   %spec.select = select i1 %cmp, i32 %1, i32 %0
   ret i32 %spec.select

From 20ded7c1317c8243fbd678ec22a32fd4b4b2ac02 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 24 Jun 2025 12:33:20 -0300
Subject: [PATCH 091/114] [SOL] Do not add a return after a JA (#155)

* Do not add a return after a JA

* Update runner to windows 2022

* Do not iterate over all blocks
---
 .github/workflows/llvm-project-tests.yml |  4 ++--
 llvm/lib/Target/SBF/SBFMIPeephole.cpp    | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 3a54dd5b27148..fcec03138405c 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -44,7 +44,7 @@ on:
         # to install a python version linked against a newer version of glibc.
         # TODO(boomanaiden154): Bump the Ubuntu version once the version in the
         # container is bumped.
-        default: '["ubuntu-22.04", "windows-2019", "macOS-13"]'
+        default: '["ubuntu-22.04", "windows-2022", "macOS-13"]'
 
       python_version:
         required: false
@@ -74,7 +74,7 @@ jobs:
           - ubuntu-22.04
           # Use windows-2019 due to:
           # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
-          - windows-2019
+          - windows-2022
           # We're using a specific version of macOS due to:
           # https://github.com/actions/virtual-environments/issues/5900
           - macOS-latest
diff --git a/llvm/lib/Target/SBF/SBFMIPeephole.cpp b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
index 3bc3f70d958d6..d09df5513b254 100644
--- a/llvm/lib/Target/SBF/SBFMIPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFMIPeephole.cpp
@@ -187,23 +187,21 @@ bool SBFMIPreEmitPeephole::addReturn() {
   //
   // Although we can change ISelLowering and manually add the return for an
   // LLVM-IR unreachable instruction, LLVM codegen uses the target machine's
-  // return instruction to determine whether a function needs an epilogue,
-  // increasing code size more, even when we know the call won't transfer
-  // control back to the caller.
+  // return instruction to determine whether a function needs an epilogue.
+  // This setting increases code size, even when we know the call won't
+  // trasnfer control back to the caller.
   //
   // In that case, we can analyze every function before emitting machine code
   // and include a useless return instruction.
 
-  for (MachineBasicBlock &MBB: *MF) {
-    if (!MBB.succ_empty() || MBB.empty())
-      continue;
-
-    MachineInstr &MI = MBB.back();
-    unsigned Opcode = MI.getOpcode();
-    if (Opcode != SBF::RETURN_v3) {
-      BuildMI(&MBB, MI.getDebugLoc(), TII->get(SBF::RETURN_v3));
-      Added = true;
-    }
+  // PreEmitPeephole happens after block placement, so the last block in
+  // the ELF layout is also the last one in MF.
+  MachineBasicBlock &MBB = MF->back();
+  MachineInstr &MI = MBB.back();
+  unsigned Opcode = MI.getOpcode();
+  if (Opcode != SBF::RETURN_v3 && Opcode != SBF::JMP) {
+    BuildMI(&MBB, MI.getDebugLoc(), TII->get(SBF::RETURN_v3));
+    Added = true;
   }
 
   return Added;

From b1ab14ba98e4945ec0c14fec55ea846eaf121f6f Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 24 Jun 2025 12:33:59 -0300
Subject: [PATCH 092/114] [SOL] Do not add stack pointer adjustment at end
 (#156)

---
 .github/workflows/llvm-project-tests.yml      |  2 +-
 llvm/lib/Target/SBF/SBFFrameLowering.cpp      | 35 ++++++-------------
 .../SBF/dynamic_stack_frame_add_not_sub.ll    |  2 +-
 llvm/test/CodeGen/SBF/many_args_new_conv.ll   |  4 +--
 llvm/test/CodeGen/SBF/stack_args_v2.ll        |  2 +-
 5 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index fcec03138405c..aca8d87b1a243 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -14,7 +14,7 @@ on:
         required: false
       os_list:
         required: false
-        default: '["ubuntu-22.04", "windows-2019", "macOS-13"]'
+        default: '["ubuntu-22.04", "windows-2022", "macOS-13"]'
       python_version:
         required: false
         type: string
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.cpp b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
index 177fd06e81fb8..877059eff59b1 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
@@ -19,43 +19,28 @@
 
 using namespace llvm;
 
-namespace {
+bool SBFFrameLowering::hasFP(const MachineFunction &MF) const { return true; }
 
-void adjustStackPointer(MachineFunction &MF, MachineBasicBlock &MBB,
-                        MachineBasicBlock::iterator &MBBI, bool IsSubtract) {
+void SBFFrameLowering::emitPrologue(MachineFunction &MF,
+                                    MachineBasicBlock &MBB) const {
+  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
+    return;
+  }
+  MachineBasicBlock::iterator MBBI = MBB.begin();
   MachineFrameInfo &MFI = MF.getFrameInfo();
   int NumBytes = (int)MFI.getStackSize();
   if (NumBytes) {
-    DebugLoc Dl;
+    DebugLoc Dl = MBBI->getDebugLoc();
     const SBFInstrInfo &TII =
         *static_cast<const SBFInstrInfo *>(MF.getSubtarget().getInstrInfo());
     BuildMI(MBB, MBBI, Dl, TII.get(SBF::ADD_ri), SBF::R10)
         .addReg(SBF::R10)
-        .addImm(IsSubtract ? -NumBytes : NumBytes);
+        .addImm(-NumBytes);
   }
 }
 
-} // namespace
-
-bool SBFFrameLowering::hasFP(const MachineFunction &MF) const { return true; }
-
-void SBFFrameLowering::emitPrologue(MachineFunction &MF,
-                                    MachineBasicBlock &MBB) const {
-  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
-    return;
-  }
-  MachineBasicBlock::iterator MBBI = MBB.begin();
-  adjustStackPointer(MF, MBB, MBBI, true);
-}
-
 void SBFFrameLowering::emitEpilogue(MachineFunction &MF,
-                                    MachineBasicBlock &MBB) const {
-  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
-    return;
-  }
-  MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr();
-  adjustStackPointer(MF, MBB, MBBI, false);
-}
+                                    MachineBasicBlock &MBB) const {}
 
 void SBFFrameLowering::determineCalleeSaves(MachineFunction &MF,
                                             BitVector &SavedRegs,
diff --git a/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll b/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
index 702d3b58ad5e7..f39e992055b9f 100644
--- a/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
+++ b/llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll
@@ -13,7 +13,7 @@
 define i32 @test_func(ptr noundef %vec, i32 noundef %idx) #0 {
 ; CHECK-LABEL: test_func:
 ; CHECK: add64 r10, -128
-; CHECK: add64 r10, 128
+; CHECK-NOT: add64 r10, 128
 entry:
   %vec.addr = alloca ptr, align 8
   %idx.addr = alloca i512, align 4
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index 787662fa37825..3bb17be6ff913 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -68,7 +68,7 @@ define i32 @callee_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %p
 ; CHECK: ldxdw r2, [r10 + 88]
 ; Loading allocated i32
 ; CHECK: ldxw r0, [r10 + 24]
-; CHECK: add64 r10, 128
+; CHECK-NOT: add64 r10, 128
 
 entry:
   %o = alloca i512
@@ -97,7 +97,7 @@ define i32 @callee_no_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32
 ; CHECK: ldxdw r1, [r10 + 32]
 ; CHECK: ldxdw r1, [r10 + 24]
 
-; CHECK: add64 r10, 64
+; CHECK-NOT: add64 r10, 64
 entry:
   %g = add i32 %a, %b
   %h = sub i32 %g, %c
diff --git a/llvm/test/CodeGen/SBF/stack_args_v2.ll b/llvm/test/CodeGen/SBF/stack_args_v2.ll
index ba399b85e6b2b..cc0bb1a4dbd18 100644
--- a/llvm/test/CodeGen/SBF/stack_args_v2.ll
+++ b/llvm/test/CodeGen/SBF/stack_args_v2.ll
@@ -24,7 +24,7 @@ define i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) #1 {
 ; CHECK: sub64 r0, r5
 ; CHECK: ldxdw r1, [r10 + 56]
 ; CHECK: add64 r0, r1
-; CHECK: add64 r10, 64
+; CHECK-NOT: add64 r10, 64
 entry:
   %g = add i32 %a, %b
   %h = sub i32 %g, %c

From 39026ce1965c5526a3444af0d0ba7d0e6b2a5ec6 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 24 Jun 2025 17:26:22 -0300
Subject: [PATCH 093/114] [SOL] Create `add64 r10, 0` for functions that do not
 need stack space (#158)

---
 llvm/lib/Target/SBF/SBFFrameLowering.cpp    | 2 +-
 llvm/test/CodeGen/SBF/many_args_new_conv.ll | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.cpp b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
index 877059eff59b1..2e12afe18ec4a 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
@@ -29,7 +29,7 @@ void SBFFrameLowering::emitPrologue(MachineFunction &MF,
   MachineBasicBlock::iterator MBBI = MBB.begin();
   MachineFrameInfo &MFI = MF.getFrameInfo();
   int NumBytes = (int)MFI.getStackSize();
-  if (NumBytes) {
+  if (NumBytes || MF.getSubtarget<SBFSubtarget>().getHasStaticSyscalls()) {
     DebugLoc Dl = MBBI->getDebugLoc();
     const SBFInstrInfo &TII =
         *static_cast<const SBFInstrInfo *>(MF.getSubtarget().getInstrInfo());
diff --git a/llvm/test/CodeGen/SBF/many_args_new_conv.ll b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
index 3bb17be6ff913..20e1922ea9c3c 100644
--- a/llvm/test/CodeGen/SBF/many_args_new_conv.ll
+++ b/llvm/test/CodeGen/SBF/many_args_new_conv.ll
@@ -1,6 +1,7 @@
 ; RUN: llc -O2 -march=sbf -mcpu=v1 < %s | FileCheck %s
 ; RUN: llc -O2 -mtriple=sbpfv1-solana-solana < %s | FileCheck %s
 ; RUN: llc -O2 -march=sbf -mcpu=v1 -mattr=+mem-encoding < %s | FileCheck %s
+; RUN: llc -O3 -march=sbf -mcpu=v3 < %s | FileCheck --check-prefix=CHECK-V3 %s
 
 ; Function Attrs: nounwind uwtable
 define i32 @caller_no_alloca(i32 %a, i32 %b, i32 %c) #0 {
@@ -9,6 +10,8 @@ entry:
 
 ; No changes to the stack pointer
 ; CHECK-NOT: add64 r10
+; Add zero to stack pointer from V3 onwards
+; CHECK-V3: add64 r10, 0
 
 ; Saving arguments on the stack
 ; CHECK: stdw [r10 - 40], 60

From 18027594dda864dce717388ad33abf65ef686131 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 30 Jun 2025 11:01:58 -0300
Subject: [PATCH 094/114] [SOL] Fix debug relocation in SBF (#159)

---
 lld/ELF/InputSection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 53b475af13534..247829f2c06fe 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -1043,7 +1043,7 @@ void InputSection::relocateNonAlloc(Ctx &ctx, uint8_t *buf,
     const uint64_t offset = rel.r_offset;
 
     // FIX: Temporary remap BPF_64_64 relocations in debug sections.
-    if (config->emachine == EM_BPF && type == R_BPF_64_64 && isDebug)
+    if (config->emachine == EM_SBF && type == R_SBF_64_64 && isDebug)
       type = R_BPF_64_ABS64;
 
     uint8_t *bufLoc = buf + offset;

From a51e95c559679ab18a3f01bc9fb4d5f8de47ad46 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Tue, 1 Jul 2025 18:35:53 -0300
Subject: [PATCH 095/114] [SOL] Fine tune memcmp threshold (#160)

---
 llvm/lib/Target/SBF/SBFISelLowering.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 21382f076721b..1e775af0c5d21 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -160,8 +160,11 @@ SBFTargetLowering::SBFTargetLowering(const TargetMachine &TM,
   // Memcmp expands to three instructions for each load:
   // 1. One load for each pointer being compared.
   // 2. One jne for each load.
-  // The limit here should be three, since 3*3 = 9;
-  MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = 3;
+  // There is also a 3 CUs overhead for adjusting the arguments to memcmp.
+  // We need at least three mov64 to set them.
+  // A syscall takes at least 10 + 3 CUs.
+  // The limit here should be four, since 3*4 = 12;
+  MaxLoadsPerMemcmp = MaxLoadsPerMemcmpOptSize = 4;
 
   // CPU/Feature control
   HasAlu32 = STI.getHasAlu32();

From 694cdbc438bcfd4e3a53eb6cd0266367a9e52343 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:29:25 -0300
Subject: [PATCH 096/114] [SOL] Emit no-op for anyext (#161)

---
 llvm/lib/Target/SBF/SBFInstrInfo.td | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index 45d1d035ffe44..d99cb9b0eaf26 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -1279,7 +1279,7 @@ def : Pat<(i32 (trunc GPR:$src)),
 
 // SBFv2 anyext
 def : Pat<(i64 (anyext GPR32:$src)),
-          (MOV_32_64 GPR32:$src)>, Requires<[SBFExplicitSignExt]>;
+          (INSERT_SUBREG (i64 (IMPLICIT_DEF)), GPR32:$src, sub_32)>, Requires<[SBFExplicitSignExt]>;
 
 // SBFv1 anyext
 def : Pat<(i64 (anyext GPR32:$src)),

From b381271585d128108d75b407fb2d7c1309941519 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:55:28 -0300
Subject: [PATCH 097/114] [SOL] Implement `isAddImmediate` for SBF (#162)

* Code is add imm

* Add tests
---
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |  27 ++++
 llvm/lib/Target/SBF/SBFInstrInfo.h            |   3 +
 llvm/unittests/Target/SBF/CMakeLists.txt      |  20 +++
 .../unittests/Target/SBF/SBFInstrInfoTest.cpp | 130 ++++++++++++++++++
 4 files changed, 180 insertions(+)
 create mode 100644 llvm/unittests/Target/SBF/CMakeLists.txt
 create mode 100644 llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index 054451253d852..5cb9d5334ee00 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -400,3 +400,30 @@ unsigned SBFInstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
 
   return 8;
 }
+
+std::optional<RegImmPair> SBFInstrInfo::isAddImmediate(const MachineInstr &MI,
+                                                       Register Reg) const {
+  const MachineOperand &Op0 = MI.getOperand(0);
+  if (!Op0.isReg() || Reg != Op0.getReg())
+    return std::nullopt;
+
+  if (!MI.getOperand(1).isReg() || !MI.getOperand(2).isImm())
+    return std::nullopt;
+
+  int Sign = 1;
+  int64_t Offset = 0;
+  unsigned Opcode = MI.getOpcode();
+  switch (Opcode) {
+  default:
+    return std::nullopt;
+  case SBF::SUB_ri:
+  case SBF::SUB_ri_32:
+    Sign *= -1;
+    [[fallthrough]];
+  case SBF::ADD_ri:
+  case SBF::ADD_ri_32: {
+    Offset = MI.getOperand(2).getImm() * Sign;
+    return RegImmPair{MI.getOperand(1).getReg(), Offset};
+  }
+  }
+}
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index dc4ad6802ca1c..8c289cd0bd41e 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -65,6 +65,9 @@ class SBFInstrInfo : public SBFGenInstrInfo {
 
   unsigned getInstSizeInBytes(const MachineInstr &MI) const override;
 
+  std::optional<RegImmPair> isAddImmediate(const MachineInstr &MI,
+                                           Register Reg) const override;
+
 private:
   bool HasExplicitSignExt;
   bool NewMemEncoding;
diff --git a/llvm/unittests/Target/SBF/CMakeLists.txt b/llvm/unittests/Target/SBF/CMakeLists.txt
new file mode 100644
index 0000000000000..66913b61d9153
--- /dev/null
+++ b/llvm/unittests/Target/SBF/CMakeLists.txt
@@ -0,0 +1,20 @@
+include_directories(
+        ${LLVM_MAIN_SRC_DIR}/lib/Target/SBF
+        ${LLVM_BINARY_DIR}/lib/Target/SBF
+)
+
+set(LLVM_LINK_COMPONENTS
+        SBFCodeGen
+        SBFDesc
+        SBFInfo
+        Analysis
+        CodeGen
+        Core
+        MC
+        SelectionDAG
+        TargetParser
+)
+
+add_llvm_target_unittest(SBFTests
+        SBFInstrInfoTest.cpp
+)
diff --git a/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp b/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
new file mode 100644
index 0000000000000..af25ede00c363
--- /dev/null
+++ b/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
@@ -0,0 +1,130 @@
+//===- SBFInstrInfoTest.cpp - SBFInstrInfo unit tests -----------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "SBFInstrInfo.h"
+#include "SBFSubtarget.h"
+#include "SBFTargetMachine.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/IR/DebugInfoMetadata.h"
+#include "llvm/IR/Module.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/TargetSelect.h"
+#include "llvm/Target/TargetLoweringObjectFile.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetOptions.h"
+
+#include "gtest/gtest.h"
+
+#include <memory>
+
+using namespace llvm;
+
+namespace {
+
+class SBFInstrInfoTest : public testing::TestWithParam<const char *> {
+protected:
+  std::unique_ptr<SBFTargetMachine> TM;
+  std::unique_ptr<LLVMContext> Ctx;
+  std::unique_ptr<SBFSubtarget> ST;
+  std::unique_ptr<MachineModuleInfo> MMI;
+  std::unique_ptr<MachineFunction> MF;
+  std::unique_ptr<Module> M;
+
+  static void SetUpTestSuite() {
+    LLVMInitializeSBFTargetInfo();
+    LLVMInitializeSBFTarget();
+    LLVMInitializeSBFTargetMC();
+  }
+
+  SBFInstrInfoTest() {
+    std::string Error;
+    auto TT(Triple::normalize(GetParam()));
+    const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
+    TargetOptions Options;
+
+    TM.reset(static_cast<SBFTargetMachine *>(TheTarget->createTargetMachine(
+        TT, "generic", "", Options, std::nullopt, std::nullopt,
+        CodeGenOptLevel::Default)));
+
+    Ctx = std::make_unique<LLVMContext>();
+    M = std::make_unique<Module>("Module", *Ctx);
+    M->setDataLayout(TM->createDataLayout());
+    auto *FType = FunctionType::get(Type::getVoidTy(*Ctx), false);
+    auto *F = Function::Create(FType, GlobalValue::ExternalLinkage, "Test", *M);
+    MMI = std::make_unique<MachineModuleInfo>(TM.get());
+
+    ST = std::make_unique<SBFSubtarget>(
+        TM->getTargetTriple(), TM->getTargetCPU().str(),
+        TM->getTargetFeatureString().str(), *TM);
+
+    MF = std::make_unique<MachineFunction>(*F, *TM, *ST, 42, *MMI);
+  }
+};
+
+TEST_P(SBFInstrInfoTest, IsAddImmediate) {
+  const SBFInstrInfo *TII = ST->getInstrInfo();
+  DebugLoc DL;
+
+  MachineInstr *MI1 = BuildMI(*MF, DL, TII->get(SBF::ADD_ri_32), SBF::R1)
+                          .addReg(SBF::R1)
+                          .addImm(80)
+                          .getInstr();
+  auto MI1Res = TII->isAddImmediate(*MI1, SBF::R1);
+  ASSERT_TRUE(MI1Res.has_value());
+  EXPECT_EQ(MI1Res->Reg, SBF::R1);
+  EXPECT_EQ(MI1Res->Imm, 80);
+
+  MachineInstr *MI2 =
+      BuildMI(*MF, DL, TII->get(SBF::ADD_ri_32), SBF::R1).addImm(80).getInstr();
+  EXPECT_FALSE(TII->isAddImmediate(*MI2, SBF::R2));
+
+  MachineInstr *MI3 = BuildMI(*MF, DL, TII->get(SBF::ADD_ri), SBF::R1)
+                          .addReg(SBF::R1)
+                          .addImm(80)
+                          .getInstr();
+  auto MI3Res = TII->isAddImmediate(*MI3, SBF::R1);
+  ASSERT_TRUE(MI3Res.has_value());
+  EXPECT_EQ(MI3Res->Reg, SBF::R1);
+  EXPECT_EQ(MI3Res->Imm, 80);
+
+  MachineInstr *MI4 = BuildMI(*MF, DL, TII->get(SBF::SUB_ri), SBF::R1)
+                          .addReg(SBF::R1)
+                          .addImm(80)
+                          .getInstr();
+  auto MI4Res = TII->isAddImmediate(*MI4, SBF::R1);
+  ASSERT_TRUE(MI4Res.has_value());
+  EXPECT_EQ(MI4Res->Reg, SBF::R1);
+  EXPECT_EQ(MI4Res->Imm, -80);
+
+  MachineInstr *MI5 = BuildMI(*MF, DL, TII->get(SBF::SUB_ri_32), SBF::R1)
+                          .addReg(SBF::R1)
+                          .addImm(80)
+                          .getInstr();
+  auto MI5Res = TII->isAddImmediate(*MI5, SBF::R1);
+  ASSERT_TRUE(MI5Res.has_value());
+  EXPECT_EQ(MI5Res->Reg, SBF::R1);
+  EXPECT_EQ(MI5Res->Imm, -80);
+
+  MachineInstr *MI6 = BuildMI(*MF, DL, TII->get(SBF::SUB_ri_32), SBF::R1)
+                          .addImm(2)
+                          .addImm(80)
+                          .getInstr();
+  auto MI6Res = TII->isAddImmediate(*MI6, SBF::R1);
+  ASSERT_FALSE(MI6Res.has_value());
+
+  MachineInstr *MI7 = BuildMI(*MF, DL, TII->get(SBF::SUB_ri_32), SBF::R1)
+                          .addReg(SBF::R2)
+                          .addReg(SBF::R3)
+                          .getInstr();
+  auto MI7Res = TII->isAddImmediate(*MI7, SBF::R1);
+  ASSERT_FALSE(MI7Res.has_value());
+}
+
+} // namespace
+
+INSTANTIATE_TEST_SUITE_P(SBFTest, SBFInstrInfoTest, testing::Values("sbf"));

From 6aaaa59293590109adff4a82b2d6b116c5e40fb2 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Fri, 18 Jul 2025 11:01:32 -0300
Subject: [PATCH 098/114] [SOL] Implement hints of stack stores and loads
 (#163)

---
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |  70 ++++++++++
 llvm/lib/Target/SBF/SBFInstrInfo.h            |  12 ++
 .../unittests/Target/SBF/SBFInstrInfoTest.cpp | 123 ++++++++++++++++++
 3 files changed, 205 insertions(+)

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index 5cb9d5334ee00..a82e7fa2498b7 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -114,6 +114,41 @@ void SBFInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
     llvm_unreachable("Can't store this register to stack slot");
 }
 
+Register SBFInstrInfo::isStoreToStackSlot(const MachineInstr &MI,
+                                          int &FrameIndex,
+                                          unsigned &MemBytes) const {
+  switch (MI.getOpcode()) {
+  default:
+    break;
+  case SBF::STD_V2:
+  case SBF::STD_V1:
+    MemBytes = 8;
+    if (MI.getOperand(0).isReg() && MI.getOperand(1).isFI() &&
+        MI.getOperand(2).isImm() && MI.getOperand(2).getImm() == 0) {
+      FrameIndex = MI.getOperand(1).getIndex();
+      return MI.getOperand(0).getReg();
+    }
+    break;
+  case SBF::STW32_V2:
+  case SBF::STW32_V1:
+    MemBytes = 4;
+    if (MI.getOperand(0).isReg() && MI.getOperand(1).isFI() &&
+        MI.getOperand(2).isImm() && MI.getOperand(2).getImm() == 0) {
+      FrameIndex = MI.getOperand(1).getIndex();
+      return MI.getOperand(0).getReg();
+    }
+    break;
+  }
+
+  return 0;
+}
+
+Register SBFInstrInfo::isStoreToStackSlot(const MachineInstr &MI,
+                                          int &FrameIndex) const {
+  unsigned MemBytes = 0;
+  return isStoreToStackSlot(MI, FrameIndex, MemBytes);
+}
+
 void SBFInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
                                         MachineBasicBlock::iterator I,
                                         Register DestReg, int FI,
@@ -136,6 +171,41 @@ void SBFInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
     llvm_unreachable("Can't load this register from stack slot");
 }
 
+Register SBFInstrInfo::isLoadFromStackSlot(const MachineInstr &MI,
+                                           int &FrameIndex,
+                                           unsigned &MemBytes) const {
+  switch (MI.getOpcode()) {
+  default:
+    break;
+  case SBF::LDD_V2:
+  case SBF::LDD_V1:
+    MemBytes = 8;
+    if (MI.getOperand(0).isReg() && MI.getOperand(1).isFI() &&
+        MI.getOperand(2).isImm() && MI.getOperand(2).getImm() == 0) {
+      FrameIndex = MI.getOperand(1).getIndex();
+      return MI.getOperand(0).getReg();
+    }
+    break;
+  case SBF::LDW32_V2:
+  case SBF::LDW32_V1:
+    MemBytes = 4;
+    if (MI.getOperand(0).isReg() && MI.getOperand(1).isFI() &&
+        MI.getOperand(2).isImm() && MI.getOperand(2).getImm() == 0) {
+      FrameIndex = MI.getOperand(1).getIndex();
+      return MI.getOperand(0).getReg();
+    }
+    break;
+  }
+
+  return 0;
+}
+
+Register SBFInstrInfo::isLoadFromStackSlot(const MachineInstr &MI,
+                                           int &FrameIndex) const {
+  unsigned MemBytes = 0;
+  return isLoadFromStackSlot(MI, FrameIndex, MemBytes);
+}
+
 bool SBFInstrInfo::analyzeBranch(MachineBasicBlock &MBB,
                                  MachineBasicBlock *&TBB,
                                  MachineBasicBlock *&FBB,
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index 8c289cd0bd41e..c8c4b678b9818 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -68,6 +68,18 @@ class SBFInstrInfo : public SBFGenInstrInfo {
   std::optional<RegImmPair> isAddImmediate(const MachineInstr &MI,
                                            Register Reg) const override;
 
+  Register isStoreToStackSlot(const MachineInstr &MI,
+                              int &FrameIndex) const override;
+
+  Register isStoreToStackSlot(const MachineInstr &MI, int &FrameIndex,
+                              unsigned &MemBytes) const override;
+
+  Register isLoadFromStackSlot(const MachineInstr &MI,
+                               int &FrameIndex) const override;
+
+  Register isLoadFromStackSlot(const MachineInstr &MI, int &FrameIndex,
+                               unsigned &MemBytes) const override;
+
 private:
   bool HasExplicitSignExt;
   bool NewMemEncoding;
diff --git a/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp b/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
index af25ede00c363..691fc5ab3ec20 100644
--- a/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
+++ b/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
@@ -125,6 +125,129 @@ TEST_P(SBFInstrInfoTest, IsAddImmediate) {
   ASSERT_FALSE(MI7Res.has_value());
 }
 
+TEST_P(SBFInstrInfoTest, IsStoreToStackSlot) {
+  const SBFInstrInfo *TII = ST->getInstrInfo();
+  DebugLoc DL;
+
+  MachineInstr *MI = BuildMI(*MF, DL, TII->get(SBF::STD_V2))
+                         .addReg(SBF::R1, getKillRegState(true))
+                         .addFrameIndex(10)
+                         .addImm(0)
+                         .getInstr();
+  int FI = 0;
+  unsigned Mem = 0;
+  auto MI1Res = TII->isStoreToStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R1);
+  EXPECT_EQ(FI, 10);
+  EXPECT_EQ(Mem, 8u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::STD_V1))
+           .addReg(SBF::R2, getKillRegState(true))
+           .addFrameIndex(17)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isStoreToStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R2);
+  EXPECT_EQ(FI, 17);
+  EXPECT_EQ(Mem, 8u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::STW32_V2))
+           .addReg(SBF::R2, getKillRegState(true))
+           .addFrameIndex(15)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isStoreToStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R2);
+  EXPECT_EQ(FI, 15);
+  EXPECT_EQ(Mem, 4u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::STW32_V1))
+           .addReg(SBF::R5, getKillRegState(true))
+           .addFrameIndex(18)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isStoreToStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R5);
+  EXPECT_EQ(FI, 18);
+  EXPECT_EQ(Mem, 4u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::LDW32_V1), SBF::R1)
+           .addReg(SBF::R5, getKillRegState(true))
+           .addFrameIndex(18)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isStoreToStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), 0u);
+}
+
+TEST_P(SBFInstrInfoTest, IsLoadFromStackSlot) {
+  const SBFInstrInfo *TII = ST->getInstrInfo();
+  DebugLoc DL;
+
+  MachineInstr *MI = BuildMI(*MF, DL, TII->get(SBF::LDD_V2), SBF::R1)
+                         .addFrameIndex(10)
+                         .addImm(0)
+                         .getInstr();
+  int FI = 0;
+  unsigned Mem = 0;
+  auto MI1Res = TII->isLoadFromStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R1);
+  EXPECT_EQ(FI, 10);
+  EXPECT_EQ(Mem, 8u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::LDD_V1), SBF::R2)
+           .addFrameIndex(17)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isLoadFromStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R2);
+  EXPECT_EQ(FI, 17);
+  EXPECT_EQ(Mem, 8u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::LDW32_V2), SBF::R2)
+           .addFrameIndex(15)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isLoadFromStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R2);
+  EXPECT_EQ(FI, 15);
+  EXPECT_EQ(Mem, 4u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::LDW32_V1))
+           .addReg(SBF::R5, getKillRegState(true))
+           .addFrameIndex(18)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isLoadFromStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), SBF::R5);
+  EXPECT_EQ(FI, 18);
+  EXPECT_EQ(Mem, 4u);
+
+  MI = BuildMI(*MF, DL, TII->get(SBF::STD_V2))
+           .addReg(SBF::R5, getKillRegState(true))
+           .addFrameIndex(18)
+           .addImm(0)
+           .getInstr();
+  FI = 0;
+  Mem = 0;
+  MI1Res = TII->isLoadFromStackSlot(*MI, FI, Mem);
+  EXPECT_EQ(MI1Res.id(), 0u);
+}
+
 } // namespace
 
 INSTANTIATE_TEST_SUITE_P(SBFTest, SBFInstrInfoTest, testing::Values("sbf"));

From 0ab789a6c231113e31e0e8d371225655faa085ce Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Sun, 27 Jul 2025 17:09:35 -0300
Subject: [PATCH 099/114] [SOL] Use `mov32` to load and zero extend immediate
 in V2+ (#166)

---
 llvm/lib/Target/SBF/SBFInstrInfo.td |  8 ++++++++
 llvm/test/CodeGen/SBF/mov_zext.ll   | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 llvm/test/CodeGen/SBF/mov_zext.ll

diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index d99cb9b0eaf26..b020ce38a9d46 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -443,6 +443,14 @@ let Predicates = [SBFExplicitSignExt], DecoderNamespace = "SBFv2" in {
                                 []>;
 }
 
+let Predicates = [SBFExplicitSignExt], DecoderNamespace = "Repeated" in  {
+    def MOV_ri_32_zext : MATH_RI<SBF_ALU, SBF_MOV,
+                        (outs GPR:$dst),
+                        (ins i64imm:$imm),
+                        "mov32 $dst, $imm",
+                        [(set GPR:$dst, (i64 i64immZExt32:$imm))]>;
+}
+
 def MOV_rr_32_no_sext_v1 : MATH_RR<SBF_ALU, SBF_MOV,
                         (outs GPR32:$dst),
                         (ins GPR32:$src),
diff --git a/llvm/test/CodeGen/SBF/mov_zext.ll b/llvm/test/CodeGen/SBF/mov_zext.ll
new file mode 100644
index 0000000000000..cb642d579d94b
--- /dev/null
+++ b/llvm/test/CodeGen/SBF/mov_zext.ll
@@ -0,0 +1,28 @@
+; RUN: llc -march=sbf -mcpu=v1 < %s | FileCheck --check-prefix=CHECK-V1 %s
+; RUN: llc -march=sbf -mcpu=v2 < %s | FileCheck --check-prefix=CHECK-V2 %s
+
+define dso_local i64 @mov_1() {
+entry:
+; CHECK-LABEL: mov_1
+; CHECK-V1: lddw r0, 4294967294
+; CHECK-V2: mov32 r0, -2
+; CHECK-V2-NOT: hor64
+  ret i64 4294967294
+}
+
+define dso_local i64 @mov_2() {
+entry:
+; CHECK-LABEL: mov_2
+; CHECK-V1: lddw r0, -4294967294
+; CHECK-V2: mov32 r0, 2
+; CHECK-V2: hor64 r0, -1
+  ret i64 -4294967294
+}
+
+define dso_local i64 @mov_3() {
+entry:
+; CHECK-LABEL: mov_3
+; CHECK-V1: mov64 r0, 429496729
+; CHECK-V2: mov64 r0, 429496729
+  ret i64 429496729
+}
\ No newline at end of file

From 45bf9ace68affc355aa211b017b620286adafd77 Mon Sep 17 00:00:00 2001
From: Lucas Ste <38472950+LucasSte@users.noreply.github.com>
Date: Wed, 30 Jul 2025 10:56:09 -0300
Subject: [PATCH 100/114] [SOL] Reduce cost of floating point expansion (#167)

---
 llvm/lib/Target/SBF/SBFTargetTransformInfo.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
index ac24034444a1b..e7ff4ea889680 100644
--- a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
+++ b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
@@ -71,12 +71,14 @@ class SBFTTIImpl : public BasicTTIImplBase<SBFTTIImpl> {
       TTI::OperandValueInfo Op2Info = {TTI::OK_AnyValue, TTI::OP_None},
     ArrayRef<const Value *> Args = ArrayRef<const Value *>(),
     const Instruction *CxtI = nullptr) {
-      int ISD = TLI->InstructionOpcodeToISD(Opcode);
-      if (ISD == ISD::ADD && CostKind == TTI::TCK_RecipThroughput)
-        return SCEVCheapExpansionBudget.getValue() + 1;
-
-      return BaseT::getArithmeticInstrCost(Opcode, Ty, CostKind, Op1Info,
-                                           Op2Info);
+    int ISDOpcode = TLI->InstructionOpcodeToISD(Opcode);
+    
+    if ((ISDOpcode == ISD::ADD && CostKind == TTI::TCK_RecipThroughput) ||
+        !Ty->isIntOrPtrTy())
+      return SCEVCheapExpansionBudget.getValue() + 1;
+
+    return BaseT::getArithmeticInstrCost(Opcode, Ty, CostKind, Op1Info,
+                                         Op2Info);
   }
 
   TTI::MemCmpExpansionOptions enableMemCmpExpansion(bool OptSize,

From 74ef093c9f6693dee940b9c143e8a80160d35afc Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Tue, 12 Aug 2025 17:42:24 -0300
Subject: [PATCH 101/114] [SOL] Adjustments after LLVM 20 update

---
 clang/lib/Basic/Targets/BPF.cpp               |  6 ---
 clang/test/Misc/warning-flags.c               |  1 -
 lld/ELF/Arch/SBF.cpp                          | 12 +++---
 lld/ELF/InputSection.cpp                      |  2 +-
 .../lib/Target/SBF/AsmParser/SBFAsmParser.cpp | 22 +++++-----
 llvm/lib/Target/SBF/BTFDebug.cpp              | 22 ++++------
 .../Target/SBF/MCTargetDesc/SBFInstPrinter.h  |  3 +-
 .../SBF/MCTargetDesc/SBFMCTargetDesc.cpp      |  1 +
 .../Target/SBF/SBFAbstractMemberAccess.cpp    | 42 +++++++++----------
 llvm/lib/Target/SBF/SBFAsmPrinter.cpp         |  4 +-
 llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp   |  1 -
 llvm/lib/Target/SBF/SBFFrameLowering.cpp      |  4 +-
 llvm/lib/Target/SBF/SBFFrameLowering.h        |  2 +-
 llvm/lib/Target/SBF/SBFIRPeephole.cpp         |  2 -
 llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp       |  7 +---
 llvm/lib/Target/SBF/SBFISelLowering.cpp       | 11 ++---
 llvm/lib/Target/SBF/SBFISelLowering.h         |  4 +-
 llvm/lib/Target/SBF/SBFInstrInfo.cpp          |  9 ++--
 llvm/lib/Target/SBF/SBFInstrInfo.h            | 29 ++++++-------
 llvm/lib/Target/SBF/SBFInstrInfo.td           |  2 +-
 llvm/lib/Target/SBF/SBFMIChecking.cpp         |  3 --
 llvm/lib/Target/SBF/SBFPreserveDIType.cpp     |  4 +-
 llvm/lib/Target/SBF/SBFTargetMachine.cpp      |  3 +-
 llvm/lib/Target/SBF/SBFTargetMachine.h        |  4 +-
 llvm/lib/Target/SBF/SBFTargetTransformInfo.h  | 15 +++----
 .../unittests/Target/SBF/SBFInstrInfoTest.cpp |  2 +-
 26 files changed, 95 insertions(+), 122 deletions(-)

diff --git a/clang/lib/Basic/Targets/BPF.cpp b/clang/lib/Basic/Targets/BPF.cpp
index a710c399562f8..50bc5b0dfd320 100644
--- a/clang/lib/Basic/Targets/BPF.cpp
+++ b/clang/lib/Basic/Targets/BPF.cpp
@@ -95,12 +95,6 @@ ArrayRef<Builtin::Info> BPFTargetInfo::getTargetBuiltins() const {
 
 bool BPFTargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
                                          DiagnosticsEngine &Diags) {
-  // TODO: The SBF back-end now provides the sbf target. Issue deprecation
-  // warning directing use of '-target sbf' instead. Eventually remove the
-  // +solana support from the BPF back-end.
-  if (getTriple().getArch() != llvm::Triple::sbf && HasSolanaFeature)
-    Diags.Report(diag::warn_drv_no_solana_with_bpf);
-
   for (const auto &Feature : Features) {
     if (Feature == "+alu32") {
       HasAlu32 = true;
diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
index 41d6ebef3a37f..1fd0244083335 100644
--- a/clang/test/Misc/warning-flags.c
+++ b/clang/test/Misc/warning-flags.c
@@ -45,7 +45,6 @@ CHECK-NEXT:   warn_double_const_requires_fp64
 CHECK-NEXT:   warn_drv_amdgpu_cov6
 CHECK-NEXT:   warn_drv_assuming_mfloat_abi_is
 CHECK-NEXT:   warn_drv_clang_unsupported
-CHECK-NEXT:   warn_drv_no_solana_with_bpf
 CHECK-NEXT:   warn_drv_pch_not_first_include
 CHECK-NEXT:   warn_expected_qualified_after_typename
 CHECK-NEXT:   warn_fe_backend_unsupported
diff --git a/lld/ELF/Arch/SBF.cpp b/lld/ELF/Arch/SBF.cpp
index 6c4aab1153d02..51be72c9f373e 100644
--- a/lld/ELF/Arch/SBF.cpp
+++ b/lld/ELF/Arch/SBF.cpp
@@ -25,7 +25,7 @@ namespace elf {
 namespace {
 class SBF final : public TargetInfo {
 public:
-  SBF();
+  SBF(Ctx & ctx);
   RelExpr getRelExpr(RelType type, const Symbol &s,
                      const uint8_t *loc) const override;
   RelType getDynRel(RelType type) const override;
@@ -54,7 +54,7 @@ RelExpr SBF::getRelExpr(RelType type, const Symbol &s,
     case R_SBF_64_64:
       return R_ABS;
     default:
-      error(getErrorLocation(loc) + "unrecognized reloc " + toString(type));
+      Err(ctx) << getErrorLoc(ctx, loc) << "unrecognized reloc " << type.v;
   }
   return R_NONE;
 }
@@ -113,12 +113,12 @@ void SBF::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
       break;
     }
     default:
-      error(getErrorLocation(loc) + "unrecognized reloc " + toString(rel.type));
+      Err(ctx) << getErrorLoc(ctx, loc) << "unrecognized reloc " << rel.type.v;
   }
 }
 
-static uint32_t getEFlags(InputFile *file) {
-  if (config->ekind == ELF64BEKind)
+static uint32_t getEFlags(InputFile *file, Ctx &ctx) {
+  if (ctx.arg.ekind == ELF64BEKind)
     return cast<ObjFile<ELF64BE>>(file)->getObj().getHeader().e_flags;
   return cast<ObjFile<ELF64LE>>(file)->getObj().getHeader().e_flags;
 }
@@ -129,7 +129,7 @@ uint32_t SBF::calcEFlags() const {
   // Ensure that all the object files were compiled with the same flags, as
   // different flags indicate different ABIs.
   for (InputFile *f : ctx.objectFiles) {
-    uint32_t flags = getEFlags(f);
+    uint32_t flags = getEFlags(f, ctx);
     if (ret == 0) {
       ret = flags;
     } else if (ret != flags) {
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 247829f2c06fe..1aa1c77c1476e 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -1043,7 +1043,7 @@ void InputSection::relocateNonAlloc(Ctx &ctx, uint8_t *buf,
     const uint64_t offset = rel.r_offset;
 
     // FIX: Temporary remap BPF_64_64 relocations in debug sections.
-    if (config->emachine == EM_SBF && type == R_SBF_64_64 && isDebug)
+    if (ctx.arg.emachine == EM_SBF && type == R_SBF_64_64 && isDebug)
       type = R_BPF_64_ABS64;
 
     uint8_t *bufLoc = buf + offset;
diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
index 1a17167f3d824..89b0fc8eed20c 100644
--- a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
+++ b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -9,7 +9,6 @@
 #include "MCTargetDesc/SBFMCTargetDesc.h"
 #include "MCTargetDesc/SBFInstPrinter.h"
 #include "TargetInfo/SBFTargetInfo.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCExpr.h"
@@ -18,7 +17,6 @@
 #include "llvm/MC/MCParser/MCAsmLexer.h"
 #include "llvm/MC/MCParser/MCParsedAsmOperand.h"
 #include "llvm/MC/MCParser/MCTargetAsmParser.h"
-#include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/TargetRegistry.h"
@@ -33,7 +31,7 @@ class SBFAsmParser : public MCTargetAsmParser {
 
   SMLoc getLoc() const { return getParser().getTok().getLoc(); }
 
-  bool MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
+  bool matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
                                OperandVector &Operands, MCStreamer &Out,
                                uint64_t &ErrorInfo,
                                bool MatchingInlineAsm) override;
@@ -43,7 +41,7 @@ class SBFAsmParser : public MCTargetAsmParser {
   ParseStatus tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
                                         SMLoc &EndLoc) override;
 
-  bool ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
+  bool parseInstruction(ParseInstructionInfo &Info, StringRef Name,
                         SMLoc NameLoc, OperandVector &Operands) override;
 
 #define GET_ASSEMBLER_HEADER
@@ -80,7 +78,7 @@ struct SBFOperand : public MCParsedAsmOperand {
   } Kind;
 
   struct RegOp {
-    unsigned RegNum;
+    MCRegister RegNum;
   };
 
   struct ImmOp {
@@ -203,10 +201,10 @@ struct SBFOperand : public MCParsedAsmOperand {
     return Op;
   }
 
-  static std::unique_ptr<SBFOperand> createReg(unsigned RegNo, SMLoc S,
+  static std::unique_ptr<SBFOperand> createReg(MCRegister Reg, SMLoc S,
                                                SMLoc E) {
     auto Op = std::make_unique<SBFOperand>(Register);
-    Op->Reg.RegNum = RegNo;
+    Op->Reg.RegNum = Reg;
     Op->StartLoc = S;
     Op->EndLoc = E;
     return Op;
@@ -261,7 +259,7 @@ struct SBFOperand : public MCParsedAsmOperand {
 #define GET_MATCHER_IMPLEMENTATION
 #include "SBFGenAsmMatcher.inc"
 
-bool SBFAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
+bool SBFAsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
                                            OperandVector &Operands,
                                            MCStreamer &Out, uint64_t &ErrorInfo,
                                            bool MatchingInlineAsm) {
@@ -331,13 +329,13 @@ OperandMatchResultTy SBFAsmParser::parseRegister(OperandVector &Operands) {
     return MatchOperand_NoMatch;
   case AsmToken::Identifier:
     StringRef Name = getLexer().getTok().getIdentifier();
-    unsigned RegNo = MatchRegisterName(Name);
+    MCRegister Reg = MatchRegisterName(Name);
 
-    if (RegNo == 0)
+    if (!Reg)
       return MatchOperand_NoMatch;
 
     getLexer().Lex();
-    Operands.push_back(SBFOperand::createReg(RegNo, S, E));
+    Operands.push_back(SBFOperand::createReg(Reg, S, E));
   }
   return MatchOperand_Success;
 }
@@ -420,7 +418,7 @@ bool SBFAsmParser::parseOperand(OperandVector &Operands, StringRef Mnemonic) {
 }
 
 /// Parse an SBF instruction.
-bool SBFAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
+bool SBFAsmParser::parseInstruction(ParseInstructionInfo &Info, StringRef Name,
                                     SMLoc NameLoc, OperandVector &Operands) {
   // First operand is token for instruction mnemonic.
   Operands.push_back(SBFOperand::createToken(Name, NameLoc));
diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
index 2fd940185e1c2..3c09fb34e444a 100644
--- a/llvm/lib/Target/SBF/BTFDebug.cpp
+++ b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -707,7 +707,7 @@ void BTFDebug::visitArrayType(const DICompositeType *CTy, uint32_t &TypeId) {
     if (auto *Element = dyn_cast_or_null<DINode>(Elements[I]))
       if (Element->getTag() == dwarf::DW_TAG_subrange_type) {
         const DISubrange *SR = cast<DISubrange>(Element);
-        auto *CI = SR->getCount().dyn_cast<ConstantInt *>();
+        auto *CI = dyn_cast<ConstantInt *>(SR->getCount());
         int64_t Count = CI->getSExtValue();
 
         // For struct s { int b; char c[]; }, the c[] will be represented
@@ -1493,17 +1493,15 @@ void BTFDebug::processGlobals(bool ProcessingMapDef) {
       continue;
 
     // Find or create a DataSec
-    if (DataSecEntries.find(std::string(SecName)) == DataSecEntries.end()) {
-      DataSecEntries[std::string(SecName)] =
-          std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
-    }
+    auto [It, Inserted] = DataSecEntries.try_emplace(std::string(SecName));
+    if (Inserted)
+      It->second = std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
 
     // Calculate symbol size
     const DataLayout &DL = Global.getParent()->getDataLayout();
     uint32_t Size = DL.getTypeAllocSize(Global.getValueType());
 
-    DataSecEntries[std::string(SecName)]->addDataSecEntry(VarId,
-        Asm->getSymbol(&Global), Size);
+    It->second->addDataSecEntry(VarId, Asm->getSymbol(&Global), Size);
   }
 }
 
@@ -1584,14 +1582,12 @@ void BTFDebug::processFuncPrototypes(const Function *F) {
   if (F->hasSection()) {
     StringRef SecName = F->getSection();
 
-    if (DataSecEntries.find(std::string(SecName)) == DataSecEntries.end()) {
-      DataSecEntries[std::string(SecName)] =
-          std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
-    }
+    auto [It, Inserted] = DataSecEntries.try_emplace(std::string(SecName));
+    if (Inserted)
+      It->second = std::make_unique<BTFKindDataSec>(Asm, std::string(SecName));
 
     // We really don't know func size, set it to 0.
-    DataSecEntries[std::string(SecName)]->addDataSecEntry(FuncId,
-        Asm->getSymbol(F), 0);
+    It->second->addDataSecEntry(FuncId, Asm->getSymbol(F), 0);
   }
 }
 
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
index b056d89392b11..1dc53c59c3310 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFInstPrinter.h
@@ -32,7 +32,8 @@ class SBFInstPrinter : public MCInstPrinter {
   void printBrTargetOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
 
   // Autogenerated by tblgen.
-  std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
+  std::pair<const char *, uint64_t>
+  getMnemonic(const MCInst &MI) const override;
   void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);
   static const char *getRegisterName(MCRegister Reg);
 };
diff --git a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
index d74a38d1deb34..8647172a8fd0b 100644
--- a/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+++ b/llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
@@ -19,6 +19,7 @@
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCELFObjectWriter.h"
 #include "llvm/MC/MCELFStreamer.h"
 #include "llvm/MC/MCInstrAnalysis.h"
 #include "llvm/MC/MCInstrInfo.h"
diff --git a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
index 6a85738742e64..1c881a3f6deb2 100644
--- a/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/SBF/SBFAbstractMemberAccess.cpp
@@ -101,13 +101,13 @@ uint32_t SBFCoreSharedInfo::SeqNum;
 Instruction *SBFCoreSharedInfo::insertPassThrough(Module *M, BasicBlock *BB,
                                                   Instruction *Input,
                                                   Instruction *Before) {
-  Function *Fn = Intrinsic::getDeclaration(
+  Function *Fn = Intrinsic::getOrInsertDeclaration(
       M, Intrinsic::bpf_passthrough, {Input->getType(), Input->getType()});
   Constant *SeqNumVal = ConstantInt::get(Type::getInt32Ty(BB->getContext()),
                                          SBFCoreSharedInfo::SeqNum++);
 
   auto *NewInst = CallInst::Create(Fn, {SeqNumVal, Input});
-  NewInst->insertBefore(Before);
+  NewInst->insertBefore(Before->getIterator());
   return NewInst;
 }
 } // namespace llvm
@@ -223,10 +223,9 @@ bool SBFAbstractMemberAccess::run(Function &F) {
 
 void SBFAbstractMemberAccess::ResetMetadata(struct CallInfo &CInfo) {
   if (auto Ty = dyn_cast<DICompositeType>(CInfo.Metadata)) {
-    if (AnonRecords.find(Ty) != AnonRecords.end()) {
-      if (AnonRecords[Ty] != nullptr)
-        CInfo.Metadata = AnonRecords[Ty];
-    }
+    auto It = AnonRecords.find(Ty);
+    if (It != AnonRecords.end() && It->second != nullptr)
+      CInfo.Metadata = It->second;
   }
 }
 
@@ -236,18 +235,13 @@ void SBFAbstractMemberAccess::CheckCompositeType(DIDerivedType *ParentTy,
       ParentTy->getTag() != dwarf::DW_TAG_typedef)
     return;
 
-  if (AnonRecords.find(CTy) == AnonRecords.end()) {
-    AnonRecords[CTy] = ParentTy;
-    return;
-  }
+  auto [It, Inserted] = AnonRecords.try_emplace(CTy, ParentTy);
 
   // Two or more typedef's may point to the same anon record.
   // If this is the case, set the typedef DIType to be nullptr
   // to indicate the duplication case.
-  DIDerivedType *CurrTy = AnonRecords[CTy];
-  if (CurrTy == ParentTy)
-    return;
-  AnonRecords[CTy] = nullptr;
+  if (!Inserted && It->second != ParentTy)
+    It->second = nullptr;
 }
 
 void SBFAbstractMemberAccess::CheckDerivedType(DIDerivedType *ParentTy,
@@ -312,7 +306,7 @@ static uint32_t calcArraySize(const DICompositeType *CTy, uint32_t StartDim) {
     if (auto *Element = dyn_cast_or_null<DINode>(Elements[I]))
       if (Element->getTag() == dwarf::DW_TAG_subrange_type) {
         const DISubrange *SR = cast<DISubrange>(Element);
-        auto *CI = SR->getCount().dyn_cast<ConstantInt *>();
+        auto *CI = dyn_cast<ConstantInt *>(SR->getCount());
         DimSize *= CI->getSExtValue();
       }
   }
@@ -425,7 +419,7 @@ void SBFAbstractMemberAccess::replaceWithGEP(std::vector<CallInst *> &CallList,
     IdxList.push_back(Call->getArgOperand(GEPIndex));
 
     auto *GEP = GetElementPtrInst::CreateInBounds(
-        getBaseElementType(Call), Call->getArgOperand(0), IdxList, "", Call);
+        getBaseElementType(Call), Call->getArgOperand(0), IdxList, "", Call->getIterator());
     Call->replaceAllUsesWith(GEP);
     Call->eraseFromParent();
   }
@@ -1083,9 +1077,9 @@ bool SBFAbstractMemberAccess::transformGEPChain(CallInst *Call,
     // Load the global variable which represents the returned field info.
     LoadInst *LDInst;
     if (IsInt32Ret)
-      LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "", Call);
+      LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "", Call->getIterator());
     else
-      LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+      LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
 
     Instruction *PassThroughInst =
         SBFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
@@ -1105,21 +1099,23 @@ bool SBFAbstractMemberAccess::transformGEPChain(CallInst *Call,
   // The original Call inst is removed.
 
   // Load the global variable.
-  auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+  auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
 
   // Generate a BitCast
   auto *BCInst =
-      new BitCastInst(Base, PointerType::getUnqual(BB->getContext()));
-  BCInst->insertBefore(Call);
+      new BitCastInst(
+          Base, PointerType::get(BB->getContext(),
+                                 Base->getType()->getPointerAddressSpace()));
+  BCInst->insertBefore(Call->getIterator());
 
   // Generate a GetElementPtr
   auto *GEP = GetElementPtrInst::Create(Type::getInt8Ty(BB->getContext()),
                                         BCInst, LDInst);
-  GEP->insertBefore(Call);
+  GEP->insertBefore(Call->getIterator());
 
   // Generate a BitCast
   auto *BCInst2 = new BitCastInst(GEP, Call->getType());
-  BCInst2->insertBefore(Call);
+  BCInst2->insertBefore(Call->getIterator());
 
   // For the following code,
   //    Block0:
diff --git a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
index 15fae26311600..b37cf78c7a8b0 100644
--- a/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
+++ b/llvm/lib/Target/SBF/SBFAsmPrinter.cpp
@@ -14,14 +14,12 @@
 #include "SBF.h"
 #include "SBFInstrInfo.h"
 #include "SBFMCInstLower.h"
-#include "SBFTargetMachine.h"
 #include "BTFDebug.h"
 #include "MCTargetDesc/SBFInstPrinter.h"
 #include "MCTargetDesc/SBFMCTargetDesc.h"
 #include "TargetInfo/SBFTargetInfo.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
-#include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/IR/Module.h"
@@ -70,7 +68,7 @@ bool SBFAsmPrinter::doInitialization(Module &M) {
   if (MAI->doesSupportDebugInformation() && !M.debug_compile_units().empty() &&
       SBFEnableBTFEmission) {
     BTF = new BTFX::BTFDebug(this);
-    DebugHandlers.push_back(std::unique_ptr<BTFX::BTFDebug>(BTF));
+    Handlers.push_back(std::unique_ptr<BTFX::BTFDebug>(BTF));
   }
 
   return false;
diff --git a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
index 7a7b30ae78d17..4313726891005 100644
--- a/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
+++ b/llvm/lib/Target/SBF/SBFCheckAndAdjustIR.cpp
@@ -17,7 +17,6 @@
 
 #include "SBF.h"
 #include "SBFCORE.h"
-#include "SBFTargetMachine.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/Instructions.h"
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.cpp b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
index 2e12afe18ec4a..f8df8175b96cc 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.cpp
@@ -11,15 +11,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "SBFFrameLowering.h"
-#include "SBFInstrInfo.h"
 #include "SBFSubtarget.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
 
 using namespace llvm;
 
-bool SBFFrameLowering::hasFP(const MachineFunction &MF) const { return true; }
+bool SBFFrameLowering::hasFPImpl(const MachineFunction &MF) const { return true; }
 
 void SBFFrameLowering::emitPrologue(MachineFunction &MF,
                                     MachineBasicBlock &MBB) const {
diff --git a/llvm/lib/Target/SBF/SBFFrameLowering.h b/llvm/lib/Target/SBF/SBFFrameLowering.h
index 67f98b77da1ea..192513ca20260 100644
--- a/llvm/lib/Target/SBF/SBFFrameLowering.h
+++ b/llvm/lib/Target/SBF/SBFFrameLowering.h
@@ -30,7 +30,7 @@ class SBFFrameLowering : public TargetFrameLowering {
   void emitPrologue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
   void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const override;
 
-  bool hasFP(const MachineFunction &MF) const override;
+  bool hasFPImpl(const MachineFunction &MF) const override;
   void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,
                             RegScavenger *RS) const override;
 
diff --git a/llvm/lib/Target/SBF/SBFIRPeephole.cpp b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
index 7e0e264d02903..f51de89cc5ad7 100644
--- a/llvm/lib/Target/SBF/SBFIRPeephole.cpp
+++ b/llvm/lib/Target/SBF/SBFIRPeephole.cpp
@@ -16,8 +16,6 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/PassManager.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
 
diff --git a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
index 8488ca4002fff..898bb23c8c425 100644
--- a/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
+++ b/llvm/lib/Target/SBF/SBFISelDAGToDAG.cpp
@@ -12,15 +12,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "SBF.h"
-#include "SBFRegisterInfo.h"
 #include "SBFSubtarget.h"
 #include "SBFTargetMachine.h"
 #include "llvm/CodeGen/FunctionLoweringInfo.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/IntrinsicInst.h"
@@ -28,7 +25,6 @@
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetMachine.h"
 
 using namespace llvm;
 
@@ -293,8 +289,7 @@ void SBFDAGToDAGISel::PreprocessLoad(SDNode *Node,
     SDNode *Op = OpV.getNode();
     if (Op->getOpcode() == ISD::TokenFactor) {
       for (SDNode::use_iterator UI = Node->use_begin(), UE = Node->use_end(); UI != UE; ++UI) {
-        SDUse &Use = UI.getUse();
-        SDNode *User = Use.getUser();
+        SDNode *User = UI->getUser();
         if (User->getOpcode() == ISD::TokenFactor) {
           SmallVector<SDValue, 8> ExtendedOps;
           bool NotExtended = true;
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.cpp b/llvm/lib/Target/SBF/SBFISelLowering.cpp
index 1e775af0c5d21..5ad919e636075 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.cpp
+++ b/llvm/lib/Target/SBF/SBFISelLowering.cpp
@@ -597,13 +597,15 @@ SDValue SBFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
                          InVals);
 }
 
-bool SBFTargetLowering::shouldSignExtendTypeInLibCall(EVT Type, bool IsSigned) const {
-  return IsSigned || Type == MVT::i32;
+bool SBFTargetLowering::shouldSignExtendTypeInLibCall(Type* Ty,
+                                                      bool IsSigned) const {
+  return IsSigned || Ty->isIntegerTy(32);
 }
 
 bool SBFTargetLowering::CanLowerReturn(
     CallingConv::ID CallConv, MachineFunction &MF, bool IsVarArg,
-    const SmallVectorImpl<ISD::OutputArg> &Outs, LLVMContext &Context) const {
+    const SmallVectorImpl<ISD::OutputArg> &Outs, LLVMContext &Context,
+    const Type *RetTy) const {
   // At minimal return Outs.size() <= 1, or check valid types in CC.
   SmallVector<CCValAssign, 16> RVLocs;
   CCState CCInfo(CallConv, IsVarArg, MF, RVLocs, Context);
@@ -751,10 +753,9 @@ SDValue SBFTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
     NegateCC(LHS, RHS, CC);
 
   SDValue TargetCC = DAG.getConstant(CC, DL, LHS.getValueType());
-  SDVTList VTs = DAG.getVTList(Op.getValueType(), MVT::Glue);
   SDValue Ops[] = {LHS, RHS, TargetCC, TrueV, FalseV};
 
-  return DAG.getNode(SBFISD::SELECT_CC, DL, VTs, Ops);
+  return DAG.getNode(SBFISD::SELECT_CC, DL, Op.getValueType(), Ops);
 }
 
 SDValue SBFTargetLowering::LowerATOMICRMW(SDValue Op, SelectionDAG &DAG) const {
diff --git a/llvm/lib/Target/SBF/SBFISelLowering.h b/llvm/lib/Target/SBF/SBFISelLowering.h
index 050f53528ec4f..c7ee065165a54 100644
--- a/llvm/lib/Target/SBF/SBFISelLowering.h
+++ b/llvm/lib/Target/SBF/SBFISelLowering.h
@@ -99,7 +99,7 @@ class SBFTargetLowering : public TargetLowering {
                     SmallVectorImpl<SDValue> &InVals) const override;
 
   /// Returns true if arguments should be sign-extended in lib calls.
-  bool shouldSignExtendTypeInLibCall(EVT Type, bool IsSigned) const override;
+  bool shouldSignExtendTypeInLibCall(Type* Ty, bool IsSigned) const override;
 
   // Lower incoming arguments, copy physregs into vregs
   SDValue LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv,
@@ -111,7 +111,7 @@ class SBFTargetLowering : public TargetLowering {
   bool CanLowerReturn(CallingConv::ID CallConv, MachineFunction &MF,
                         bool IsVarArg,
                         const SmallVectorImpl<ISD::OutputArg> &Outs,
-                        LLVMContext &Context) const override;
+                        LLVMContext &Context, const Type *RetTy) const override;
 
   SDValue LowerReturn(SDValue Chain, CallingConv::ID CallConv, bool IsVarArg,
                       const SmallVectorImpl<ISD::OutputArg> &Outs,
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.cpp b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
index a82e7fa2498b7..ef98d0c9bceff 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.cpp
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.cpp
@@ -73,7 +73,8 @@ void SBFInstrInfo::initializeTargetFeatures(bool HasExplicitSext, bool NewMemEnc
 void SBFInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
                                MachineBasicBlock::iterator I,
                                const DebugLoc &DL, MCRegister DestReg,
-                               MCRegister SrcReg, bool KillSrc) const {
+                               MCRegister SrcReg, bool KillSrc,
+                               bool RenamableDest, bool RenamableSrc) const {
   if (SBF::GPRRegClass.contains(DestReg, SrcReg))
     BuildMI(MBB, I, DL, get(SBF::MOV_rr), DestReg)
         .addReg(SrcReg, getKillRegState(KillSrc));
@@ -93,7 +94,8 @@ void SBFInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
                                        Register SrcReg, bool IsKill, int FI,
                                        const TargetRegisterClass *RC,
                                        const TargetRegisterInfo *TRI,
-                                       Register VReg) const {
+                                       Register VReg,
+                                       MachineInstr::MIFlag Flags) const {
   DebugLoc DL;
   if (I != MBB.end())
     DL = I->getDebugLoc();
@@ -154,7 +156,8 @@ void SBFInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
                                         Register DestReg, int FI,
                                         const TargetRegisterClass *RC,
                                         const TargetRegisterInfo *TRI,
-                                        Register VReg) const {
+                                        Register VReg,
+                                        MachineInstr::MIFlag Flags) const {
   DebugLoc DL;
   if (I != MBB.end())
     DL = I->getDebugLoc();
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.h b/llvm/lib/Target/SBF/SBFInstrInfo.h
index c8c4b678b9818..e3b88039234cf 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.h
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.h
@@ -31,20 +31,21 @@ class SBFInstrInfo : public SBFGenInstrInfo {
 
   void copyPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator I,
                    const DebugLoc &DL, MCRegister DestReg, MCRegister SrcReg,
-                   bool KillSrc) const override;
-
-  void storeRegToStackSlot(MachineBasicBlock &MBB,
-                           MachineBasicBlock::iterator MBBI, Register SrcReg,
-                           bool isKill, int FrameIndex,
-                           const TargetRegisterClass *RC,
-                           const TargetRegisterInfo *TRI,
-                           Register VReg) const override;
-
-  void loadRegFromStackSlot(MachineBasicBlock &MBB,
-                            MachineBasicBlock::iterator MBBI, Register DestReg,
-                            int FrameIndex, const TargetRegisterClass *RC,
-                            const TargetRegisterInfo *TRI,
-                            Register VReg) const override;
+                   bool KillSrc, bool RenamableDest = false,
+                   bool RenamableSrc = false) const override;
+
+  void storeRegToStackSlot(
+      MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, Register SrcReg,
+      bool isKill, int FrameIndex, const TargetRegisterClass *RC,
+      const TargetRegisterInfo *TRI, Register VReg,
+      MachineInstr::MIFlag Flags = MachineInstr::NoFlags) const override;
+
+  void loadRegFromStackSlot(
+      MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
+      Register DestReg, int FrameIndex, const TargetRegisterClass *RC,
+      const TargetRegisterInfo *TRI, Register VReg,
+      MachineInstr::MIFlag Flags = MachineInstr::NoFlags) const override;
+
   bool analyzeBranch(MachineBasicBlock &MBB, MachineBasicBlock *&TBB,
                      MachineBasicBlock *&FBB,
                      SmallVectorImpl<MachineOperand> &Cond,
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
index b020ce38a9d46..fff20cbd9ded7 100644
--- a/llvm/lib/Target/SBF/SBFInstrInfo.td
+++ b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -41,7 +41,7 @@ def SBFcallseq_end  : SDNode<"ISD::CALLSEQ_END",   SDT_SBFCallSeqEnd,
 def SBFbrcc         : SDNode<"SBFISD::BR_CC", SDT_SBFBrCC,
                              [SDNPHasChain, SDNPOutGlue, SDNPInGlue]>;
 
-def SBFselectcc     : SDNode<"SBFISD::SELECT_CC", SDT_SBFSelectCC, [SDNPInGlue]>;
+def SBFselectcc     : SDNode<"SBFISD::SELECT_CC", SDT_SBFSelectCC>;
 def SBFWrapper      : SDNode<"SBFISD::Wrapper", SDT_SBFWrapper>;
 def SBFHasALU32 : Predicate<"Subtarget->getHasAlu32()">;
 def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
diff --git a/llvm/lib/Target/SBF/SBFMIChecking.cpp b/llvm/lib/Target/SBF/SBFMIChecking.cpp
index c224aeeff8326..576aca11db71b 100644
--- a/llvm/lib/Target/SBF/SBFMIChecking.cpp
+++ b/llvm/lib/Target/SBF/SBFMIChecking.cpp
@@ -15,10 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SBF.h"
-#include "SBFInstrInfo.h"
 #include "SBFTargetMachine.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/Support/Debug.h"
 
 using namespace llvm;
diff --git a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
index de5b217fe549d..8c5dcbb37b2da 100644
--- a/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
+++ b/llvm/lib/Target/SBF/SBFPreserveDIType.cpp
@@ -19,10 +19,8 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/IR/Type.h"
-#include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
 
 #define DEBUG_TYPE "sbf-preserve-di-type"
 
@@ -114,7 +112,7 @@ static bool SBFPreserveDITypeImpl(Function &F) {
 
     // Load the global variable which represents the type info.
     auto *LDInst =
-        new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+        new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
     Instruction *PassThroughInst =
         SBFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
     Call->replaceAllUsesWith(PassThroughInst);
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.cpp b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
index baf1b81670081..36128b388cc30 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.cpp
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.cpp
@@ -22,7 +22,6 @@
 #include "llvm/IR/PassManager.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Passes/PassBuilder.h"
-#include "llvm/Support/FormattedStream.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Scalar/SimplifyCFG.h"
@@ -63,7 +62,7 @@ SBFTargetMachine::SBFTargetMachine(const Target &T, const Triple &TT,
                                    std::optional<Reloc::Model> RM,
                                    std::optional<CodeModel::Model> CM,
                                    CodeGenOptLevel OL, bool JIT)
-    : LLVMTargetMachine(T, computeDataLayout(TT, FS), TT, CPU, FS, Options,
+    : CodeGenTargetMachineImpl(T, computeDataLayout(TT, FS), TT, CPU, FS, Options,
                         getEffectiveRelocModel(RM),
                         getEffectiveCodeModel(CM, CodeModel::Small), OL),
       TLOF(std::make_unique<TargetLoweringObjectFileELF>()),
diff --git a/llvm/lib/Target/SBF/SBFTargetMachine.h b/llvm/lib/Target/SBF/SBFTargetMachine.h
index fe4b7922685a2..80c06b4cfde81 100644
--- a/llvm/lib/Target/SBF/SBFTargetMachine.h
+++ b/llvm/lib/Target/SBF/SBFTargetMachine.h
@@ -14,10 +14,10 @@
 #define LLVM_LIB_TARGET_SBF_SBFTARGETMACHINE_H
 
 #include "SBFSubtarget.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/CodeGen/CodeGenTargetMachineImpl.h"
 
 namespace llvm {
-class SBFTargetMachine : public LLVMTargetMachine {
+class SBFTargetMachine : public CodeGenTargetMachineImpl {
   std::unique_ptr<TargetLoweringObjectFile> TLOF;
   SBFSubtarget Subtarget;
 
diff --git a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
index e7ff4ea889680..fd684ff36cf96 100644
--- a/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
+++ b/llvm/lib/Target/SBF/SBFTargetTransformInfo.h
@@ -54,23 +54,24 @@ class SBFTTIImpl : public BasicTTIImplBase<SBFTTIImpl> {
     return false;
   }
 
-  InstructionCost getCmpSelInstrCost(unsigned Opcode, Type *ValTy, Type *CondTy,
-                                     CmpInst::Predicate VecPred,
-                                     TTI::TargetCostKind CostKind,
-                                     const llvm::Instruction *I = nullptr) {
+  InstructionCost getCmpSelInstrCost(
+      unsigned Opcode, Type *ValTy, Type *CondTy, CmpInst::Predicate VecPred,
+      TTI::TargetCostKind CostKind,
+      TTI::OperandValueInfo Op1Info = {TTI::OK_AnyValue, TTI::OP_None},
+      TTI::OperandValueInfo Op2Info = {TTI::OK_AnyValue, TTI::OP_None},
+      const llvm::Instruction *I = nullptr) {
     if (Opcode == Instruction::Select)
       return SCEVCheapExpansionBudget.getValue();
 
     return BaseT::getCmpSelInstrCost(Opcode, ValTy, CondTy, VecPred, CostKind,
-                                     I);
+                                     Op1Info, Op2Info, I);
   }
 
   InstructionCost getArithmeticInstrCost(
       unsigned Opcode, Type *Ty, TTI::TargetCostKind CostKind,
       TTI::OperandValueInfo Op1Info = {TTI::OK_AnyValue, TTI::OP_None},
       TTI::OperandValueInfo Op2Info = {TTI::OK_AnyValue, TTI::OP_None},
-    ArrayRef<const Value *> Args = ArrayRef<const Value *>(),
-    const Instruction *CxtI = nullptr) {
+    ArrayRef<const Value *> Args = {}, const Instruction *CxtI = nullptr) {
     int ISDOpcode = TLI->InstructionOpcodeToISD(Opcode);
     
     if ((ISDOpcode == ISD::ADD && CostKind == TTI::TCK_RecipThroughput) ||
diff --git a/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp b/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
index 691fc5ab3ec20..474bf413195f3 100644
--- a/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
+++ b/llvm/unittests/Target/SBF/SBFInstrInfoTest.cpp
@@ -62,7 +62,7 @@ class SBFInstrInfoTest : public testing::TestWithParam<const char *> {
         TM->getTargetTriple(), TM->getTargetCPU().str(),
         TM->getTargetFeatureString().str(), *TM);
 
-    MF = std::make_unique<MachineFunction>(*F, *TM, *ST, 42, *MMI);
+    MF = std::make_unique<MachineFunction>(*F, *TM, *ST, MMI->getContext(), 42);
   }
 };
 

From 6ac3c31136a9d867a1e274ca74d477ee1991944d Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 12:05:18 -0300
Subject: [PATCH 102/114] Fix LLVM CI

---
 .github/workflows/premerge.yaml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 9b6a1236823d7..6dd5906223e0c 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -25,10 +25,8 @@ concurrency:
 
 jobs:
   premerge-checks-linux:
-    if: >-
-        false && github.repository_owner == 'llvm' &&
-        (github.event_name != 'pull_request' || github.event.action != 'closed')
-    runs-on: llvm-premerge-linux-runners
+    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout LLVM
         uses: actions/checkout@v4
@@ -83,10 +81,8 @@ jobs:
           ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
 
   premerge-checks-windows:
-    if: >-
-        false && github.repository_owner == 'llvm' &&
-        (github.event_name != 'pull_request' || github.event.action != 'closed')
-    runs-on: llvm-premerge-windows-runners
+    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
+    runs-on: windows-2022
     defaults:
       run:
         shell: bash
@@ -144,11 +140,7 @@ jobs:
 
   permerge-check-macos:
     runs-on: macos-14
-    if: >-
-      github.repository_owner == 'llvm' &&
-      (startswith(github.ref_name, 'release/') ||
-       startswith(github.base_ref, 'release/')) &&
-      (github.event_name != 'pull_request' || github.event.action != 'closed')
+    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
     steps:
       - name: Checkout LLVM
         uses: actions/checkout@v4

From a54452a9a6c5970d55aa877be6884cc4c75952be Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 12:10:19 -0300
Subject: [PATCH 103/114] Change CXX flags

---
 .github/workflows/premerge.yaml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 6dd5906223e0c..4bcfca214ce28 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -37,12 +37,6 @@ jobs:
         with:
           max-size: "2000M"
       - name: Build and Test
-        # Mark the job as a success even if the step fails so that people do
-        # not get notified while the new premerge pipeline is in an
-        # experimental state.
-        # TODO(boomanaiden154): Remove this once the pipeline is stable and we
-        # are ready for people to start recieving notifications.
-        continue-on-error: true
         run: |
           git config --global --add safe.directory '*'
 
@@ -75,8 +69,8 @@ jobs:
           echo "Building runtimes: ${linux_runtimes}"
           echo "Running runtimes checks targets: ${linux_runtime_check_targets}"
 
-          export CC=/opt/llvm/bin/clang
-          export CXX=/opt/llvm/bin/clang++
+          export CC=clang
+          export CXX=clang++
 
           ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
 
@@ -124,12 +118,6 @@ jobs:
           echo "windows-projects=${windows_projects}" >> $GITHUB_OUTPUT
           echo "windows-check-targets=${windows_check_targets}" >> $GITHUB_OUTPUT
       - name: Build and Test
-        # Mark the job as a success even if the step fails so that people do
-        # not get notified while the new premerge pipeline is in an
-        # experimental state.
-        # TODO(boomanaiden154): Remove this once the pipeline is stable and we
-        # are ready for people to start recieving notifications.
-        continue-on-error: true
         if: ${{ steps.vars.outputs.windows-projects != '' }}
         shell: cmd
         run: |

From f9f17ad4076810d609e8ca73e0971e2594d42893 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 12:15:11 -0300
Subject: [PATCH 104/114] Fix windows flags

---
 .ci/monolithic-windows.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index 57b276f3e1df0..f9c7d4436fba5 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -50,8 +50,8 @@ echo "--- cmake"
 pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
 pip install -q -r "${MONOREPO_ROOT}"/.ci/requirements.txt
 
-export CC=cl
-export CXX=cl
+export CC=clang
+export CXX=clang++
 export LD=link
 
 # The CMAKE_*_LINKER_FLAGS to disable the manifest come from research

From 1be89aa415e7d2042a32bbd6f1e8ca47181bc75e Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 15:33:20 -0300
Subject: [PATCH 105/114] Remove windows

---
 .github/workflows/premerge.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 4bcfca214ce28..e4270026f0afa 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -75,7 +75,9 @@ jobs:
           ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
 
   premerge-checks-windows:
-    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
+    if: >-
+      false && github.repository_owner == 'llvm' &&
+      (github.event_name != 'pull_request' || github.event.action != 'closed')
     runs-on: windows-2022
     defaults:
       run:

From 1313d592495f93153acdda9bf4340b0aff8fff06 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 17:43:21 -0300
Subject: [PATCH 106/114] Remove extra projects from CI

---
 .github/workflows/premerge.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index e4270026f0afa..5c8ccef540b19 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -48,7 +48,7 @@ jobs:
 
           . ./.ci/compute-projects.sh
 
-          all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl"
+          all_projects="clang lld lldb llvm"
           modified_projects="$(keep-modified-projects ${all_projects})"
 
           linux_projects_to_test=$(exclude-linux $(compute-projects-to-test 0 ${modified_projects}))
@@ -152,7 +152,7 @@ jobs:
 
           . ./.ci/compute-projects.sh
 
-          all_projects="clang clang-tools-extra lld lldb llvm mlir"
+          all_projects="clang lld lldb llvm"
           modified_projects="$(keep-modified-projects ${all_projects})"
 
           # We have to disable the runtimes builds due to https://github.com/llvm/llvm-project/issues/90568

From 8571222680c895e63a01e69b0dcf5d692b46e1da Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 18:15:01 -0300
Subject: [PATCH 107/114] Limit scope

---
 .github/workflows/premerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 5c8ccef540b19..013ed0f1ca48d 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -49,7 +49,7 @@ jobs:
           . ./.ci/compute-projects.sh
 
           all_projects="clang lld lldb llvm"
-          modified_projects="$(keep-modified-projects ${all_projects})"
+          modified_projects="${all_projects})"
 
           linux_projects_to_test=$(exclude-linux $(compute-projects-to-test 0 ${modified_projects}))
           linux_check_targets=$(check-targets ${linux_projects_to_test} | sort | uniq)

From aadc2c11cdd3844f9bcc76718e5c8c474c015130 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Fri, 15 Aug 2025 18:19:50 -0300
Subject: [PATCH 108/114] Change

---
 .github/workflows/premerge.yaml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 013ed0f1ca48d..d5a5d6c3cc25b 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -48,16 +48,10 @@ jobs:
 
           . ./.ci/compute-projects.sh
 
-          all_projects="clang lld lldb llvm"
-          modified_projects="${all_projects})"
-
-          linux_projects_to_test=$(exclude-linux $(compute-projects-to-test 0 ${modified_projects}))
-          linux_check_targets=$(check-targets ${linux_projects_to_test} | sort | uniq)
-          linux_projects=$(add-dependencies ${linux_projects_to_test} | sort | uniq)
-
-          linux_runtimes_to_test=$(compute-runtimes-to-test ${linux_projects_to_test})
-          linux_runtime_check_targets=$(check-targets ${linux_runtimes_to_test} | sort | uniq)
-          linux_runtimes=$(echo ${linux_runtimes_to_test} | sort | uniq)
+          linux_projects="clang lld lldb llvm"
+          linux_check_targets="check-clang check-lld check-lldb check-llvm"
+          linux_runtimes=""
+          linux_runtime_check_targets=""
 
           if [[ "${linux_projects}" == "" ]]; then
             echo "No projects to build"

From 92f0f6f3f391bce81527652dcb242a48594b63a8 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Mon, 18 Aug 2025 16:21:02 -0300
Subject: [PATCH 109/114] Free up space in github runner

---
 .github/workflows/premerge.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index d5a5d6c3cc25b..2a4e699fe96cc 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -28,6 +28,12 @@ jobs:
     if: (github.event_name != 'pull_request' || github.event.action != 'closed')
     runs-on: ubuntu-22.04
     steps:
+      - name: Free up space in Github runner
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 512
+          swap-size-mb: 1024
+          remove-dotnet: 'true'
       - name: Checkout LLVM
         uses: actions/checkout@v4
         with:

From 89066ea8d8ca2678cf86790bcc6bd9f646315443 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Mon, 18 Aug 2025 19:39:49 -0300
Subject: [PATCH 110/114] Configure clean job

---
 .github/workflows/premerge.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 2a4e699fe96cc..d120241546be3 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -31,9 +31,10 @@ jobs:
       - name: Free up space in Github runner
         uses: easimon/maximize-build-space@master
         with:
-          root-reserve-mb: 512
-          swap-size-mb: 1024
           remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
       - name: Checkout LLVM
         uses: actions/checkout@v4
         with:

From 37a62a361d64d4caf926557fca06c36782b2b7b3 Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Mon, 18 Aug 2025 19:45:28 -0300
Subject: [PATCH 111/114] Adjust CI

---
 .github/workflows/premerge.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index d120241546be3..d6f4b7666e461 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -43,6 +43,10 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2.14
         with:
           max-size: "2000M"
+      - name: Print free space
+        run: |
+          echo "Free space:"
+          df -h
       - name: Build and Test
         run: |
           git config --global --add safe.directory '*'

From 91e9a5bc14df04da4e26c909e7058a2d2b6b6c2e Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Tue, 19 Aug 2025 16:03:20 -0300
Subject: [PATCH 112/114] Tweak more

---
 .github/workflows/premerge.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index d6f4b7666e461..0f7def312d68c 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,6 +35,7 @@ jobs:
           remove-android: 'true'
           remove-haskell: 'true'
           remove-codeql: 'true'
+          root-reserve-mb: 2048
       - name: Checkout LLVM
         uses: actions/checkout@v4
         with:
@@ -42,7 +43,7 @@ jobs:
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2.14
         with:
-          max-size: "2000M"
+          max-size: "1500M"
       - name: Print free space
         run: |
           echo "Free space:"

From fe015e629b167b51197a698194ceb503fd6e36dd Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Wed, 20 Aug 2025 11:27:53 -0300
Subject: [PATCH 113/114] Split workflows

---
 .github/workflows/premerge.yaml | 176 +++++++++++++++++++++++++++++++-
 1 file changed, 173 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 0f7def312d68c..c6bc268e4f8f6 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -24,7 +24,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  premerge-checks-linux:
+  premerge-checks-linux-clang:
     if: (github.event_name != 'pull_request' || github.event.action != 'closed')
     runs-on: ubuntu-22.04
     steps:
@@ -60,8 +60,8 @@ jobs:
 
           . ./.ci/compute-projects.sh
 
-          linux_projects="clang lld lldb llvm"
-          linux_check_targets="check-clang check-lld check-lldb check-llvm"
+          linux_projects="clang"
+          linux_check_targets="check-clang"
           linux_runtimes=""
           linux_runtime_check_targets=""
 
@@ -80,6 +80,176 @@ jobs:
 
           ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
 
+  premerge-checks-linux-lld:
+    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Free up space in Github runner
+        uses: easimon/maximize-build-space@master
+        with:
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          root-reserve-mb: 2048
+      - name: Checkout LLVM
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2.14
+        with:
+          max-size: "1500M"
+      - name: Print free space
+        run: |
+          echo "Free space:"
+          df -h
+      - name: Build and Test
+        run: |
+          git config --global --add safe.directory '*'
+
+          modified_files=$(git diff --name-only HEAD~1...HEAD)
+          modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)
+
+          echo $modified_files
+          echo $modified_dirs
+
+          . ./.ci/compute-projects.sh
+
+          linux_projects="lld"
+          linux_check_targets="check-lld"
+          linux_runtimes=""
+          linux_runtime_check_targets=""
+
+          if [[ "${linux_projects}" == "" ]]; then
+            echo "No projects to build"
+            exit 0
+          fi
+
+          echo "Building projects: ${linux_projects}"
+          echo "Running project checks targets: ${linux_check_targets}"
+          echo "Building runtimes: ${linux_runtimes}"
+          echo "Running runtimes checks targets: ${linux_runtime_check_targets}"
+
+          export CC=clang
+          export CXX=clang++
+
+          ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
+
+  premerge-checks-linux-llvm:
+    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Free up space in Github runner
+        uses: easimon/maximize-build-space@master
+        with:
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          root-reserve-mb: 2048
+      - name: Checkout LLVM
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2.14
+        with:
+          max-size: "1500M"
+      - name: Print free space
+        run: |
+          echo "Free space:"
+          df -h
+      - name: Build and Test
+        run: |
+          git config --global --add safe.directory '*'
+
+          modified_files=$(git diff --name-only HEAD~1...HEAD)
+          modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)
+
+          echo $modified_files
+          echo $modified_dirs
+
+          . ./.ci/compute-projects.sh
+
+          linux_projects="llvm"
+          linux_check_targets="check-llvm"
+          linux_runtimes=""
+          linux_runtime_check_targets=""
+
+          if [[ "${linux_projects}" == "" ]]; then
+            echo "No projects to build"
+            exit 0
+          fi
+
+          echo "Building projects: ${linux_projects}"
+          echo "Running project checks targets: ${linux_check_targets}"
+          echo "Building runtimes: ${linux_runtimes}"
+          echo "Running runtimes checks targets: ${linux_runtime_check_targets}"
+
+          export CC=clang
+          export CXX=clang++
+
+          ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
+          
+
+  premerge-checks-linux-lldb:
+    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Free up space in Github runner
+        uses: easimon/maximize-build-space@master
+        with:
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          root-reserve-mb: 2048
+      - name: Checkout LLVM
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2.14
+        with:
+          max-size: "1500M"
+      - name: Print free space
+        run: |
+          echo "Free space:"
+          df -h
+      - name: Build and Test
+        run: |
+          git config --global --add safe.directory '*'
+
+          modified_files=$(git diff --name-only HEAD~1...HEAD)
+          modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)
+
+          echo $modified_files
+          echo $modified_dirs
+
+          . ./.ci/compute-projects.sh
+
+          linux_projects="lldb"
+          linux_check_targets="check-lldb"
+          linux_runtimes=""
+          linux_runtime_check_targets=""
+
+          if [[ "${linux_projects}" == "" ]]; then
+            echo "No projects to build"
+            exit 0
+          fi
+
+          echo "Building projects: ${linux_projects}"
+          echo "Running project checks targets: ${linux_check_targets}"
+          echo "Building runtimes: ${linux_runtimes}"
+          echo "Running runtimes checks targets: ${linux_runtime_check_targets}"
+
+          export CC=clang
+          export CXX=clang++
+
+          ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
+          
+
   premerge-checks-windows:
     if: >-
       false && github.repository_owner == 'llvm' &&

From 2ddd26a876d39886d4c1a12ea7c52db5682f355b Mon Sep 17 00:00:00 2001
From: Lucas Steuernagel <lucas.tnagel@gmail.com>
Date: Wed, 20 Aug 2025 11:34:45 -0300
Subject: [PATCH 114/114] Merge two tests

---
 .github/workflows/premerge.yaml | 62 ++-------------------------------
 1 file changed, 2 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index c6bc268e4f8f6..006d024fc84c7 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -60,8 +60,8 @@ jobs:
 
           . ./.ci/compute-projects.sh
 
-          linux_projects="clang"
-          linux_check_targets="check-clang"
+          linux_projects="clang lldb"
+          linux_check_targets="check-clang check-lldb"
           linux_runtimes=""
           linux_runtime_check_targets=""
 
@@ -191,64 +191,6 @@ jobs:
           export CXX=clang++
 
           ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
-          
-
-  premerge-checks-linux-lldb:
-    if: (github.event_name != 'pull_request' || github.event.action != 'closed')
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Free up space in Github runner
-        uses: easimon/maximize-build-space@master
-        with:
-          remove-dotnet: 'true'
-          remove-android: 'true'
-          remove-haskell: 'true'
-          remove-codeql: 'true'
-          root-reserve-mb: 2048
-      - name: Checkout LLVM
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1.2.14
-        with:
-          max-size: "1500M"
-      - name: Print free space
-        run: |
-          echo "Free space:"
-          df -h
-      - name: Build and Test
-        run: |
-          git config --global --add safe.directory '*'
-
-          modified_files=$(git diff --name-only HEAD~1...HEAD)
-          modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)
-
-          echo $modified_files
-          echo $modified_dirs
-
-          . ./.ci/compute-projects.sh
-
-          linux_projects="lldb"
-          linux_check_targets="check-lldb"
-          linux_runtimes=""
-          linux_runtime_check_targets=""
-
-          if [[ "${linux_projects}" == "" ]]; then
-            echo "No projects to build"
-            exit 0
-          fi
-
-          echo "Building projects: ${linux_projects}"
-          echo "Running project checks targets: ${linux_check_targets}"
-          echo "Building runtimes: ${linux_runtimes}"
-          echo "Running runtimes checks targets: ${linux_runtime_check_targets}"
-
-          export CC=clang
-          export CXX=clang++
-
-          ./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
-          
 
   premerge-checks-windows:
     if: >-