This is an archive of the discontinued LLVM Phabricator instance.

Differential D21016

[mips] The default ABI depends on the CPU not the Arch on MTI and IMG vendor triples.
ClosedPublic

Authored by dsanders on Jun 6 2016, 3:32 AM.

Details

Reviewers
atanasyan
Commits
rG0ca86fe84dc9: [mips] The default ABI depends on the CPU not the Arch on MTI and IMG vendor…
rC271884: [mips] The default ABI depends on the CPU not the Arch on MTI and IMG vendor…
rL271884: [mips] The default ABI depends on the CPU not the Arch on MTI and IMG vendor…
Summary

32-bit CPU's default to O32. 64-bit CPU's default to N64. The default CPU
(mips32r2/mips64r2) still depends on the arch so there's no functional
change when the CPU isn't specified but commands like:

clang -target mips-mti-linux-gnu -mips64r2

will now default to a 64-bit ABI like our gcc toolchains do* instead of
asserting in the backend**.

Other vendors (including Triple::UnknownVendor) still derive the default
ABI from the arch.

  • Although not the same one as our gcc toolchains, clang has historically defaulted to N64 where gcc defaults to N32.
    • Mixing O32 and a 64-bit CPU causing assertions is a long-standing bug.

Diff Detail

Event Timeline

dsanders updated this revision to Diff 59701.Jun 6 2016, 3:32 AM
dsanders retitled this revision from to [mips] The default ABI depends on the CPU not the Arch on MTI and IMG vendor triples..
dsanders updated this object.
dsanders added a reviewer: atanasyan.
dsanders added a subscriber: cfe-commits.
Herald added a subscriber: sdardis. · View Herald TranscriptJun 6 2016, 3:32 AM
atanasyan accepted this revision.Jun 6 2016, 4:50 AM
atanasyan edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jun 6 2016, 4:50 AM
dsanders closed this revision.Jun 6 2016, 5:08 AM

Revision Contents

PathSize
lib/
Driver/
24 lines
test/
Driver/
19 lines

Diff 59701

lib/Driver/Tools.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1,215 Lines • ▼ Show 20 Lines case llvm::Triple::mipsel:
break; break;
case llvm::Triple::mips64: case llvm::Triple::mips64:
case llvm::Triple::mips64el: case llvm::Triple::mips64el:
CPUName = DefMips64CPU; CPUName = DefMips64CPU;
break; break;
} }
} }
if (ABIName.empty() &&
(Triple.getVendor() == llvm::Triple::MipsTechnologies ||
Triple.getVendor() == llvm::Triple::ImaginationTechnologies)) {
ABIName = llvm::StringSwitch<const char *>(CPUName)
.Case("mips1", "o32")
.Case("mips2", "o32")
.Case("mips3", "n64")
.Case("mips4", "n64")
.Case("mips5", "n64")
.Case("mips32", "o32")
.Case("mips32r2", "o32")
.Case("mips32r3", "o32")
.Case("mips32r5", "o32")
.Case("mips32r6", "o32")
.Case("mips64", "n64")
.Case("mips64r2", "n64")
.Case("mips64r3", "n64")
.Case("mips64r5", "n64")
.Case("mips64r6", "n64")
.Case("octeon", "n64")
.Case("p5600", "o32")
.Default("");
}
if (ABIName.empty()) { if (ABIName.empty()) {
// Deduce ABI name from the target triple. // Deduce ABI name from the target triple.
if (Triple.getArch() == llvm::Triple::mips || if (Triple.getArch() == llvm::Triple::mips ||
Triple.getArch() == llvm::Triple::mipsel) Triple.getArch() == llvm::Triple::mipsel)
ABIName = "o32"; ABIName = "o32";
else else
ABIName = "n64"; ABIName = "n64";
} }
▲ Show 20 Lines • Show All 9,867 Lines • Show Last 20 Lines

test/Driver/mips-abi.c

// Check passing Mips ABI options to the backend. // Check passing Mips ABI options to the backend.
// //
// RUN: %clang -target mips-linux-gnu -### -c %s 2>&1 \ // RUN: %clang -target mips-linux-gnu -### -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS-DEF %s // RUN: | FileCheck -check-prefix=MIPS-DEF %s
// MIPS-DEF: "-target-cpu" "mips32r2" // MIPS-DEF: "-target-cpu" "mips32r2"
// MIPS-DEF: "-target-abi" "o32" // MIPS-DEF: "-target-abi" "o32"
// //
// RUN: %clang -target mips64-linux-gnu -### -c %s 2>&1 \ // RUN: %clang -target mips64-linux-gnu -### -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS64-DEF %s // RUN: | FileCheck -check-prefix=MIPS64R2-N64 %s
// MIPS64-DEF: "-target-cpu" "mips64r2" // RUN: %clang -target mips-img-linux-gnu -mips64r2 -### -c %s 2>&1 \
// MIPS64-DEF: "-target-abi" "n64" // RUN: | FileCheck -check-prefix=MIPS64R2-N64 %s
// RUN: %clang -target mips-mti-linux-gnu -mips64r2 -### -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS64R2-N64 %s
// MIPS64R2-N64: "-target-cpu" "mips64r2"
// MIPS64R2-N64: "-target-abi" "n64"
//
// RUN: %clang -target mips64-linux-gnu -### -mips64r3 -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS64R3-N64 %s
// RUN: %clang -target mips-img-linux-gnu -mips64r3 -### -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS64R3-N64 %s
// RUN: %clang -target mips-mti-linux-gnu -mips64r3 -### -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS64R3-N64 %s
// MIPS64R3-N64: "-target-cpu" "mips64r3"
// MIPS64R3-N64: "-target-abi" "n64"
// //
// RUN: %clang -target mips-linux-gnu -### -c %s \ // RUN: %clang -target mips-linux-gnu -### -c %s \
// RUN: -mabi=32 2>&1 \ // RUN: -mabi=32 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS-ABI-32 %s // RUN: | FileCheck -check-prefix=MIPS-ABI-32 %s
// MIPS-ABI-32: "-target-cpu" "mips32r2" // MIPS-ABI-32: "-target-cpu" "mips32r2"
// MIPS-ABI-32: "-target-abi" "o32" // MIPS-ABI-32: "-target-abi" "o32"
// //
// RUN: %clang -target mips-linux-gnu -### -c %s \ // RUN: %clang -target mips-linux-gnu -### -c %s \
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines