This is an archive of the discontinued LLVM Phabricator instance.

Differential D69850

[mips] Support `octeon+` CPU in the `.set arch=` directive
ClosedPublic

Authored by atanasyan on Nov 5 2019, 8:01 AM.

Details

Reviewers
Petar.Avramovic
Commits
rG3718102d40d6: [mips] Support `octeon+` CPU in the `.set arch=` directive

Diff Detail

Event Timeline

atanasyan created this revision.Nov 5 2019, 8:01 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 5 2019, 8:01 AM
Herald added subscribers: jrtc27, hiraditya, arichardson, sdardis. · View Herald Transcript
atanasyan added a parent revision: D69849: [mips] Implement Octeon+ `saa` and `saad` instructions.Nov 5 2019, 8:02 AM
Petar.Avramovic accepted this revision.Nov 6 2019, 8:05 AM

LGTM.

This revision is now accepted and ready to land.Nov 6 2019, 8:05 AM
Closed by commit rG3718102d40d6: [mips] Support `octeon+` CPU in the `.set arch=` directive (authored by atanasyan). · Explain WhyNov 7 2019, 3:04 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Target/
Mips/
AsmParser/
5 lines
test/
MC/
Mips/
4 lines

Diff 228201

llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 7,169 Lines • ▼ Show 20 Lines
bool MipsAsmParser::parseSetArchDirective() { bool MipsAsmParser::parseSetArchDirective() {
MCAsmParser &Parser = getParser(); MCAsmParser &Parser = getParser();
Parser.Lex(); Parser.Lex();
if (getLexer().isNot(AsmToken::Equal)) if (getLexer().isNot(AsmToken::Equal))
return reportParseError("unexpected token, expected equals sign"); return reportParseError("unexpected token, expected equals sign");
Parser.Lex(); Parser.Lex();
StringRef Arch; StringRef Arch = getParser().parseStringToEndOfStatement().trim();
if (Parser.parseIdentifier(Arch)) if (Arch.empty())
return reportParseError("expected arch identifier"); return reportParseError("expected arch identifier");
StringRef ArchFeatureName = StringRef ArchFeatureName =
StringSwitch<StringRef>(Arch) StringSwitch<StringRef>(Arch)
.Case("mips1", "mips1") .Case("mips1", "mips1")
.Case("mips2", "mips2") .Case("mips2", "mips2")
.Case("mips3", "mips3") .Case("mips3", "mips3")
.Case("mips4", "mips4") .Case("mips4", "mips4")
.Case("mips5", "mips5") .Case("mips5", "mips5")
.Case("mips32", "mips32") .Case("mips32", "mips32")
.Case("mips32r2", "mips32r2") .Case("mips32r2", "mips32r2")
.Case("mips32r3", "mips32r3") .Case("mips32r3", "mips32r3")
.Case("mips32r5", "mips32r5") .Case("mips32r5", "mips32r5")
.Case("mips32r6", "mips32r6") .Case("mips32r6", "mips32r6")
.Case("mips64", "mips64") .Case("mips64", "mips64")
.Case("mips64r2", "mips64r2") .Case("mips64r2", "mips64r2")
.Case("mips64r3", "mips64r3") .Case("mips64r3", "mips64r3")
.Case("mips64r5", "mips64r5") .Case("mips64r5", "mips64r5")
.Case("mips64r6", "mips64r6") .Case("mips64r6", "mips64r6")
.Case("octeon", "cnmips") .Case("octeon", "cnmips")
.Case("octeon+", "cnmipsp")
.Case("r4000", "mips3") // This is an implementation of Mips3. .Case("r4000", "mips3") // This is an implementation of Mips3.
.Default(""); .Default("");
if (ArchFeatureName.empty()) if (ArchFeatureName.empty())
return reportParseError("unsupported architecture"); return reportParseError("unsupported architecture");
if (ArchFeatureName == "mips64r6" && inMicroMipsMode()) if (ArchFeatureName == "mips64r6" && inMicroMipsMode())
return reportParseError("mips64r6 does not support microMIPS"); return reportParseError("mips64r6 does not support microMIPS");
▲ Show 20 Lines • Show All 1,375 Lines • Show Last 20 Lines

llvm/test/MC/Mips/set-arch.s

Show All 32 Lines# RUN: FileCheck %s
drotr32 $1, $14, 15 drotr32 $1, $14, 15
.set arch=mips64 .set arch=mips64
.set arch=mips64r5 .set arch=mips64r5
drotr32 $1, $14, 15 drotr32 $1, $14, 15
.set arch=mips64r6 .set arch=mips64r6
mod $2, $4, $6 mod $2, $4, $6
.set arch=octeon .set arch=octeon
baddu $9, $6, $7 baddu $9, $6, $7
.set arch=octeon+
saa $2, ($5)
.set arch=r4000 .set arch=r4000
dadd $2, $2, $2 dadd $2, $2, $2
# CHECK: .set arch=mips1 # CHECK: .set arch=mips1
# CHECK: add $2, $2, $2 # CHECK: add $2, $2, $2
# CHECK: .set arch=mips2 # CHECK: .set arch=mips2
# CHECK: ll $2, -2($2) # CHECK: ll $2, -2($2)
# CHECK: .set arch=mips3 # CHECK: .set arch=mips3
Show All 11 Lines
# CHECK: .set arch=mips64 # CHECK: .set arch=mips64
# CHECK: daddi $2, $2, 10 # CHECK: daddi $2, $2, 10
# CHECK: .set arch=mips64r2 # CHECK: .set arch=mips64r2
# CHECK: drotr32 $1, $14, 15 # CHECK: drotr32 $1, $14, 15
# CHECK: .set arch=mips64r6 # CHECK: .set arch=mips64r6
# CHECK: mod $2, $4, $6 # CHECK: mod $2, $4, $6
# CHECK: .set arch=octeon # CHECK: .set arch=octeon
# CHECK: baddu $9, $6, $7 # CHECK: baddu $9, $6, $7
# CHECK: .set arch=octeon+
# CHECK: saa $2, ($5)
# CHECK: .set arch=r4000 # CHECK: .set arch=r4000
# CHECK: dadd $2, $2, $2 # CHECK: dadd $2, $2, $2