[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
anza-xyz · Dec 11, 2024 · 59716aa · 59716aa
1 parent f082558
commit 59716aa
Show file tree

Hide file tree

Showing 37 changed files with 132 additions and 145 deletions.
diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   build-ci-container:
     if: github.repository_owner == 'llvm'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
     steps:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -49,7 +49,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-release-workflow.yml b/.github/workflows/issue-release-workflow.yml
@@ -32,7 +32,7 @@ env:
 jobs:
   backport-commits:
     name: Backport Commits
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: >-
       (github.repository == 'llvm/llvm-project') &&
       !startswith(github.event.comment.body, '<!--IGNORE-->') &&
@@ -66,7 +66,7 @@ jobs:
 
   create-pull-request:
     name: Create Pull Request
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: >-
       (github.repository == 'llvm/llvm-project') &&
       !startswith(github.event.comment.body, '<!--IGNORE-->') &&

diff --git 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
@@ -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:
@@ -137,7 +137,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/libclang-python-tests.yml b/.github/workflows/libclang-python-tests.yml
@@ -43,5 +43,5 @@ jobs:
       projects: clang
       # There is an issue running on "windows-2019".
       # See https://github.com/llvm/llvm-project/issues/76601#issuecomment-1873049082.
-      os_list: '["ubuntu-latest"]'
+      os_list: '["ubuntu-22.04"]'
       python_version: ${{ matrix.python-version }}
diff --git 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
@@ -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@v3

diff --git 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
@@ -39,7 +39,7 @@ on:
         type: string
         # Use windows-2019 due to:
         # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
-        default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
+        default: '["ubuntu-22.04", "windows-2019", "macOS-13"]'
 
       python_version:
         required: false
@@ -66,7 +66,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
@@ -56,7 +56,7 @@ 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 }}
@@ -100,7 +100,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:
@@ -170,7 +170,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
@@ -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
@@ -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-code-format.yml b/.github/workflows/pr-code-format.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   code_formatter:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'llvm/llvm-project'
     steps:
       - name: Fetch LLVM sources

diff --git a/.github/workflows/pr-request-release-note.yml b/.github/workflows/pr-request-release-note.yml
@@ -15,7 +15,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
@@ -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
@@ -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
@@ -29,7 +29,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
@@ -21,7 +21,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
@@ -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 }}
@@ -26,7 +26,7 @@ jobs:
 
   release-create:
     name: Create a New Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: validate-tag
 
     steps:

diff --git 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/spirv-tests.yml b/.github/workflows/spirv-tests.yml
@@ -26,4 +26,4 @@ jobs:
       build_target: check-llvm-codegen-spirv
       projects:
       extra_cmake_args: '-DLLVM_TARGETS_TO_BUILD="" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="SPIRV"'
-      os_list: '["ubuntu-latest"]'
+      os_list: '["ubuntu-22.04"]'
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;