-
Notifications
You must be signed in to change notification settings - Fork 13.5k
[SPARC][IAS][NFC] Rename CBCOND -> CPBCOND #138402
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
koachan
merged 4 commits into
main
from
users/koachan/spr/sparciasnfc-rename-cbcond-cpbcond
May 12, 2025
Merged
[SPARC][IAS][NFC] Rename CBCOND -> CPBCOND #138402
koachan
merged 4 commits into
main
from
users/koachan/spr/sparciasnfc-rename-cbcond-cpbcond
May 12, 2025
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
Created using spr 1.3.5 [skip ci]
Created using spr 1.3.5
@llvm/pr-subscribers-backend-sparc Author: Koakuma (koachan) ChangesThis is in prep for OSA2011 instruction definitions, which has a CBCond Full diff: https://github.com/llvm/llvm-project/pull/138402.diff 3 Files Affected:
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp b/llvm/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp
index f2a61c95fefb5..42f3b9d3c4ce9 100644
--- a/llvm/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp
+++ b/llvm/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp
@@ -192,8 +192,8 @@ void SparcInstPrinter::printCCOperand(const MCInst *MI, int opNum,
// Make sure CC is a fp conditional flag.
CC = (CC < SPCC::FCC_BEGIN) ? (CC + SPCC::FCC_BEGIN) : CC;
break;
- case SP::CBCOND:
- case SP::CBCONDA:
+ case SP::CPBCOND:
+ case SP::CPBCONDA:
// Make sure CC is a cp conditional flag.
CC = (CC < SPCC::CPCC_BEGIN) ? (CC + SPCC::CPCC_BEGIN) : CC;
break;
diff --git a/llvm/lib/Target/Sparc/SparcInstrAliases.td b/llvm/lib/Target/Sparc/SparcInstrAliases.td
index bc57ddbb5682f..590395c16965b 100644
--- a/llvm/lib/Target/Sparc/SparcInstrAliases.td
+++ b/llvm/lib/Target/Sparc/SparcInstrAliases.td
@@ -286,11 +286,11 @@ multiclass cp_cond_alias<string cond, int condVal> {
// cb<cond> $imm
def : InstAlias<!strconcat(!strconcat("cb", cond), " $imm"),
- (CBCOND brtarget:$imm, condVal), 0>;
+ (CPBCOND brtarget:$imm, condVal), 0>;
// cb<cond>,a $imm
def : InstAlias<!strconcat(!strconcat("cb", cond), ",a $imm"),
- (CBCONDA brtarget:$imm, condVal), 0>;
+ (CPBCONDA brtarget:$imm, condVal), 0>;
}
// Instruction aliases for register conditional branches and moves.
diff --git a/llvm/lib/Target/Sparc/SparcInstrInfo.td b/llvm/lib/Target/Sparc/SparcInstrInfo.td
index eb6485eaa3d98..057eafd734e71 100644
--- a/llvm/lib/Target/Sparc/SparcInstrInfo.td
+++ b/llvm/lib/Target/Sparc/SparcInstrInfo.td
@@ -1028,10 +1028,10 @@ class CPBranchSPA<dag ins, string asmstr, list<dag> pattern>
} // let isBranch = 1, isTerminator = 1, hasDelaySlot = 1
-def CBCOND : CPBranchSP<(ins brtarget:$imm22, CCOp:$cond),
+def CPBCOND : CPBranchSP<(ins brtarget:$imm22, CCOp:$cond),
"cb$cond $imm22",
[(SPbrfcc bb:$imm22, imm:$cond)]>;
-def CBCONDA : CPBranchSPA<(ins brtarget:$imm22, CCOp:$cond),
+def CPBCONDA : CPBranchSPA<(ins brtarget:$imm22, CCOp:$cond),
"cb$cond,a $imm22", []>;
// Section B.24 - Call and Link Instruction, p. 125
|
s-barannikov
approved these changes
May 3, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Created using spr 1.3.5 [skip ci]
Created using spr 1.3.5
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
May 12, 2025
This is in prep for OSA2011 instruction definitions, which has a CBCond instruction family. Reviewers: rorth, s-barannikov, brad0 Reviewed By: s-barannikov Pull Request: llvm/llvm-project#138402
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.
This is in prep for OSA2011 instruction definitions, which has a CBCond
instruction family.