This is an archive of the discontinued LLVM Phabricator instance.

Differential D68401

[Hexagon] Fix clang driver to parse -mcpu/-mvXX and -march properly.
ClosedPublic

Authored by sgundapa on Oct 3 2019, 8:52 AM.

Details

Reviewers
bcain
bcahoon
Summary

Before this patch if we pass "-mcpu=hexagonv65 -march=hexagon" in this order,
the driver fails to figure out the correct cpu version. This patch fixed this
issue.

Diff Detail

Event Timeline

sgundapa created this revision.Oct 3 2019, 8:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 3 2019, 8:52 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
bcain accepted this revision.Oct 10 2019, 2:50 PM

LGTM

This revision is now accepted and ready to land.Oct 10 2019, 2:50 PM
sgundapa closed this revision.Nov 14 2019, 11:14 AM

I forgot to update the Differential Revision in the commit.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
13 lines

Diff 223035

clang/lib/Driver/ToolChains/Hexagon.cpp

Show First 20 Lines • Show All 568 Lines • ▼ Show 20 Lines
// if no Hexagon processor is selected at the command-line. // if no Hexagon processor is selected at the command-line.
// //
const StringRef HexagonToolChain::GetDefaultCPU() { const StringRef HexagonToolChain::GetDefaultCPU() {
return "hexagonv60"; return "hexagonv60";
} }
const StringRef HexagonToolChain::GetTargetCPUVersion(const ArgList &Args) { const StringRef HexagonToolChain::GetTargetCPUVersion(const ArgList &Args) {
Arg *CpuArg = nullptr; Arg *CpuArg = nullptr;
if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ, options::OPT_march_EQ)) if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ))
CpuArg = A; CpuArg = A;
StringRef CPU = CpuArg ? CpuArg->getValue() : GetDefaultCPU(); StringRef CPU = CpuArg ? CpuArg->getValue() : GetDefaultCPU();
if (CPU.startswith("hexagon")) if (CPU.startswith("hexagon"))
return CPU.substr(sizeof("hexagon") - 1); return CPU.substr(sizeof("hexagon") - 1);
return CPU; return CPU;
} }

clang/test/Driver/hexagon-toolchain-elf.c

Show First 20 Lines • Show All 115 Lines • ▼ Show 20 Lines
// RUN: %clang -### -target hexagon-unknown-elf \ // RUN: %clang -### -target hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \ // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -O3 -ffp-contract=off \ // RUN: -O3 -ffp-contract=off \
// RUN: %s 2>&1 \ // RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK028 %s // RUN: | FileCheck -check-prefix=CHECK028 %s
// CHECK028-NOT: "-ffp-contract=fast" // CHECK028-NOT: "-ffp-contract=fast"
// CHECK028: {{hexagon-link|ld}} // CHECK028: {{hexagon-link|ld}}
// RUN: %clang -### -target hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv65 -march=hexagon\
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK029 %s
// RUN: %clang -### -target hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mv65 -march=hexagon\
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK029 %s
// CHECK029: "-cc1" {{.*}} "-target-cpu" "hexagonv65"
// CHECK029: hexagon-link{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/lib/v65/crt0
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Test Linker related args // Test Linker related args
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Defaults for C // Defaults for C
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// RUN: %clang -### -target hexagon-unknown-elf \ // RUN: %clang -### -target hexagon-unknown-elf \
▲ Show 20 Lines • Show All 394 Lines • Show Last 20 Lines