[llvm] Revert "[Xtensa] Implement Windowed Register Option." (PR #123913)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 22 01:12:05 PST 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-backend-xtensa
Author: Sylvestre Ledru (sylvestre)
<details>
<summary>Changes</summary>
Reverts llvm/llvm-project#<!-- -->121118
for causing #<!-- -->123817
---
Patch is 30.30 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/123913.diff
18 Files Affected:
- (modified) llvm/lib/Target/Xtensa/AsmParser/XtensaAsmParser.cpp (+1-31)
- (modified) llvm/lib/Target/Xtensa/Disassembler/XtensaDisassembler.cpp (+2-31)
- (modified) llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp (-34)
- (modified) llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.h (-3)
- (modified) llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCCodeEmitter.cpp (-52)
- (modified) llvm/lib/Target/Xtensa/Xtensa.td (+4-3)
- (removed) llvm/lib/Target/Xtensa/XtensaFeatures.td (-14)
- (modified) llvm/lib/Target/Xtensa/XtensaInstrInfo.td (-101)
- (modified) llvm/lib/Target/Xtensa/XtensaOperands.td (-21)
- (modified) llvm/lib/Target/Xtensa/XtensaRegisterInfo.td (+1-5)
- (modified) llvm/lib/Target/Xtensa/XtensaSubtarget.h (+1-6)
- (modified) llvm/lib/Target/Xtensa/XtensaUtils.cpp (-13)
- (modified) llvm/lib/Target/Xtensa/XtensaUtils.h (-6)
- (removed) llvm/test/MC/Disassembler/Xtensa/windowed.txt (-72)
- (removed) llvm/test/MC/Disassembler/Xtensa/windowed_code_density.txt (-12)
- (removed) llvm/test/MC/Xtensa/windowed.s (-105)
- (removed) llvm/test/MC/Xtensa/windowed_code_density.s (-14)
- (removed) llvm/test/MC/Xtensa/windowed_invalid.s (-23)
``````````diff
diff --git a/llvm/lib/Target/Xtensa/AsmParser/XtensaAsmParser.cpp b/llvm/lib/Target/Xtensa/AsmParser/XtensaAsmParser.cpp
index c15fc64c762f08..731f9535ca251f 100644
--- a/llvm/lib/Target/Xtensa/AsmParser/XtensaAsmParser.cpp
+++ b/llvm/lib/Target/Xtensa/AsmParser/XtensaAsmParser.cpp
@@ -12,7 +12,6 @@
#include "MCTargetDesc/XtensaMCTargetDesc.h"
#include "MCTargetDesc/XtensaTargetStreamer.h"
#include "TargetInfo/XtensaTargetInfo.h"
-#include "XtensaUtils.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/MC/MCContext.h"
@@ -74,7 +73,6 @@ class XtensaAsmParser : public MCTargetAsmParser {
SMLoc &EndLoc) override {
return ParseStatus::NoMatch;
}
-
ParseStatus parsePCRelTarget(OperandVector &Operands);
bool parseLiteralDirective(SMLoc L);
@@ -91,10 +89,6 @@ class XtensaAsmParser : public MCTargetAsmParser {
: MCTargetAsmParser(Options, STI, MII) {
setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
}
-
- bool hasWindowed() const {
- return getSTI().getFeatureBits()[Xtensa::FeatureWindowed];
- };
};
// Return true if Expr is in the range [MinValue, MaxValue].
@@ -187,11 +181,6 @@ struct XtensaOperand : public MCParsedAsmOperand {
((cast<MCConstantExpr>(getImm())->getValue() & 0x3) == 0);
}
- bool isentry_imm12() const {
- return isImm(0, 32760) &&
- ((cast<MCConstantExpr>(getImm())->getValue() % 8) == 0);
- }
-
bool isUimm4() const { return isImm(0, 15); }
bool isUimm5() const { return isImm(0, 31); }
@@ -209,11 +198,6 @@ struct XtensaOperand : public MCParsedAsmOperand {
bool isImm32n_95() const { return isImm(-32, 95); }
- bool isImm64n_4n() const {
- return isImm(-64, -4) &&
- ((cast<MCConstantExpr>(getImm())->getValue() & 0x3) == 0);
- }
-
bool isB4const() const {
if (Kind != Immediate)
return false;
@@ -507,12 +491,6 @@ bool XtensaAsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
case Match_InvalidImm32n_95:
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
"expected immediate in range [-32, 95]");
- case Match_InvalidImm64n_4n:
- return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
- "expected immediate in range [-64, -4]");
- case Match_InvalidImm8n_7:
- return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
- "expected immediate in range [-8, 7]");
case Match_InvalidShimm1_31:
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
"expected immediate in range [1, 31]");
@@ -537,10 +515,6 @@ bool XtensaAsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
"expected immediate in range [0, 60], first 2 bits "
"should be zero");
- case Match_Invalidentry_imm12:
- return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
- "expected immediate in range [0, 32760], first 3 bits "
- "should be zero");
}
report_fatal_error("Unknown match type detected!");
@@ -627,10 +601,6 @@ ParseStatus XtensaAsmParser::parseRegister(OperandVector &Operands,
getLexer().UnLex(Buf[0]);
return ParseStatus::NoMatch;
}
-
- if (!checkRegister(RegNo, getSTI().getFeatureBits()))
- return ParseStatus::NoMatch;
-
if (HadParens)
Operands.push_back(XtensaOperand::createToken("(", FirstS));
SMLoc S = getLoc();
@@ -732,7 +702,7 @@ bool XtensaAsmParser::ParseInstructionWithSR(ParseInstructionInfo &Info,
if (RegNo == 0)
RegNo = MatchRegisterAltName(RegName);
- if (!checkRegister(RegNo, getSTI().getFeatureBits()))
+ if (RegNo == 0)
return Error(NameLoc, "invalid register name");
// Parse operand
diff --git a/llvm/lib/Target/Xtensa/Disassembler/XtensaDisassembler.cpp b/llvm/lib/Target/Xtensa/Disassembler/XtensaDisassembler.cpp
index 63ab455c3d8c8b..c11c4b7038bdb7 100644
--- a/llvm/lib/Target/Xtensa/Disassembler/XtensaDisassembler.cpp
+++ b/llvm/lib/Target/Xtensa/Disassembler/XtensaDisassembler.cpp
@@ -14,7 +14,6 @@
#include "MCTargetDesc/XtensaMCTargetDesc.h"
#include "TargetInfo/XtensaTargetInfo.h"
-#include "XtensaUtils.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCDecoderOps.h"
#include "llvm/MC/MCDisassembler/MCDisassembler.h"
@@ -74,22 +73,17 @@ static DecodeStatus DecodeARRegisterClass(MCInst &Inst, uint64_t RegNo,
return MCDisassembler::Success;
}
-static const unsigned SRDecoderTable[] = {
- Xtensa::SAR, 3, Xtensa::WINDOWBASE, 72, Xtensa::WINDOWSTART, 73};
+static const unsigned SRDecoderTable[] = {Xtensa::SAR, 3};
static DecodeStatus DecodeSRRegisterClass(MCInst &Inst, uint64_t RegNo,
uint64_t Address,
- const MCDisassembler *Decoder) {
+ const void *Decoder) {
if (RegNo > 255)
return MCDisassembler::Fail;
for (unsigned i = 0; i < std::size(SRDecoderTable); i += 2) {
if (SRDecoderTable[i + 1] == RegNo) {
unsigned Reg = SRDecoderTable[i];
-
- if (!checkRegister(Reg, Decoder->getSubtargetInfo().getFeatureBits()))
- return MCDisassembler::Fail;
-
Inst.addOperand(MCOperand::createReg(Reg));
return MCDisassembler::Success;
}
@@ -216,29 +210,6 @@ static DecodeStatus decodeImm32n_95Operand(MCInst &Inst, uint64_t Imm,
return MCDisassembler::Success;
}
-static DecodeStatus decodeImm8n_7Operand(MCInst &Inst, uint64_t Imm,
- int64_t Address, const void *Decoder) {
- assert(isUInt<4>(Imm) && "Invalid immediate");
- Inst.addOperand(MCOperand::createImm(Imm > 7 ? Imm - 16 : Imm));
- return MCDisassembler::Success;
-}
-
-static DecodeStatus decodeImm64n_4nOperand(MCInst &Inst, uint64_t Imm,
- int64_t Address,
- const void *Decoder) {
- assert(isUInt<6>(Imm) && ((Imm & 0x3) == 0) && "Invalid immediate");
- Inst.addOperand(MCOperand::createImm((~0x3f) | (Imm)));
- return MCDisassembler::Success;
-}
-
-static DecodeStatus decodeEntry_Imm12OpValue(MCInst &Inst, uint64_t Imm,
- int64_t Address,
- const void *Decoder) {
- assert(isUInt<15>(Imm) && ((Imm & 0x7) == 0) && "Invalid immediate");
- Inst.addOperand(MCOperand::createImm(Imm));
- return MCDisassembler::Success;
-}
-
static DecodeStatus decodeShimm1_31Operand(MCInst &Inst, uint64_t Imm,
int64_t Address,
const void *Decoder) {
diff --git a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
index 868c7f6c0b9c3c..df8a0854f06f41 100644
--- a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
+++ b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
@@ -264,28 +264,6 @@ void XtensaInstPrinter::printImm32n_95_AsmOperand(const MCInst *MI, int OpNum,
printOperand(MI, OpNum, O);
}
-void XtensaInstPrinter::printImm8n_7_AsmOperand(const MCInst *MI, int OpNum,
- raw_ostream &O) {
- if (MI->getOperand(OpNum).isImm()) {
- int64_t Value = MI->getOperand(OpNum).getImm();
- assert((Value >= -8 && Value <= 7) &&
- "Invalid argument, value must be in ranges <-8,7>");
- O << Value;
- } else
- printOperand(MI, OpNum, O);
-}
-
-void XtensaInstPrinter::printImm64n_4n_AsmOperand(const MCInst *MI, int OpNum,
- raw_ostream &O) {
- if (MI->getOperand(OpNum).isImm()) {
- int64_t Value = MI->getOperand(OpNum).getImm();
- assert((Value >= -64 && Value <= -4) & ((Value & 0x3) == 0) &&
- "Invalid argument, value must be in ranges <-64,-4>");
- O << Value;
- } else
- printOperand(MI, OpNum, O);
-}
-
void XtensaInstPrinter::printOffset8m8_AsmOperand(const MCInst *MI, int OpNum,
raw_ostream &O) {
if (MI->getOperand(OpNum).isImm()) {
@@ -331,18 +309,6 @@ void XtensaInstPrinter::printOffset4m32_AsmOperand(const MCInst *MI, int OpNum,
printOperand(MI, OpNum, O);
}
-void XtensaInstPrinter::printEntry_Imm12_AsmOperand(const MCInst *MI, int OpNum,
- raw_ostream &O) {
- if (MI->getOperand(OpNum).isImm()) {
- int64_t Value = MI->getOperand(OpNum).getImm();
- assert((Value >= 0 && Value <= 32760) &&
- "Invalid argument, value must be multiples of eight in range "
- "<0,32760>");
- O << Value;
- } else
- printOperand(MI, OpNum, O);
-}
-
void XtensaInstPrinter::printB4const_AsmOperand(const MCInst *MI, int OpNum,
raw_ostream &O) {
if (MI->getOperand(OpNum).isImm()) {
diff --git a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.h b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.h
index 630b4dd60108ff..e5bc67869e103d 100644
--- a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.h
+++ b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.h
@@ -60,13 +60,10 @@ class XtensaInstPrinter : public MCInstPrinter {
void printImm1_16_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printImm1n_15_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printImm32n_95_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
- void printImm8n_7_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
- void printImm64n_4n_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printOffset8m8_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printOffset8m16_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printOffset8m32_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printOffset4m32_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
- void printEntry_Imm12_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printB4const_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
void printB4constu_AsmOperand(const MCInst *MI, int OpNum, raw_ostream &O);
};
diff --git a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCCodeEmitter.cpp b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCCodeEmitter.cpp
index e6cdd3d0020fc0..51d4b8a9cc5fc5 100644
--- a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCCodeEmitter.cpp
+++ b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCCodeEmitter.cpp
@@ -111,18 +111,6 @@ class XtensaMCCodeEmitter : public MCCodeEmitter {
SmallVectorImpl<MCFixup> &Fixups,
const MCSubtargetInfo &STI) const;
- uint32_t getImm8n_7OpValue(const MCInst &MI, unsigned OpNo,
- SmallVectorImpl<MCFixup> &Fixups,
- const MCSubtargetInfo &STI) const;
-
- uint32_t getImm64n_4nOpValue(const MCInst &MI, unsigned OpNo,
- SmallVectorImpl<MCFixup> &Fixups,
- const MCSubtargetInfo &STI) const;
-
- uint32_t getEntry_Imm12OpValue(const MCInst &MI, unsigned OpNo,
- SmallVectorImpl<MCFixup> &Fixups,
- const MCSubtargetInfo &STI) const;
-
uint32_t getShimm1_31OpValue(const MCInst &MI, unsigned OpNo,
SmallVectorImpl<MCFixup> &Fixups,
const MCSubtargetInfo &STI) const;
@@ -417,46 +405,6 @@ XtensaMCCodeEmitter::getImm32n_95OpValue(const MCInst &MI, unsigned OpNo,
return Res;
}
-uint32_t
-XtensaMCCodeEmitter::getImm8n_7OpValue(const MCInst &MI, unsigned OpNo,
- SmallVectorImpl<MCFixup> &Fixups,
- const MCSubtargetInfo &STI) const {
- const MCOperand &MO = MI.getOperand(OpNo);
- int32_t Res = static_cast<int32_t>(MO.getImm());
-
- assert(((Res >= -8) && (Res <= 7)) && "Unexpected operand value!");
-
- if (Res < 0)
- return Res + 16;
-
- return Res;
-}
-
-uint32_t
-XtensaMCCodeEmitter::getImm64n_4nOpValue(const MCInst &MI, unsigned OpNo,
- SmallVectorImpl<MCFixup> &Fixups,
- const MCSubtargetInfo &STI) const {
- const MCOperand &MO = MI.getOperand(OpNo);
- int32_t Res = static_cast<int32_t>(MO.getImm());
-
- assert(((Res >= -64) && (Res <= -4) && ((Res & 0x3) == 0)) &&
- "Unexpected operand value!");
-
- return Res & 0x3f;
-}
-
-uint32_t
-XtensaMCCodeEmitter::getEntry_Imm12OpValue(const MCInst &MI, unsigned OpNo,
- SmallVectorImpl<MCFixup> &Fixups,
- const MCSubtargetInfo &STI) const {
- const MCOperand &MO = MI.getOperand(OpNo);
- uint32_t res = static_cast<uint32_t>(MO.getImm());
-
- assert(((res & 0x7) == 0) && "Unexpected operand value!");
-
- return res;
-}
-
uint32_t
XtensaMCCodeEmitter::getB4constOpValue(const MCInst &MI, unsigned OpNo,
SmallVectorImpl<MCFixup> &Fixups,
diff --git a/llvm/lib/Target/Xtensa/Xtensa.td b/llvm/lib/Target/Xtensa/Xtensa.td
index 2c4bacbe8282b0..460a15e808b3a4 100644
--- a/llvm/lib/Target/Xtensa/Xtensa.td
+++ b/llvm/lib/Target/Xtensa/Xtensa.td
@@ -17,9 +17,10 @@ include "llvm/Target/Target.td"
//===----------------------------------------------------------------------===//
// Subtarget Features.
//===----------------------------------------------------------------------===//
-
-include "XtensaFeatures.td"
-
+def FeatureDensity : SubtargetFeature<"density", "HasDensity", "true",
+ "Enable Density instructions">;
+def HasDensity : Predicate<"Subtarget->hasDensity()">,
+ AssemblerPredicate<(all_of FeatureDensity)>;
//===----------------------------------------------------------------------===//
// Xtensa supported processors.
//===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/Xtensa/XtensaFeatures.td b/llvm/lib/Target/Xtensa/XtensaFeatures.td
deleted file mode 100644
index 6f24a674ae0ce2..00000000000000
--- a/llvm/lib/Target/Xtensa/XtensaFeatures.td
+++ /dev/null
@@ -1,14 +0,0 @@
-//===----------------------------------------------------------------------===//
-// Xtensa subtarget features.
-//===----------------------------------------------------------------------===//
-
-// Xtensa ISA extensions (Xtensa Options).
-def FeatureDensity : SubtargetFeature<"density", "HasDensity", "true",
- "Enable Density instructions">;
-def HasDensity : Predicate<"Subtarget->hasDensity()">,
- AssemblerPredicate<(all_of FeatureDensity)>;
-
-def FeatureWindowed : SubtargetFeature<"windowed", "HasWindowed", "true",
- "Enable Xtensa Windowed Register option">;
-def HasWindowed : Predicate<"Subtarget->hasWindowed()">,
- AssemblerPredicate<(all_of FeatureWindowed)>;
diff --git a/llvm/lib/Target/Xtensa/XtensaInstrInfo.td b/llvm/lib/Target/Xtensa/XtensaInstrInfo.td
index 5ef795a0e5287a..699d0d6cf80445 100644
--- a/llvm/lib/Target/Xtensa/XtensaInstrInfo.td
+++ b/llvm/lib/Target/Xtensa/XtensaInstrInfo.td
@@ -678,104 +678,3 @@ let isReturn = 1, isTerminator = 1,
let t = 0;
}
}
-
-//===----------------------------------------------------------------------===//
-// Windowed instructions
-//===----------------------------------------------------------------------===//
-
-def ENTRY : BRI12_Inst<0x06, 0x3, 0x0, (outs), (ins AR:$s, entry_imm12:$imm),
- "entry\t$s, $imm", []>, Requires<[HasWindowed]> {
- bits<15> imm;
-
- let imm12{11-0} = imm{14-3};
- let Defs = [SP];
-}
-
-let isCall = 1, Defs = [A0] in {
- foreach i = {1,2,3} in {
- defvar I = !mul(4, i);
-
- def CALL#I# : CALL_Inst<0x05, (outs), (ins pcrel32call:$offset),
- "call"#I#"\t$offset", []>, Requires<[HasWindowed]> {
- let n = i;
- }
-
- def CALLX#I# : CALLX_Inst<0x00, 0x00, 0x00, (outs), (ins AR:$s),
- "callx"#I#"\t$s", []>, Requires<[HasWindowed]> {
- let m = 0x3;
- let n = i;
- let r = 0;
- }
- }
-}
-
-def MOVSP : RRR_Inst<0x00, 0x00, 0x00, (outs AR:$t), (ins AR:$s),
- "movsp\t$t, $s", []>, Requires<[HasWindowed]> {
- let r = 0x01;
-}
-
-let isReturn = 1, isTerminator = 1,
- isBarrier = 1, Uses = [A0] in {
- def RETW_N : RRRN_Inst<0x0D, (outs), (ins),
- "retw.n", []>, Requires<[HasWindowed, HasDensity]> {
- let r = 0x0F;
- let s = 0;
- let t = 1;
- }
-
- def RETW : CALLX_Inst<0x00, 0x00, 0x00, (outs), (ins),
- "retw", []>, Requires<[HasWindowed]> {
- let m = 0x2;
- let n = 0x1;
- let s = 0;
- let r = 0;
- }
-}
-
-def : InstAlias<"_retw", (RETW)>;
-def : InstAlias<"_retw.n", (RETW_N)>;
-
-def S32E : RRI4_Inst<0x00, 0x09, (outs), (ins AR:$t, AR:$s, imm64n_4n:$imm),
- "s32e\t$t, $s, $imm", []>, Requires<[HasWindowed]> {
- bits<6> imm;
-
- let r = imm{5-2};
- let imm4 = 0x4;
- let mayStore = 1;
-}
-
-def L32E : RRI4_Inst<0x00, 0x09, (outs), (ins AR:$t, AR:$s, imm64n_4n:$imm),
- "l32e\t$t, $s, $imm", []>, Requires<[HasWindowed]> {
- bits<6> imm;
-
- let r = imm{5-2};
- let imm4 = 0x0;
- let mayLoad = 1;
-}
-
-def RFWU : RRR_Inst<0x00, 0x00, 0x00, (outs), (ins),
- "rfwu", []>, Requires<[HasWindowed]> {
- bits<4> imm;
-
- let r = 0x3;
- let s = 0x5;
- let t = 0x0;
-}
-
-def RFWO : RRR_Inst<0x00, 0x00, 0x00, (outs), (ins),
- "rfwo", []>, Requires<[HasWindowed]> {
- bits<4> imm;
-
- let r = 0x3;
- let s = 0x4;
- let t = 0x0;
-}
-
-def ROTW : RRR_Inst<0x00, 0x00, 0x04, (outs), (ins imm8n_7:$imm),
- "rotw\t$imm", []>, Requires<[HasWindowed]> {
- bits<4> imm;
-
- let r = 0x8;
- let s = 0x0;
- let t = imm{3-0};
-}
diff --git a/llvm/lib/Target/Xtensa/XtensaOperands.td b/llvm/lib/Target/Xtensa/XtensaOperands.td
index 402e05a5c3dd1d..aa72fa0a56a6f5 100644
--- a/llvm/lib/Target/Xtensa/XtensaOperands.td
+++ b/llvm/lib/Target/Xtensa/XtensaOperands.td
@@ -37,20 +37,6 @@ def imm8_sh8 : Immediate<i32, [{ return Imm >= -32768 && Imm <= 32512 && ((Imm &
let DecoderMethod = "decodeImm8_sh8Operand";
}
-// imm8n_7 predicate - Immediate in the range [-8,7]
-def Imm8n_7_AsmOperand: ImmAsmOperand<"Imm8n_7">;
-def imm8n_7: Immediate<i32, [{ return Imm >= -8 && Imm <= 7; }], "Imm8n_7_AsmOperand"> {
- let EncoderMethod = "getImm8n_7OpValue";
- let DecoderMethod = "decodeImm8n_7Operand";
-}
-
-// imm64n_4n predicate - Immediate in the range [-64,-4]
-def Imm64n_4n_AsmOperand: ImmAsmOperand<"Imm64n_4n">;
-def imm64n_4n: Immediate<i32, [{ return Imm >= -64 && Imm <= -4; }], "Imm64n_4n_AsmOperand"> {
- let EncoderMethod = "getImm64n_4nOpValue";
- let DecoderMethod = "decodeImm64n_4nOperand";
-}
-
// imm12 predicate - Immediate in the range [-2048,2047]
def Imm12_AsmOperand : ImmAsmOperand<"Imm12">;
def imm12 : Immediate<i32, [{ return Imm >= -2048 && Imm <= 2047; }], "Imm12_AsmOperand"> {
@@ -131,13 +117,6 @@ def offset4m32 : Immediate<i32,
[{ return Imm >= 0 && Imm <= 60 && (Imm & 0x3 == 0); }],
"Offset4m32_AsmOperand">;
-// entry_imm12 predicate - Immediate in the range [0,32760], ENTRY parameter
-def Entry_Imm12_AsmOperand: ImmAsmOperand<"entry_imm12">;
-def entry_imm12: Immediate<i32, [{ return Imm >= 0 && Imm <= 32760 && (Imm % 8 == 0); }], "Entry_Imm12_AsmOperand"> {
- let EncoderMethod = "getEntry_Imm12OpValue";
- let DecoderMethod = "decodeEntry_Imm12OpValue";
-}
-
// b4const predicate - Branch Immediate 4-bit signed operand
def B4const_AsmOperand: ImmAsmOperand<"B4const">;
def b4const: Immediate<i32,
diff --git a/llvm/lib/Target/Xtensa/XtensaRegisterInfo.td b/llvm/lib/Target/Xtensa/XtensaRegisterInfo.td
index 09087edc86712d..5c07386b060cd9 100644
--- a/llvm/lib/Target/Xtensa/XtensaRegisterInfo.td
+++ b/llvm/lib/Target/Xtensa/XtensaRegisterInfo.td
@@ -75,8 +75,4 @@ class SRReg<bits<8> num, string n, list<string> alt = []> : XtensaReg<n> {
// Shift Amount Register
de...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/123913
More information about the llvm-commits
mailing list