[NFC][PowerPC] clang-format spill and restore opcodes #141675
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-backend-powerpc Author: Lei Huang (lei137) ChangesReformat spill and restore opCode lists. Full diff: https://github.com/llvm/llvm-project/pull/141675.diff 1 Files Affected:
diff --git a/llvm/lib/Target/PowerPC/PPCInstrInfo.h b/llvm/lib/Target/PowerPC/PPCInstrInfo.h
index 83bc39e0c06bd..0f4699c337d88 100644
--- a/llvm/lib/Target/PowerPC/PPCInstrInfo.h
+++ b/llvm/lib/Target/PowerPC/PPCInstrInfo.h
@@ -102,68 +102,157 @@ enum PPCMachineCombinerPattern : unsigned {
// Define list of load and store spill opcodes.
#define NoInstr PPC::INSTRUCTION_LIST_END
#define Pwr8LoadOpcodes \
- { \
- PPC::LWZ, PPC::LD, PPC::LFD, PPC::LFS, PPC::RESTORE_CR, \
- PPC::RESTORE_CRBIT, PPC::LVX, PPC::LXVD2X, PPC::LXSDX, PPC::LXSSPX, \
- PPC::SPILLTOVSR_LD, NoInstr, NoInstr, NoInstr, NoInstr, PPC::EVLDD, \
- PPC::RESTORE_QUADWORD \
- }
+ {PPC::LWZ, \
+ PPC::LD, \
+ PPC::LFD, \
+ PPC::LFS, \
+ PPC::RESTORE_CR, \
+ PPC::RESTORE_CRBIT, \
+ PPC::LVX, \
+ PPC::LXVD2X, \
+ PPC::LXSDX, \
+ PPC::LXSSPX, \
+ PPC::SPILLTOVSR_LD, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ PPC::EVLDD, \
+ PPC::RESTORE_QUADWORD}
#define Pwr9LoadOpcodes \
- { \
- PPC::LWZ, PPC::LD, PPC::LFD, PPC::LFS, PPC::RESTORE_CR, \
- PPC::RESTORE_CRBIT, PPC::LVX, PPC::LXV, PPC::DFLOADf64, \
- PPC::DFLOADf32, PPC::SPILLTOVSR_LD, NoInstr, NoInstr, NoInstr, \
- NoInstr, NoInstr, PPC::RESTORE_QUADWORD \
- }
+ {PPC::LWZ, \
+ PPC::LD, \
+ PPC::LFD, \
+ PPC::LFS, \
+ PPC::RESTORE_CR, \
+ PPC::RESTORE_CRBIT, \
+ PPC::LVX, \
+ PPC::LXV, \
+ PPC::DFLOADf64, \
+ PPC::DFLOADf32, \
+ PPC::SPILLTOVSR_LD, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ PPC::RESTORE_QUADWORD}
#define Pwr10LoadOpcodes \
- { \
- PPC::LWZ, PPC::LD, PPC::LFD, PPC::LFS, PPC::RESTORE_CR, \
- PPC::RESTORE_CRBIT, PPC::LVX, PPC::LXV, PPC::DFLOADf64, \
- PPC::DFLOADf32, PPC::SPILLTOVSR_LD, PPC::LXVP, PPC::RESTORE_ACC, \
- PPC::RESTORE_UACC, NoInstr, NoInstr, PPC::RESTORE_QUADWORD \
- }
+ {PPC::LWZ, \
+ PPC::LD, \
+ PPC::LFD, \
+ PPC::LFS, \
+ PPC::RESTORE_CR, \
+ PPC::RESTORE_CRBIT, \
+ PPC::LVX, \
+ PPC::LXV, \
+ PPC::DFLOADf64, \
+ PPC::DFLOADf32, \
+ PPC::SPILLTOVSR_LD, \
+ PPC::LXVP, \
+ PPC::RESTORE_ACC, \
+ PPC::RESTORE_UACC, \
+ NoInstr, \
+ NoInstr, \
+ PPC::RESTORE_QUADWORD}
#define FutureLoadOpcodes \
- { \
- PPC::LWZ, PPC::LD, PPC::LFD, PPC::LFS, PPC::RESTORE_CR, \
- PPC::RESTORE_CRBIT, PPC::LVX, PPC::LXV, PPC::DFLOADf64, \
- PPC::DFLOADf32, PPC::SPILLTOVSR_LD, PPC::LXVP, PPC::RESTORE_ACC, \
- PPC::RESTORE_UACC, PPC::RESTORE_WACC, NoInstr, PPC::RESTORE_QUADWORD \
- }
+ {PPC::LWZ, \
+ PPC::LD, \
+ PPC::LFD, \
+ PPC::LFS, \
+ PPC::RESTORE_CR, \
+ PPC::RESTORE_CRBIT, \
+ PPC::LVX, \
+ PPC::LXV, \
+ PPC::DFLOADf64, \
+ PPC::DFLOADf32, \
+ PPC::SPILLTOVSR_LD, \
+ PPC::LXVP, \
+ PPC::RESTORE_ACC, \
+ PPC::RESTORE_UACC, \
+ PPC::RESTORE_WACC, \
+ NoInstr, \
+ PPC::RESTORE_QUADWORD}
#define Pwr8StoreOpcodes \
- { \
- PPC::STW, PPC::STD, PPC::STFD, PPC::STFS, PPC::SPILL_CR, PPC::SPILL_CRBIT, \
- PPC::STVX, PPC::STXVD2X, PPC::STXSDX, PPC::STXSSPX, \
- PPC::SPILLTOVSR_ST, NoInstr, NoInstr, NoInstr, NoInstr, PPC::EVSTDD, \
- PPC::SPILL_QUADWORD \
- }
+ {PPC::STW, \
+ PPC::STD, \
+ PPC::STFD, \
+ PPC::STFS, \
+ PPC::SPILL_CR, \
+ PPC::SPILL_CRBIT, \
+ PPC::STVX, \
+ PPC::STXVD2X, \
+ PPC::STXSDX, \
+ PPC::STXSSPX, \
+ PPC::SPILLTOVSR_ST, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ PPC::EVSTDD, \
+ PPC::SPILL_QUADWORD}
#define Pwr9StoreOpcodes \
- { \
- PPC::STW, PPC::STD, PPC::STFD, PPC::STFS, PPC::SPILL_CR, PPC::SPILL_CRBIT, \
- PPC::STVX, PPC::STXV, PPC::DFSTOREf64, PPC::DFSTOREf32, \
- PPC::SPILLTOVSR_ST, NoInstr, NoInstr, NoInstr, NoInstr, NoInstr, \
- PPC::SPILL_QUADWORD \
- }
+ {PPC::STW, \
+ PPC::STD, \
+ PPC::STFD, \
+ PPC::STFS, \
+ PPC::SPILL_CR, \
+ PPC::SPILL_CRBIT, \
+ PPC::STVX, \
+ PPC::STXV, \
+ PPC::DFSTOREf64, \
+ PPC::DFSTOREf32, \
+ PPC::SPILLTOVSR_ST, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ NoInstr, \
+ PPC::SPILL_QUADWORD}
#define Pwr10StoreOpcodes \
- { \
- PPC::STW, PPC::STD, PPC::STFD, PPC::STFS, PPC::SPILL_CR, PPC::SPILL_CRBIT, \
- PPC::STVX, PPC::STXV, PPC::DFSTOREf64, PPC::DFSTOREf32, \
- PPC::SPILLTOVSR_ST, PPC::STXVP, PPC::SPILL_ACC, PPC::SPILL_UACC, \
- NoInstr, NoInstr, PPC::SPILL_QUADWORD \
- }
+ {PPC::STW, \
+ PPC::STD, \
+ PPC::STFD, \
+ PPC::STFS, \
+ PPC::SPILL_CR, \
+ PPC::SPILL_CRBIT, \
+ PPC::STVX, \
+ PPC::STXV, \
+ PPC::DFSTOREf64, \
+ PPC::DFSTOREf32, \
+ PPC::SPILLTOVSR_ST, \
+ PPC::STXVP, \
+ PPC::SPILL_ACC, \
+ PPC::SPILL_UACC, \
+ NoInstr, \
+ NoInstr, \
+ PPC::SPILL_QUADWORD}
#define FutureStoreOpcodes \
- { \
- PPC::STW, PPC::STD, PPC::STFD, PPC::STFS, PPC::SPILL_CR, PPC::SPILL_CRBIT, \
- PPC::STVX, PPC::STXV, PPC::DFSTOREf64, PPC::DFSTOREf32, \
- PPC::SPILLTOVSR_ST, PPC::STXVP, PPC::SPILL_ACC, PPC::SPILL_UACC, \
- PPC::SPILL_WACC, NoInstr, PPC::SPILL_QUADWORD \
- }
+ {NoInstr, \
+ PPC::STW, \
+ PPC::STD, \
+ PPC::STFD, \
+ PPC::STFS, \
+ PPC::SPILL_CR, \
+ PPC::SPILL_CRBIT, \
+ PPC::STVX, \
+ PPC::STXV, \
+ PPC::DFSTOREf64, \
+ PPC::DFSTOREf32, \
+ PPC::SPILLTOVSR_ST, \
+ PPC::STXVP, \
+ PPC::SPILL_ACC, \
+ PPC::SPILL_UACC, \
+ PPC::SPILL_WACC, \
+ NoInstr, \
+ PPC::SPILL_QUADWORD}
// Initialize arrays for load and store spill opcodes on supported subtargets.
#define StoreOpcodesForSpill \
|
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions h -- llvm/lib/Target/PowerPC/PPCInstrInfo.hView the diff from clang-format here.diff --git a/llvm/lib/Target/PowerPC/PPCInstrInfo.h b/llvm/lib/Target/PowerPC/PPCInstrInfo.h
index d0db90b02..18d00973c 100644
--- a/llvm/lib/Target/PowerPC/PPCInstrInfo.h
+++ b/llvm/lib/Target/PowerPC/PPCInstrInfo.h
@@ -216,41 +216,18 @@ enum PPCMachineCombinerPattern : unsigned {
PPC::SPILL_QUADWORD}
#define Pwr10StoreOpcodes \
- {PPC::STW, \
- PPC::STD, \
- PPC::STFD, \
- PPC::STFS, \
- PPC::SPILL_CR, \
- PPC::SPILL_CRBIT, \
- PPC::STVX, \
- PPC::STXV, \
- PPC::DFSTOREf64, \
- PPC::DFSTOREf32, \
- PPC::SPILLTOVSR_ST, \
- PPC::STXVP, \
- PPC::SPILL_ACC, \
- PPC::SPILL_UACC, \
- NoInstr, \
- NoInstr, \
- PPC::SPILL_QUADWORD}
+ {PPC::STW, PPC::STD, PPC::STFD, \
+ PPC::STFS, PPC::SPILL_CR, PPC::SPILL_CRBIT, \
+ PPC::STVX, PPC::STXV, PPC::DFSTOREf64, \
+ PPC::DFSTOREf32, PPC::SPILLTOVSR_ST, PPC::STXVP, \
+ PPC::SPILL_ACC, PPC::SPILL_UACC, NoInstr, \
+ NoInstr, PPC::SPILL_QUADWORD}
#define FutureStoreOpcodes \
- {PPC::STW, \
- PPC::STD, \
- PPC::STFD, \
- PPC::STFS, \
- PPC::SPILL_CR, \
- PPC::SPILL_CRBIT, \
- PPC::STVX, \
- PPC::STXV, \
- PPC::DFSTOREf64, \
- PPC::DFSTOREf32, \
- PPC::SPILLTOVSR_ST, \
- PPC::STXVP, \
- PPC::SPILL_ACC, \
- PPC::SPILL_UACC, \
- PPC::SPILL_WACC, \
- NoInstr, \
+ {PPC::STW, PPC::STD, PPC::STFD, PPC::STFS, \
+ PPC::SPILL_CR, PPC::SPILL_CRBIT, PPC::STVX, PPC::STXV, \
+ PPC::DFSTOREf64, PPC::DFSTOREf32, PPC::SPILLTOVSR_ST, PPC::STXVP, \
+ PPC::SPILL_ACC, PPC::SPILL_UACC, PPC::SPILL_WACC, NoInstr, \
PPC::SPILL_QUADWORD}
// Initialize arrays for load and store spill opcodes on supported subtargets.
|
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Jun 3, 2025
Reformat spill and restore opCode lists.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reformat spill and restore opCode lists.