Skip to content

Commit 58a0c95

Browse files
authored
Revert "[MIPS] Define SubTargetFeature for i6500 cpu" (llvm#133215)
Reverts llvm#132907 due to some test failures.
1 parent 05fb840 commit 58a0c95

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

clang/test/CodeGen/Mips/subtarget-feature-test.c

Lines changed: 0 additions & 5 deletions
This file was deleted.

llvm/lib/Target/Mips/Mips.td

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,7 @@ def ImplP5600 : SubtargetFeature<"p5600", "ProcImpl",
242242
// same CPU architecture.
243243
def ImplI6400
244244
: SubtargetFeature<"i6400", "ProcImpl", "MipsSubtarget::CPU::I6400",
245-
"MIPS I6400 Processor", [FeatureMips64r6]>;
246-
247-
def ImplI6500
248-
: SubtargetFeature<"i6500", "ProcImpl", "MipsSubtarget::CPU::I6500",
249-
"MIPS I6500 Processor", [FeatureMips64r6]>;
245+
"MIPS I6400/I6500 Processors", [FeatureMips64r6]>;
250246

251247
class Proc<string Name, list<SubtargetFeature> Features>
252248
: ProcessorModel<Name, MipsGenericModel, Features>;
@@ -272,7 +268,7 @@ def : Proc<"octeon", [FeatureMips64r2, FeatureCnMips]>;
272268
def : Proc<"octeon+", [FeatureMips64r2, FeatureCnMips, FeatureCnMipsP]>;
273269
def : ProcessorModel<"p5600", MipsP5600Model, [ImplP5600]>;
274270
def : ProcessorModel<"i6400", NoSchedModel, [ImplI6400]>;
275-
def : ProcessorModel<"i6500", NoSchedModel, [ImplI6500]>;
271+
def : ProcessorModel<"i6500", NoSchedModel, [ImplI6400]>;
276272

277273
def MipsAsmParser : AsmParser {
278274
let ShouldEmitMatchRegisterName = 0;

llvm/lib/Target/Mips/MipsSubtarget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class MipsSubtarget : public MipsGenSubtargetInfo {
4343
Mips3, Mips4, Mips5, Mips64, Mips64r2, Mips64r3, Mips64r5, Mips64r6
4444
};
4545

46-
enum class CPU { P5600, I6400, I6500 };
46+
enum class CPU { P5600, I6400 };
4747

4848
// Used to avoid printing dsp warnings multiple times.
4949
static bool DspWarningPrinted;

0 commit comments

Comments
 (0)